From bc7795ffff50370859ce210248e89085ac558db3 Mon Sep 17 00:00:00 2001
From: Albert Tregnaghi <albert.tregnaghi@mercedes-benz.com>
Date: Tue, 5 Apr 2022 17:15:07 +0200
Subject: [PATCH] Change test template to use data section for generic
 templates #1098

- changed ont test inside
  SecHubExecutionScenarioSecHubClientIntTest to use
  CLIENT_JSON_SOURCESCAN_GENERIC_TEMPLATE_NO_DATA_SECTION because
  client does currently not support upload by data-section correctly
  the sechub client based test does now use only the old approach.
- updated #1161 to make it clear that this must implemented for client
  and tested as well on server side
---
 .../api/IntegrationTestJSONLocation.java       |  2 ++
 ...ubExecutionScenarioSecHubClientIntTest.java |  4 ++--
 ...escan-generic-template-no-data-section.json | 10 ++++++++++
 ...est-client-sourcescan-generic-template.json | 18 ++++++++++++------
 4 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 sechub-integrationtest/src/test/resources/sechub-integrationtest-client-sourcescan-generic-template-no-data-section.json

diff --git a/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/api/IntegrationTestJSONLocation.java b/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/api/IntegrationTestJSONLocation.java
index d9f45da64..123eaf772 100644
--- a/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/api/IntegrationTestJSONLocation.java
+++ b/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/api/IntegrationTestJSONLocation.java
@@ -7,6 +7,8 @@ public enum IntegrationTestJSONLocation {
 
     CLIENT_JSON_SOURCESCAN_GENERIC_TEMPLATE("sechub-integrationtest-client-sourcescan-generic-template.json"),
 
+    CLIENT_JSON_SOURCESCAN_GENERIC_TEMPLATE_NO_DATA_SECTION("sechub-integrationtest-client-sourcescan-generic-template-no-data-section.json"),
+
     /** will use checkmarx-mockdata-multiple.xml as result */
     CLIENT_JSON_SOURCESCAN_YELLOW("sechub-integrationtest-client-sourcescan-yellow.json"),
 
diff --git a/sechub-integrationtest/src/test/java/com/mercedesbenz/sechub/integrationtest/scenario2/SecHubExecutionScenarioSecHubClientIntTest.java b/sechub-integrationtest/src/test/java/com/mercedesbenz/sechub/integrationtest/scenario2/SecHubExecutionScenarioSecHubClientIntTest.java
index 598eaafa9..44e87e5a2 100644
--- a/sechub-integrationtest/src/test/java/com/mercedesbenz/sechub/integrationtest/scenario2/SecHubExecutionScenarioSecHubClientIntTest.java
+++ b/sechub-integrationtest/src/test/java/com/mercedesbenz/sechub/integrationtest/scenario2/SecHubExecutionScenarioSecHubClientIntTest.java
@@ -318,7 +318,7 @@ public void a_project_having_no_problems_can_be_executed_as_codescan_and_results
 
     @SuppressWarnings("deprecation") // we use startDownloadJobReport here - old implementation okay here
     @Test
-    public void sechub_client_can_execute_a_config_file_which_uses_template_variables_of_environment_entries() {
+    public void sechub_client_can_execute_a_config_file_which_uses_template_variables_of_environment_entries_but_no_data_section() {
         /* @formatter:off */
 
 		/* prepare */
@@ -337,7 +337,7 @@ public void sechub_client_can_execute_a_config_file_which_uses_template_variable
 		envEntries.put("SHTEST_FOLDERS1", IntegrationTestMockMode.CODE_SCAN__CHECKMARX__GREEN__FAST.getTarget());
 
 		/* execute */
-		IntegrationTestJSONLocation location = CLIENT_JSON_SOURCESCAN_GENERIC_TEMPLATE;
+		IntegrationTestJSONLocation location = IntegrationTestJSONLocation.CLIENT_JSON_SOURCESCAN_GENERIC_TEMPLATE_NO_DATA_SECTION;
 		UUID jobUUID =
 	    as(user).
 			withSecHubClient().
diff --git a/sechub-integrationtest/src/test/resources/sechub-integrationtest-client-sourcescan-generic-template-no-data-section.json b/sechub-integrationtest/src/test/resources/sechub-integrationtest-client-sourcescan-generic-template-no-data-section.json
new file mode 100644
index 000000000..9bafe8dd9
--- /dev/null
+++ b/sechub-integrationtest/src/test/resources/sechub-integrationtest-client-sourcescan-generic-template-no-data-section.json
@@ -0,0 +1,10 @@
+{
+    "apiVersion" : "{{ .SHTEST_VERSION }}" ,
+
+    "codeScan": {
+        "fileSystem": {
+            "folders": ["{{ .SHTEST_FOLDERS1 }}"]
+        }
+     }
+
+}
\ No newline at end of file
diff --git a/sechub-integrationtest/src/test/resources/sechub-integrationtest-client-sourcescan-generic-template.json b/sechub-integrationtest/src/test/resources/sechub-integrationtest-client-sourcescan-generic-template.json
index 1fefafed3..a36252dec 100644
--- a/sechub-integrationtest/src/test/resources/sechub-integrationtest-client-sourcescan-generic-template.json
+++ b/sechub-integrationtest/src/test/resources/sechub-integrationtest-client-sourcescan-generic-template.json
@@ -2,14 +2,20 @@
     "apiVersion" : "{{ .SHTEST_VERSION }}" ,
 
     "data" : {
-        "name" : "the-used-testfolders",
-        "fileSystem": {
-            "folders": ["{{ .SHTEST_FOLDERS1 }}"]
-        }
-    }
+        "sources" : [ 
+            {
+                "name" : "the-used-testfolders",
+                
+                "fileSystem": {
+                    "folders": ["{{ .SHTEST_FOLDERS1 }}"]
+                }
+            }
+        ]
+        
+    },
 
     "codeScan": {
-        "use" : [ "the-used-testfolders"]]
+        "use" : [ "the-used-testfolders"]
      }
 
 }
\ No newline at end of file