chore: Fix functional tests

fortify · Jan 22, 2024 · 6bcc6dd · 6bcc6dd
1 parent 25c81f3
commit 6bcc6dd
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstaller.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstaller.java
@@ -197,6 +197,7 @@ private static final void updateFilePermissions(Path p) {
         }
     }
 
+    // TODO Is there a standard Java class for this?
     private static final class LazyObject<T> {
         private T value = null;
         public T get(Supplier<T> supplier) {

diff --git a/...ctional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolBugTrackerUtilitySpec.groovy b/...ctional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolBugTrackerUtilitySpec.groovy
@@ -29,7 +29,7 @@ import spock.lang.Stepwise
 class ToolBugTrackerUtilitySpec extends FcliBaseSpec {
 
     def "install"() {
-        def args = "tool bugtracker-utility install -y -v=latest"
+        def args = "tool bugtracker-utility install -y -v=latest --progress=none"
         when:
             def result = Fcli.run(args)
         then:

diff --git a/...i-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolConfigUpdateSpec.groovy b/...i-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolConfigUpdateSpec.groovy
@@ -25,17 +25,17 @@ import spock.lang.Requires
 import spock.lang.Shared
 import spock.lang.Stepwise
 
-@Prefix("tool.config.update") @Stepwise
+@Prefix("tool.definitions.update") @Stepwise
 class ToolConfigUpdateSpec extends FcliBaseSpec {
 
     def "updateDefault"() {
-        def args = "tool config update"
+        def args = "tool definitions update"
         when:
             def result = Fcli.run(args)
         then:
             verifyAll(result.stdout) {
                 size()>0
-                it[0].replace(' ', '').equals("RemotepathLocalpathAction")
+                it[0].replace(' ', '').equals("SourceLastupdateAction")
                 it[1].replace(" ", "").contains("https://github.com/fortify-ps/tool-definitions/raw/main/v1/tool-definitions")
                 it[1].contains(" UPDATED")
             }
@@ -53,18 +53,21 @@ class ToolConfigUpdateSpec extends FcliBaseSpec {
             }
     }
 
+    /*
+    // TODO The tool definitions hosted on this URL are no longer valid due to yaml structure changes
     def "updateWithUrl"() {
-        def args = "tool config update --url https://github.com/psmf22/tool-definitions/raw/main/v1/tool-definitions.yaml.zip"
+        def args = "tool definitions update --source https://github.com/psmf22/tool-definitions/raw/main/v1/tool-definitions.yaml.zip"
         when:
             def result = Fcli.run(args)
         then:
             verifyAll(result.stdout) {
                 size()>0
-                it[0].replace(' ', '').equals("RemotepathLocalpathAction")
+                it[0].replace(' ', '').equals("SourceLastupdateAction")
                 it[1].replace(" ", "").contains("https://github.com/psmf22/tool-definitions/raw/main/v1/tool-definitions")
                 it[1].contains(" UPDATED")
             }
     }
+    */
 
     def "listVersions2"() {
         def args = "tool debricked-cli list"

diff --git a/...fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolDebrickedSpec.groovy b/...fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolDebrickedSpec.groovy
@@ -29,7 +29,7 @@ import spock.lang.Stepwise
 class ToolDebrickedSpec extends FcliBaseSpec {
 
     def "install"() {
-        def args = "tool debricked-cli install -y -v=latest"
+        def args = "tool debricked-cli install -y -v=latest --progress=none"
         when:
             def result = Fcli.run(args)
         then:

diff --git a/...ther/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolFcliSpec.groovy b/...ther/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolFcliSpec.groovy
@@ -29,7 +29,7 @@ import spock.lang.Stepwise
 class ToolFcliSpec extends FcliBaseSpec {
 
     def "install"() {
-        def args = "tool fcli install -y -v=latest"
+        def args = "tool fcli install -y -v=latest --progress=none"
         when:
             def result = Fcli.run(args)
         then:

diff --git a/...li-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolFoDUploaderSpec.groovy b/...li-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolFoDUploaderSpec.groovy
@@ -29,7 +29,7 @@ import spock.lang.Stepwise
 class ToolFoDUploaderSpec extends FcliBaseSpec {
 
     def "installLatest"() {
-        def args = "tool fod-uploader install -y -v=latest"
+        def args = "tool fod-uploader install -y -v=latest --progress=none"
         when:
             def result = Fcli.run(args)
         then:
@@ -65,7 +65,7 @@ class ToolFoDUploaderSpec extends FcliBaseSpec {
     }
 
     def "installV5"() {
-        def args = "tool fod-uploader install -y -v=5"
+        def args = "tool fod-uploader install -y -v=5 --progress=none"
         when:
             def result = Fcli.run(args)
         then:
@@ -78,7 +78,7 @@ class ToolFoDUploaderSpec extends FcliBaseSpec {
     }
 
     def "installV50"() {
-        def args = "tool fod-uploader install -y -v=5.0"
+        def args = "tool fod-uploader install -y -v=5.0 --progress=none"
         when:
             def result = Fcli.run(args)
         then:
@@ -91,7 +91,7 @@ class ToolFoDUploaderSpec extends FcliBaseSpec {
     }
 
     def "installV500"() {
-        def args = "tool fod-uploader install -y -v=5.0.0"
+        def args = "tool fod-uploader install -y -v=5.0.0 --progress=none"
         when:
             def result = Fcli.run(args)
         then:

diff --git a/.../fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolScClientSpec.groovy b/.../fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolScClientSpec.groovy
@@ -29,7 +29,7 @@ import spock.lang.Stepwise
 class ToolScClientSpec extends FcliBaseSpec {
 
     def "install"() {
-        def args = "tool sc-client install -y -v=latest"
+        def args = "tool sc-client install -y -v=latest --progress=none"
         when:
             def result = Fcli.run(args)
         then:

diff --git a/...i-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolVulnExporterSpec.groovy b/...i-functional-test/src/ftest/groovy/com/fortify/cli/ftest/tool/ToolVulnExporterSpec.groovy
@@ -29,7 +29,7 @@ import spock.lang.Stepwise
 class ToolVulnExporterSpec extends FcliBaseSpec {
 
     def "install"() {
-        def args = "tool vuln-exporter install -y -v=latest"
+        def args = "tool vuln-exporter install -y -v=latest --progress=none"
         when:
             def result = Fcli.run(args)
         then: