Updates tests due to dmaap adapter changes

Issue-ID: NONRTRIC-765
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: Ic4d700f9a6b86b622fef0c80c50b4edc75862e24

diff --git a/test/auto-test/FTC2003.sh b/test/auto-test/FTC2003.sh
index 3076bb1..a16ce6b 100755 (executable)
--- a/test/auto-test/FTC2003.sh
+++ b/test/auto-test/FTC2003.sh
@@ -79,14 +79,14 @@ else
 fi
 
 ics_api_idc_get_job_ids 200 NOTYPE NOWNER EMPTY
-ics_api_idc_get_type_ids 200 ExampleInformationType
+ics_api_idc_get_type_ids 200 ExampleInformationType ExampleInformationTypeKafka
 
 
 ics_api_edp_get_producer_ids_2 200 NOTYPE DmaapGenericInfoProducer
 
 for ((i=1; i<=$NUM_JOBS; i++))
 do
-    ics_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json
+    ics_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template1.json
 done
 
 for ((i=1; i<=$NUM_JOBS; i++))

diff --git a/test/auto-test/FTC3000.sh b/test/auto-test/FTC3000.sh
index a25f2bd..7c78cfc 100755 (executable)
--- a/test/auto-test/FTC3000.sh
+++ b/test/auto-test/FTC3000.sh
@@ -111,7 +111,7 @@ do
     cr_index=$(($i%$NUM_CR))
     service_mr="CR_SERVICE_MR_PATH_"$cr_index
     service_app="CR_SERVICE_APP_PATH_"$cr_index
-    ics_api_idc_put_job 201 job-adp-$i ExampleInformationType ${!service_mr}/job-adp-data$i"?storeas=md5" info-owner-adp-$i ${!service_app}/job_status_info-owner-adp-$i testdata/dmaap-adapter/job-template.json
+    ics_api_idc_put_job 201 job-adp-$i ExampleInformationType ${!service_mr}/job-adp-data$i"?storeas=md5" info-owner-adp-$i ${!service_app}/job_status_info-owner-adp-$i testdata/dmaap-adapter/job-template1.json
 
 done
 print_timer

diff --git a/test/auto-test/FTC_HELM_E_RELEASE.sh b/test/auto-test/FTC_HELM_E_RELEASE.sh
index ce1115e..2fab3c3 100755 (executable)
--- a/test/auto-test/FTC_HELM_E_RELEASE.sh
+++ b/test/auto-test/FTC_HELM_E_RELEASE.sh
@@ -427,12 +427,12 @@ NUM_JOBS=1
 
 for ((i=1; i<=$NUM_JOBS; i++))
 do
-    ics_api_idc_put_job 201 jobx$i STD_Fault_Messages $CR_SERVICE_MR_PATH_0/jobx-data$i info-ownerx$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerx$i testdata/dmaap-adapter/job-template.json
+    ics_api_idc_put_job 201 jobx$i STD_Fault_Messages $CR_SERVICE_MR_PATH_0/jobx-data$i info-ownerx$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerx$i testdata/dmaap-adapter/job-template1.json
 done
 
 for ((i=1; i<=$NUM_JOBS; i++))
 do
-    ics_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template.json
+    ics_api_idc_put_job 201 joby$i ExampleInformationType $CR_SERVICE_MR_PATH_0/joby-data$i info-ownery$i $CR_SERVICE_MR_PATH_0/job_status_info-ownery$i testdata/dmaap-adapter/job-template1.json
     ics_api_idc_put_job 201 jobz$i ExampleInformationTypeKafka $CR_SERVICE_MR_PATH_0/jobz-data$i info-ownerz$i $CR_SERVICE_MR_PATH_0/job_status_info-ownerz$i testdata/dmaap-adapter/job-template-1-kafka.json
 done
 

diff --git a/test/auto-test/testdata/dmaap-adapter/job-template1.json b/test/auto-test/testdata/dmaap-adapter/job-template1.json
new file mode 100644 (file)
index 0000000..3e1052c
--- /dev/null
+++ b/test/auto-test/testdata/dmaap-adapter/job-template1.json
@@ -0,0 +1,6 @@
+{
+    "bufferTimeout": {
+        "maxSize": 1,
+        "maxTimeMiliseconds": 1
+    }
+  }
\ No newline at end of file

diff --git a/test/simulator-group/dmaapadp/application_configuration.json b/test/simulator-group/dmaapadp/application_configuration.json
index e36d910..09ba922 100644 (file)
--- a/test/simulator-group/dmaapadp/application_configuration.json
+++ b/test/simulator-group/dmaapadp/application_configuration.json
@@ -4,6 +4,8 @@
         "id": "ExampleInformationType",
         "dmaapTopicUrl": "/events/unauthenticated.dmaapadp.json/dmaapadapterproducer/msgs?timeout=15000&limit=100",
         "useHttpProxy": ${DMMAAP_ADP_PROXY_FLAG}
+
+,"isJson": false
      },
      {
       "id": "ExampleInformationTypeKafka",
@@ -11,4 +13,4 @@
       "useHttpProxy": ${DMMAAP_ADP_PROXY_FLAG}
    }
   ]
-}
\ No newline at end of file
+}