Merge pull request #443 from jwest115/issue-404-unit-tests

Add unit test for duplicate file names
nasa · Jun 10, 2024 · 9fd4653 · 9fd4653
2 parents b8788d6 + 61e31ef
commit 9fd4653
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 3 deletions.
diff --git a/compiler/tools/fpp-to-dict/test/scripts/run.sh b/compiler/tools/fpp-to-dict/test/scripts/run.sh
@@ -20,7 +20,7 @@ run_test()
   else
     outfile=$infile
   fi
-  $fpp_to_dict $args $infile.fpp 2>&1
+  $fpp_to_dict $args $infile.fpp 2>&1 | remove_author | remove_path_prefix > $outfile.out.txt
 }
 
 . ./tests.sh
@@ -31,7 +31,7 @@ do
   echo "
 $t()
 {
-  run_test $t
+  run_test '' $t
 }"
 done > default-tests.sh
 . ./default-tests.sh

diff --git a/compiler/tools/fpp-to-dict/test/scripts/update-ref.sh b/compiler/tools/fpp-to-dict/test/scripts/update-ref.sh
@@ -14,7 +14,7 @@ update()
   else
     outfile=$infile
   fi
-  $fpp_to_dict $args $infile.fpp 2>&1
+  $fpp_to_dict $args $infile.fpp 2>&1 | remove_path_prefix > $outfile.ref.txt
 }
 
 for file in `find . -name '*.ref.txt'`

diff --git a/compiler/tools/fpp-to-dict/test/top/dataProducts.ref.txt b/compiler/tools/fpp-to-dict/test/top/dataProducts.ref.txt
diff --git a/compiler/tools/fpp-to-dict/test/top/duplicate.fpp b/compiler/tools/fpp-to-dict/test/top/duplicate.fpp
@@ -0,0 +1,8 @@
+module M {
+
+  topology Duplicate { 
+  }
+}
+
+topology Duplicate { 
+}
diff --git a/compiler/tools/fpp-to-dict/test/top/duplicate.ref.txt b/compiler/tools/fpp-to-dict/test/top/duplicate.ref.txt
@@ -0,0 +1,9 @@
+fpp-to-dict
+[ local path prefix ]/tools/fpp-to-dict/test/top/duplicate.fpp:7.1
+topology Duplicate { 
+^
+error: duplicate JSON file DuplicateTopologyDictionary.json
+previous file would be generated here:
+[ local path prefix ]/tools/fpp-to-dict/test/top/duplicate.fpp:3.3
+  topology Duplicate { 
+  ^
diff --git a/compiler/tools/fpp-to-dict/test/top/multipleTops.ref.txt b/compiler/tools/fpp-to-dict/test/top/multipleTops.ref.txt
diff --git a/compiler/tools/fpp-to-dict/test/top/run.sh b/compiler/tools/fpp-to-dict/test/top/run.sh
@@ -12,4 +12,10 @@ dataProducts()
   run_test "-i builtin.fpp -p 1.0.0 -f 3.4.3" dataProducts && \
     validate_json_schema BasicDp && \
     diff_json BasicDp
+}
+
+duplicate()
+{
+  run_test '' duplicate && \
+    compare duplicate
 }
diff --git a/compiler/tools/fpp-to-dict/test/top/tests.sh b/compiler/tools/fpp-to-dict/test/top/tests.sh
@@ -1,4 +1,5 @@
 tests="
 multipleTops
 dataProducts
+duplicate
 "