Removed all references to TIMs

README.md

@@ -163,10 +163,10 @@ Unit tests can be built and executed using the build_and_run_unit_tests.sh file
 The unit tests are also built when the solution is compiled. For information on that, check out [this section](./docs/testing.md#unit-testing).
 
 ## Standalone Cluster
-The docker-compose-standalone.yml file is meant for local testing/troubleshooting.
+The docker-compose.yml file is meant for local testing/troubleshooting.
 
 To utilize this, pass the -f flag to the docker-compose command as follows:
-> docker-compose -f docker-compose-standalone.yml up
+> docker-compose -f docker-compose.yml up
 
 Sometimes kafka will fail to start up properly. If this happens, spin down the containers and try again.
 
@@ -195,16 +195,14 @@ This script should be run outside of the dev container in an environment where D
 It should be noted that this script needs to use the LF end-of-line sequence.
 
 ## Kafka Test Script
-The [do_kafka_test.sh](./do_kafka_test.sh) script is designed to perform integration tests on a Kafka instance. To execute the tests, this script relies on the following scripts: standalone.sh, standalone_multi.sh, do_bsm_test.sh, and do_tim_test.sh.
+The [do_kafka_test.sh](./do_kafka_test.sh) script is designed to perform integration tests on a Kafka instance. To execute the tests, this script relies on the following scripts: standalone.sh and do_bsm_test.sh.
 
 To ensure proper execution, it is recommended to run this script outside of the dev container where docker is available. This is because the script will spin up a standalone kafka instance and will not be able to access the docker daemon from within the dev container.
 
 It should be noted that this script and any dependent scripts need to use the LF end-of-line sequence. These include the following:
 - do_kafka_test.sh
 - standalone.sh
-- standalone_multi.sh
 - do_bsm_test.sh
-- do_tim_test.sh
 - test_in.py
 - test_out.py
 

do_kafka_test.sh

@@ -15,7 +15,6 @@ NC='\033[0m' # No Color
 
 MAP_FILE=data/I_80.edges
 BSM_DATA_FILE=data/I_80_test.json
-TIM_DATA_FILE=data/I_80_test_TIMS.json
 PPM_CONTAINER_NAME=test_ppm_instance
 PPM_IMAGE_TAG=do-kafka-test-ppm-image
 PPM_IMAGE_NAME=jpo-cvdp_ppm
@@ -38,7 +37,6 @@ setup() {
     echo "KAFKA_CONTAINER_NAME is resolved dynamically"
     echo "MAP_FILE: $MAP_FILE"
     echo "BSM_DATA_FILE: $BSM_DATA_FILE"
-    echo "TIM_DATA_FILE: $TIM_DATA_FILE"
     echo "PPM_CONTAINER_NAME: $PPM_CONTAINER_NAME"
     echo "PPM_IMAGE_TAG: $PPM_IMAGE_TAG"
     echo "PPM_IMAGE_NAME: $PPM_IMAGE_NAME"
@@ -63,12 +61,8 @@ waitForKafkaToCreateTopics() {
         allTopicsCreated=true
         if [ $(echo $ltopics | grep "topic.FilteredOdeBsmJson" | wc -l) == "0" ]; then
             allTopicsCreated=false
-        elif [ $(echo $ltopics | grep "topic.FilteredOdeTimJson" | wc -l) == "0" ]; then
-            allTopicsCreated=false
         elif [ $(echo $ltopics | grep "topic.OdeBsmJson" | wc -l) == "0" ]; then
             allTopicsCreated=false
-        elif [ $(echo $ltopics | grep "topic.OdeTimJson" | wc -l) == "0" ]; then
-            allTopicsCreated=false
         fi
 
         if [ $allTopicsCreated == true ]; then
@@ -94,57 +88,38 @@ run_tests() {
     echo "--- File Being Used ---"
     echo $MAP_FILE
     echo $BSM_DATA_FILE
-    echo $TIM_DATA_FILE
     echo "-----------------"
 
-    numberOfTests=10
+    numberOfTests=6
     echo -e $YELLOW"Test 1/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c1.properties $BSM_DATA_FILE BSM 0
+    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c1.properties $BSM_DATA_FILE 0
     echo ""
     echo ""
 
     echo -e $YELLOW"Test 2/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c2.properties $BSM_DATA_FILE BSM 10
+    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c2.properties $BSM_DATA_FILE 10
     echo ""
     echo ""
 
     echo -e $YELLOW"Test 3/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c3.properties $BSM_DATA_FILE BSM 18
+    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c3.properties $BSM_DATA_FILE 18
     echo ""
     echo ""
 
     echo -e $YELLOW"Test 4/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c4.properties $BSM_DATA_FILE BSM 23
+    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c4.properties $BSM_DATA_FILE 23
     echo ""
     echo ""
 
     echo -e $YELLOW"Test 5/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c5.properties $BSM_DATA_FILE BSM 33
+    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c5.properties $BSM_DATA_FILE 33
     echo ""
     echo ""
 
     echo -e $YELLOW"Test 6/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c6.properties $BSM_DATA_FILE BSM 43
-    echo ""
-    echo ""
-
-    echo -e $YELLOW"Test 7/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/tim-test/c1.properties $TIM_DATA_FILE TIM 0
-    echo ""
-    echo ""
-
-    echo -e $YELLOW"Test 8/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/tim-test/c2.properties $TIM_DATA_FILE TIM 10
-    echo ""
-    echo ""
-
-    echo -e $YELLOW"Test 9/$numberOfTests"$NC
-    ./test-scripts/standalone.sh $MAP_FILE config/tim-test/c3.properties $TIM_DATA_FILE TIM 18
+    ./test-scripts/standalone.sh $MAP_FILE config/bsm-test/c6.properties $BSM_DATA_FILE 43
     echo ""
     echo ""
-
-    echo -e $YELLOW"Test 10/$numberOfTests (2 tests in one)"$NC
-    ./test-scripts/standalone_multi.sh $MAP_FILE config/bsm-test/c6.properties config/tim-test/c3.properties $BSM_DATA_FILE $TIM_DATA_FILE 48 23
 }
 
 cleanup() {