all tests except compiles-4-section

ourPLCC · Mar 6, 2024 · 968b84e · 968b84e
1 parent d577c07
commit 968b84e
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 31 deletions.
diff --git a/tests/plcc/can-print-json-ast/prints-json-ast.bats b/tests/plcc/can-print-json-ast/prints-json-ast.bats
@@ -1,19 +1,21 @@
 #!/usr/bin/env bats
 
+teardown() {
+  rm -rf ${BATS_TMPDIR}/expected.json
+  rm -rf ${BATS_TMPDIR}/given-grammar.lang
+  rm -rf ${BATS_TMPDIR}/given-program.lang
+  rm -rf ${BATS_TMPDIR}/result.json
+  rm -rf ${BATS_TMPDIR}/Java
+}
+
 @test "PLCC can print JSON AST." {
   FILES="expected.json given-grammar.lang given-program.lang"
   for f in $FILES ; do
     cp "${BATS_TEST_DIRNAME}/${f}" "${BATS_TMPDIR}"
   done
 
-  cp "${BATS_TEST_DIRNAME}"/* "$BATS_TMPDIR/"
   cd "${BATS_TMPDIR}"
   plccmk --json_ast given-grammar.lang
   parse -n --json_ast < given-program.lang > result.json
   diff expected.json result.json
-
-  for f in $FILES ; do
-    rm "${BATS_TMPDIR}/${f}"
-  done
-  rm "${BATS_TMPDIR}/result.json"
 }
diff --git a/tests/plcc/compiles-4-section/compiles-4-section.bats b/tests/plcc/compiles-4-section/compiles-4-section.bats
@@ -1,6 +1,10 @@
 #!/usr/bin/env bats
 
-@test "PLCC compiles the OBJ language." {
+teardown() {
+  rm -rf "$BATS_TMPDIR/OBJ"
+}
+
+@test "PLCC compiles with 4 sections." {
   # Copy the OBJ language to the temp directory for this test
   cp -R "${BATS_TEST_DIRNAME}/OBJ" "${BATS_TMPDIR}"
 
@@ -14,14 +18,12 @@
   cd Java
 
   # Compile the Java files.
-  run javac *.java
+  run javac -cp /../../../../../lib/jackson/* *.java
 
   # Print stdout and stderr for debugging.
   echo "OUTPUT: $output"
   echo "ERROR: $error"
 
   # Assert success.
   [ "$status" -eq 0 ]
-
-  rm -rf "$BATS_TMPDIR/OBJ"
 }
diff --git a/tests/plcc/compiles-obj/compiles-obj.bats b/tests/plcc/compiles-obj/compiles-obj.bats
@@ -1,5 +1,9 @@
 #!/usr/bin/env bats
 
+teardown() {
+  rm -rf "$BATS_TMPDIR/OBJ"
+}
+
 @test "PLCC compiles the OBJ language." {
   # Copy the OBJ language to the temp directory for this test
   cp -R "${BATS_TEST_DIRNAME}/OBJ" "${BATS_TMPDIR}"
@@ -22,6 +26,4 @@
 
   # Assert success.
   [ "$status" -eq 0 ]
-
-  rm -rf "$BATS_TMPDIR/OBJ"
 }
diff --git a/tests/plcc/detects-illegal-tokens.bats b/tests/plcc/detects-illegal-tokens.bats
@@ -1,5 +1,9 @@
 #!/usr/bin/env bats
 
+teardown() {
+  rm -rf ${BATS_TMPDIR}/grammar
+}
+
 @test "PLCC detects illegal tokens." {
   # GIVEN a grammar file with a bad token name
   cat << EOF > "$BATS_TMPDIR/grammar"
@@ -18,7 +22,4 @@ EOF
 
   # AND plcc reports that there is an "illegal token name"
   [[ "$output" = *"illegal token name"* ]]
-
-  # cleanup
-  rm "$BATS_TMPDIR/grammar"
 }
diff --git a/tests/plcc/generate-python.bats b/tests/plcc/generate-python.bats
@@ -1,5 +1,11 @@
 #!/usr/bin/env bats
 
+teardown() {
+  rm -rf ${BATS_TMPDIR}/grammar
+  rm -rf ${BATS_TMPDIR}/Java
+  rm -rf ${BATS_TMPDIR}/Python
+}
+
 @test "Creates Python directory when 4th section detected." {
   cat << EOF > "$BATS_TMPDIR/grammar"
 A 'A'
@@ -12,12 +18,8 @@ skip OTHER '.'
 %
 EOF
 
-  RESULT="$(cd "$BATS_TMPDIR" && plccmk -c grammar)"
+  RESULT="$(cd "$BATS_TMPDIR" && plccmk --json_ast grammar)"
 
   echo "RESULT: $RESULT"
   [[ -d $BATS_TMPDIR/Python ]]
-
-  rm -rf "$BATS_TMPDIR/grammar"
-  rm -rf "$BATS_TMPDIR/Java"
-  rm -rf "$BATS_TMPDIR/Python"
-}
+}
diff --git a/tests/plcc/no-4th-section.bats b/tests/plcc/no-4th-section.bats
@@ -1,5 +1,10 @@
 #!/usr/bin/env bats
 
+teardown() {
+  rm -rf ${BATS_TMPDIR}/grammar
+  rm -rf ${BATS_TMPDIR}/Java
+}
+
 @test "Functions correctly when no 4th section exists." {
   cat << EOF > "$BATS_TMPDIR/grammar"
 A 'A'
@@ -15,7 +20,4 @@ EOF
 
   echo "RESULT: $RESULT"
   [[ ! -d $BATS_TMPDIR/Python ]]
-
-  rm -rf "$BATS_TMPDIR/grammar"
-  rm -rf "$BATS_TMPDIR/Java"
-}
+}
diff --git a/tests/plcc/parses.bats b/tests/plcc/parses.bats
@@ -1,5 +1,10 @@
 #!/usr/bin/env bats
 
+teardown() {
+  rm -rf ${BATS_TMPDIR}/grammar
+  rm -rf ${BATS_TMPDIR}/Java
+}
+
 @test "PLCC parses." {
   cat << EOF > "$BATS_TMPDIR/grammar"
 A 'A'
@@ -14,7 +19,4 @@ EOF
 
   echo "RESULT: $RESULT"
   [[ "$RESULT" =~ .*OK.* ]]
-
-  rm -rf "$BATS_TMPDIR/grammar"
-  rm -rf "$BATS_TMPDIR/Java"
 }
diff --git a/tests/plcc/scans-tokens.bats b/tests/plcc/scans-tokens.bats
@@ -1,5 +1,10 @@
 #!/usr/bin/env bats
 
+teardown() {
+  rm -rf ${BATS_TMPDIR}/grammar
+  rm -rf ${BATS_TMPDIR}/Java
+}
+
 @test "PLCC scans." {
   cat << EOF > "$BATS_TMPDIR/grammar"
 skip WHITESPACE '\s'
@@ -20,7 +25,4 @@ EOF
   [[ "$TOKENS" =~ "FOO 'foo'" ]]
   [[ "$TOKENS" =~ "BAR 'bar'" ]]
   [[ "$TOKENS" =~ "ID 'foobar'" ]]
-
-  rm -rf "$BATS_TMPDIR/grammar"
-  rm -rf "$BATS_TMPDIR/Java"
 }