From 73f3682bb450300c02916960d206d499f1fd7da9 Mon Sep 17 00:00:00 2001 From: MrBartWolf Date: Mon, 6 Apr 2020 19:14:42 -0400 Subject: [PATCH 1/4] Changed lj to work with running and testing only options. --- lj | 102 +++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 37 deletions(-) mode change 100755 => 100644 lj diff --git a/lj b/lj old mode 100755 new mode 100644 index f89a274..20ac434 --- a/lj +++ b/lj @@ -7,22 +7,41 @@ help() { echo "Usage: $0 [options] file" echo "" echo " Options:" - echo " -h Print this help message and exit" - echo " -t Print type changes found by type inference" - echo " -v Print output from Gradle" + echo " -r Compile and run the program without testing" + echo " -t Compile and test the program without running" + echo " -h Print this help message and exit" + echo " --print-types Print type changes found by type inference" + echo " -v Print output from Gradle" } args="run" verbose=false -while getopts :thv flag; do +running=true +testing=true +while getopts :rthv-: flag; do case $flag in + -) + case "${OPTARG}" in + print-types) + args="${args} -PprintTypeChanges" + ;; + *) + echo "Unrecognized option $OPTARG" 1>&2 + echo + help + exit + ;; + esac;; + r) + testing=false + ;; + t) + running=false + ;; h) help exit ;; - t) - args="${args} -PprintTypeChanges" - ;; v) verbose=true ;; @@ -49,37 +68,46 @@ fi args="${args} -Ptestfile=${1}" "$GRADLE_WRAPPER" $args - -# If the less-java file contains the string "main()", attempt to run it. -# Otherwise, release a warning and continue -parent=$(dirname $1) -base=$(basename $1) -name=${base%.*} -count=$(grep -c "main()" "$1") -if [ "$count" -gt "0" ]; -then - if [ -e "$parent/$name.in" ]; - then - java -cp generated Main < "$parent/$name.in" - else - java -cp generated Main - fi -else - echo "Warning: This program does not contain a main() function and will not be run" +compile_status="$?" +if [ "$compile_status" -gt "0" ]; then + exit fi -# --class-path allows specifying where JUnit should look for tests -# --include-classname allows the name to be anything -# --disable-banner disables the banner asking contributing to JUnit -# --scan-class-path checks the full classpath for tests -# Get the output but do not print it yet -test_output="$(java -jar libs/junit-platform-console-standalone-1.4.2.jar --class-path ".:generated" --include-classname='.*' --disable-banner --scan-class-path)" -# Preserve the exit code of the tests -test_status="$?" +if $testing; then + # --class-path allows specifying where JUnit should look for tests + # --include-classname allows the name to be anything + # --disable-banner disables the banner asking contributing to JUnit + # --scan-class-path checks the full classpath for tests + # Get the output but do not print it yet + test_output="$(java -jar libs/junit-platform-console-standalone-1.4.2.jar --class-path ".:generated" --include-classname='.*' --disable-banner --scan-class-path)" + # Preserve the exit code of the tests + test_status="$?" + + # The grep -v filter removes lines that are unnecessary or potentially + # confusing to an end user. + echo "$test_output" | grep -v -e '\[.*containers.*\]' -e 'JUnit Vintage' -e 'Test run finished after' + echo -# The grep -v filter removes lines that are unnecessary or potentially -# confusing to an end user. -echo "$test_output" | grep -v -e '\[.*containers.*\]' -e 'JUnit Vintage' -e 'Test run finished after' + # Ensure the exit code from the tests is the exit code of the script + if [ "$test_status" -gt "0" ]; then + exit 1 + fi +fi -# Ensure the exit code from the tests is the exit code of the script -exit "$test_status" +if $running; then + # IF the less-java file contains the string "main()", attempt to run it. + # Otherwise, release a warning and continue + parent=$(dirname $1) + base=$(basename $1) + name=${base%.*} + count=$(grep -c "main()" "$1") + if [ "$count" -gt "0" ]; then + if [ -e "$parent/$name.in" ]; then + java -cp generated Main < "$parent/$name.in" + else + java -cp generated Main + fi + else + echo "Warning: This program does not contain a main() function and will not be run." + fi +fi From 7273db0b23b7d9fd7572fdbb61f81a743ab204bf Mon Sep 17 00:00:00 2001 From: TorqyTheWolf Date: Tue, 7 Apr 2020 19:38:54 -0400 Subject: [PATCH 2/4] Fixed permissions issue --- lj | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 lj diff --git a/lj b/lj old mode 100644 new mode 100755 From 36b33083ee1f660467b3dd1d1b7ca36f4a52f88d Mon Sep 17 00:00:00 2001 From: MrBartWolf Date: Tue, 7 Apr 2020 19:55:52 -0400 Subject: [PATCH 3/4] Filled empty expected test outputs. --- tests/comp/outputs/3np1for.exp | 3 ++- tests/comp/outputs/3np1while.exp | 3 ++- tests/comp/outputs/abracadabra.exp | 19 ++++++++------- tests/comp/outputs/different.exp | 3 ++- tests/comp/outputs/fizzbuzz.exp | 19 ++++++++------- tests/comp/outputs/oddgnome.exp | 3 ++- tests/io/outputs/add.exp | 4 ++- tests/io/outputs/collections.exp | 6 +++-- tests/io/outputs/for-loop.exp | 4 ++- tests/io/outputs/hello-world.exp | 3 ++- tests/io/outputs/input.exp | 11 +++++---- tests/io/outputs/input2.exp | 3 ++- tests/io/outputs/print.exp | 9 ++++--- tests/io/outputs/sum.exp | 13 +++++----- tests/outputs/add.exp | 3 ++- tests/outputs/adder.exp | 3 ++- tests/outputs/bracket-access.exp | 3 ++- tests/outputs/car.exp | 3 ++- tests/outputs/collections.exp | 3 ++- tests/outputs/counterexample.exp | 5 ++-- tests/outputs/demo.exp | 31 ++++++++++++------------ tests/outputs/dog.exp | 3 ++- tests/outputs/eqtests.exp | 3 ++- tests/outputs/fact.exp | 3 ++- tests/outputs/forloop.exp | 3 ++- tests/outputs/format.exp | 3 ++- tests/outputs/fp.exp | 3 ++- tests/outputs/global.exp | 7 +++--- tests/outputs/list_remove.exp | 3 ++- tests/outputs/mangled_name_collision.exp | 1 + tests/outputs/oop.exp | 3 ++- tests/outputs/precedence.exp | 3 ++- tests/outputs/primitive-numbers.exp | 3 ++- tests/outputs/quicksort.exp | 3 ++- tests/outputs/shadow.exp | 3 ++- tests/outputs/type-inference.exp | 3 ++- tests/outputs/unit-test.exp | 3 ++- tests/outputs/unop.exp | 3 ++- tests/outputs/z.exp | 1 + tests/user-submitted/outputs/kyle.exp | 3 ++- tests/user-submitted/outputs/payroll.exp | 7 +++--- 41 files changed, 131 insertions(+), 87 deletions(-) diff --git a/tests/comp/outputs/3np1for.exp b/tests/comp/outputs/3np1for.exp index 27b346a..03f923a 100644 --- a/tests/comp/outputs/3np1for.exp +++ b/tests/comp/outputs/3np1for.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -13,3 +12,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 4 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/comp/outputs/3np1while.exp b/tests/comp/outputs/3np1while.exp index 8ecb9c5..2b313a3 100644 --- a/tests/comp/outputs/3np1while.exp +++ b/tests/comp/outputs/3np1while.exp @@ -1,4 +1,3 @@ -1 ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -15,3 +14,5 @@ [ 0 tests aborted ] [ 6 tests successful ] [ 0 tests failed ] + +1 diff --git a/tests/comp/outputs/abracadabra.exp b/tests/comp/outputs/abracadabra.exp index 8b476cb..9ae5d2d 100644 --- a/tests/comp/outputs/abracadabra.exp +++ b/tests/comp/outputs/abracadabra.exp @@ -1,3 +1,13 @@ +╷ +├─ JUnit Jupiter ✔ + +[ 0 tests found ] +[ 0 tests skipped ] +[ 0 tests started ] +[ 0 tests aborted ] +[ 0 tests successful ] +[ 0 tests failed ] + 1 Abracadabra 2 Abracadabra 3 Abracadabra @@ -13,12 +23,3 @@ 8 Abracadabra 9 Abracadabra 10 Abracadabra -╷ -├─ JUnit Jupiter ✔ - -[ 0 tests found ] -[ 0 tests skipped ] -[ 0 tests started ] -[ 0 tests aborted ] -[ 0 tests successful ] -[ 0 tests failed ] diff --git a/tests/comp/outputs/different.exp b/tests/comp/outputs/different.exp index 27b346a..03f923a 100644 --- a/tests/comp/outputs/different.exp +++ b/tests/comp/outputs/different.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -13,3 +12,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 4 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/comp/outputs/fizzbuzz.exp b/tests/comp/outputs/fizzbuzz.exp index 93220ce..d14383a 100644 --- a/tests/comp/outputs/fizzbuzz.exp +++ b/tests/comp/outputs/fizzbuzz.exp @@ -1,3 +1,13 @@ +╷ +├─ JUnit Jupiter ✔ + +[ 0 tests found ] +[ 0 tests skipped ] +[ 0 tests started ] +[ 0 tests aborted ] +[ 0 tests successful ] +[ 0 tests failed ] + 1 Fizz Buzz @@ -19,12 +29,3 @@ Fizz Buzz Fizz 7 -╷ -├─ JUnit Jupiter ✔ - -[ 0 tests found ] -[ 0 tests skipped ] -[ 0 tests started ] -[ 0 tests aborted ] -[ 0 tests successful ] -[ 0 tests failed ] diff --git a/tests/comp/outputs/oddgnome.exp b/tests/comp/outputs/oddgnome.exp index 1763652..a3e5850 100644 --- a/tests/comp/outputs/oddgnome.exp +++ b/tests/comp/outputs/oddgnome.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -10,3 +9,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 1 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/io/outputs/add.exp b/tests/io/outputs/add.exp index be635ff..11e0cc6 100644 --- a/tests/io/outputs/add.exp +++ b/tests/io/outputs/add.exp @@ -1,4 +1,4 @@ -17╷ +╷ ├─ JUnit Jupiter ✔ [ 0 tests found ] @@ -7,3 +7,5 @@ [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +17 \ No newline at end of file diff --git a/tests/io/outputs/collections.exp b/tests/io/outputs/collections.exp index 1d117e5..bf67757 100644 --- a/tests/io/outputs/collections.exp +++ b/tests/io/outputs/collections.exp @@ -1,5 +1,4 @@ -enter 3 space-separated words -[dog, flapjack, potable]╷ +╷ ├─ JUnit Jupiter ✔ [ 0 tests found ] @@ -8,3 +7,6 @@ enter 3 space-separated words [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +enter 3 space-separated words +[dog, flapjack, potable] \ No newline at end of file diff --git a/tests/io/outputs/for-loop.exp b/tests/io/outputs/for-loop.exp index 98ccf38..bd6f264 100644 --- a/tests/io/outputs/for-loop.exp +++ b/tests/io/outputs/for-loop.exp @@ -1,4 +1,4 @@ -abc╷ +╷ ├─ JUnit Jupiter ✔ [ 0 tests found ] @@ -7,3 +7,5 @@ abc╷ [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +abc diff --git a/tests/io/outputs/hello-world.exp b/tests/io/outputs/hello-world.exp index 9524f3e..1bc15be 100644 --- a/tests/io/outputs/hello-world.exp +++ b/tests/io/outputs/hello-world.exp @@ -1,4 +1,3 @@ -Hello, World! ╷ ├─ JUnit Jupiter ✔ @@ -8,3 +7,5 @@ Hello, World! [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +Hello, World! diff --git a/tests/io/outputs/input.exp b/tests/io/outputs/input.exp index 172b27b..c07747b 100644 --- a/tests/io/outputs/input.exp +++ b/tests/io/outputs/input.exp @@ -1,8 +1,3 @@ -Integer: 5 -Double: 3.14 -Character: x -Word: hello -Line: This is a line-based test. ╷ ├─ JUnit Jupiter ✔ @@ -12,3 +7,9 @@ Line: This is a line-based test. [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +Integer: 5 +Double: 3.14 +Character: x +Word: hello +Line: This is a line-based test. diff --git a/tests/io/outputs/input2.exp b/tests/io/outputs/input2.exp index 11358f4..5bd37b6 100644 --- a/tests/io/outputs/input2.exp +++ b/tests/io/outputs/input2.exp @@ -1,4 +1,3 @@ -how are you? ╷ ├─ JUnit Jupiter ✔ @@ -8,3 +7,5 @@ how are you? [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +how are you? diff --git a/tests/io/outputs/print.exp b/tests/io/outputs/print.exp index a4045f8..230a8e5 100644 --- a/tests/io/outputs/print.exp +++ b/tests/io/outputs/print.exp @@ -1,7 +1,3 @@ -1atrue -1 -true -ahi ╷ ├─ JUnit Jupiter ✔ @@ -11,3 +7,8 @@ ahi [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +1atrue +1 +true +ahi diff --git a/tests/io/outputs/sum.exp b/tests/io/outputs/sum.exp index fd0096d..0c10038 100644 --- a/tests/io/outputs/sum.exp +++ b/tests/io/outputs/sum.exp @@ -1,9 +1,3 @@ -Enter positive integers to sum, one per line (-1 to exit): -3 -4 -9 -11 -Sum: 11 ╷ ├─ JUnit Jupiter ✔ @@ -13,3 +7,10 @@ Sum: 11 [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +Enter positive integers to sum, one per line (-1 to exit): +3 +4 +9 +11 +Sum: 11 diff --git a/tests/outputs/add.exp b/tests/outputs/add.exp index 27b346a..03f923a 100644 --- a/tests/outputs/add.exp +++ b/tests/outputs/add.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -13,3 +12,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 4 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/adder.exp b/tests/outputs/adder.exp index 06c4e2e..ee62399 100644 --- a/tests/outputs/adder.exp +++ b/tests/outputs/adder.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -12,3 +11,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 3 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/bracket-access.exp b/tests/outputs/bracket-access.exp index 1763652..a3e5850 100644 --- a/tests/outputs/bracket-access.exp +++ b/tests/outputs/bracket-access.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -10,3 +9,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 1 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/car.exp b/tests/outputs/car.exp index caa81ca..5db51f9 100644 --- a/tests/outputs/car.exp +++ b/tests/outputs/car.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -11,3 +10,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 2 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/collections.exp b/tests/outputs/collections.exp index a93c81e..5271aec 100644 --- a/tests/outputs/collections.exp +++ b/tests/outputs/collections.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -38,3 +37,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 29 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/counterexample.exp b/tests/outputs/counterexample.exp index d902129..c06c9c5 100644 --- a/tests/outputs/counterexample.exp +++ b/tests/outputs/counterexample.exp @@ -1,5 +1,3 @@ -Hello from A! -Hello from B! ╷ ├─ JUnit Jupiter ✔ @@ -9,3 +7,6 @@ Hello from B! [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +Hello from A! +Hello from B! diff --git a/tests/outputs/demo.exp b/tests/outputs/demo.exp index ac9fb7b..590248c 100644 --- a/tests/outputs/demo.exp +++ b/tests/outputs/demo.exp @@ -28,36 +28,37 @@ p1 (0) is less than p2 (10) 7 8 9 +p2 (0) is less than p1 (10) +╷ +├─ JUnit Jupiter ✔ +│ └─ Main ✔ +│ ├─ test0() ✔ +│ └─ test1() ✔ + +[ 2 tests found ] +[ 0 tests skipped ] +[ 2 tests started ] +[ 0 tests aborted ] +[ 2 tests successful ] +[ 0 tests failed ] + 0 1 2 3 4 +5 6 7 8 9 -p1 (0) is less than p2 (10) 0 1 2 3 4 -5 6 7 8 9 -p2 (0) is less than p1 (10) -╷ -├─ JUnit Jupiter ✔ -│ └─ Main ✔ -│ ├─ test0() ✔ -│ └─ test1() ✔ - -[ 2 tests found ] -[ 0 tests skipped ] -[ 2 tests started ] -[ 0 tests aborted ] -[ 2 tests successful ] -[ 0 tests failed ] +p1 (0) is less than p2 (10) diff --git a/tests/outputs/dog.exp b/tests/outputs/dog.exp index caa81ca..5db51f9 100644 --- a/tests/outputs/dog.exp +++ b/tests/outputs/dog.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -11,3 +10,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 2 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/eqtests.exp b/tests/outputs/eqtests.exp index 1f878e4..1c36421 100644 --- a/tests/outputs/eqtests.exp +++ b/tests/outputs/eqtests.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -17,3 +16,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 8 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/fact.exp b/tests/outputs/fact.exp index c34ed98..985f5d3 100644 --- a/tests/outputs/fact.exp +++ b/tests/outputs/fact.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -14,3 +13,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 5 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/forloop.exp b/tests/outputs/forloop.exp index caa81ca..5db51f9 100644 --- a/tests/outputs/forloop.exp +++ b/tests/outputs/forloop.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -11,3 +10,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 2 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/format.exp b/tests/outputs/format.exp index 05898b0..056fe53 100644 --- a/tests/outputs/format.exp +++ b/tests/outputs/format.exp @@ -1,4 +1,3 @@ -3 ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -10,3 +9,5 @@ [ 0 tests aborted ] [ 1 tests successful ] [ 0 tests failed ] + +3 diff --git a/tests/outputs/fp.exp b/tests/outputs/fp.exp index caa81ca..5db51f9 100644 --- a/tests/outputs/fp.exp +++ b/tests/outputs/fp.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -11,3 +10,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 2 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/global.exp b/tests/outputs/global.exp index bd3d5e5..56eccfc 100644 --- a/tests/outputs/global.exp +++ b/tests/outputs/global.exp @@ -1,6 +1,3 @@ -c -[a] -done ╷ ├─ JUnit Jupiter ✔ @@ -10,3 +7,7 @@ done [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +c +[a] +done diff --git a/tests/outputs/list_remove.exp b/tests/outputs/list_remove.exp index 1763652..a3e5850 100644 --- a/tests/outputs/list_remove.exp +++ b/tests/outputs/list_remove.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -10,3 +9,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 1 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/mangled_name_collision.exp b/tests/outputs/mangled_name_collision.exp index f5b9a85..d5a97fb 100644 --- a/tests/outputs/mangled_name_collision.exp +++ b/tests/outputs/mangled_name_collision.exp @@ -7,3 +7,4 @@ [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + diff --git a/tests/outputs/oop.exp b/tests/outputs/oop.exp index 1763652..a3e5850 100644 --- a/tests/outputs/oop.exp +++ b/tests/outputs/oop.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -10,3 +9,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 1 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/precedence.exp b/tests/outputs/precedence.exp index 9f578fa..6adcc86 100644 --- a/tests/outputs/precedence.exp +++ b/tests/outputs/precedence.exp @@ -1,4 +1,3 @@ -2 ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -10,3 +9,5 @@ [ 0 tests aborted ] [ 1 tests successful ] [ 0 tests failed ] + +2 diff --git a/tests/outputs/primitive-numbers.exp b/tests/outputs/primitive-numbers.exp index 702cb2f..db3ae22 100644 --- a/tests/outputs/primitive-numbers.exp +++ b/tests/outputs/primitive-numbers.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -15,3 +14,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 6 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/quicksort.exp b/tests/outputs/quicksort.exp index 27b346a..03f923a 100644 --- a/tests/outputs/quicksort.exp +++ b/tests/outputs/quicksort.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -13,3 +12,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 4 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/shadow.exp b/tests/outputs/shadow.exp index 1763652..a3e5850 100644 --- a/tests/outputs/shadow.exp +++ b/tests/outputs/shadow.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -10,3 +9,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 1 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/type-inference.exp b/tests/outputs/type-inference.exp index 1df6808..2480914 100644 --- a/tests/outputs/type-inference.exp +++ b/tests/outputs/type-inference.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -30,3 +29,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 21 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/unit-test.exp b/tests/outputs/unit-test.exp index 1763652..a3e5850 100644 --- a/tests/outputs/unit-test.exp +++ b/tests/outputs/unit-test.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -10,3 +9,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 1 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run. diff --git a/tests/outputs/unop.exp b/tests/outputs/unop.exp index 030cd4a..5fabfad 100644 --- a/tests/outputs/unop.exp +++ b/tests/outputs/unop.exp @@ -1,4 +1,3 @@ --1 ╷ ├─ JUnit Jupiter ✔ @@ -8,3 +7,5 @@ [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +-1 diff --git a/tests/outputs/z.exp b/tests/outputs/z.exp index f5b9a85..d5a97fb 100644 --- a/tests/outputs/z.exp +++ b/tests/outputs/z.exp @@ -7,3 +7,4 @@ [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + diff --git a/tests/user-submitted/outputs/kyle.exp b/tests/user-submitted/outputs/kyle.exp index ed79620..d494c41 100644 --- a/tests/user-submitted/outputs/kyle.exp +++ b/tests/user-submitted/outputs/kyle.exp @@ -1,4 +1,3 @@ -Kyle is a 21-year-old Computer Science major ╷ ├─ JUnit Jupiter ✔ @@ -8,3 +7,5 @@ Kyle is a 21-year-old Computer Science major [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +Kyle is a 21-year-old Computer Science major diff --git a/tests/user-submitted/outputs/payroll.exp b/tests/user-submitted/outputs/payroll.exp index e84c1d0..f46d3ed 100644 --- a/tests/user-submitted/outputs/payroll.exp +++ b/tests/user-submitted/outputs/payroll.exp @@ -1,6 +1,3 @@ -What is your name? How many hours did you work this week? What is your hourly payrate? -Hello Alice -Your gross pay is $597.500000 ╷ ├─ JUnit Jupiter ✔ @@ -10,3 +7,7 @@ Your gross pay is $597.500000 [ 0 tests aborted ] [ 0 tests successful ] [ 0 tests failed ] + +What is your name? How many hours did you work this week? What is your hourly payrate? +Hello Alice +Your gross pay is $597.500000 From 519a5803cbdda26c6598d7fe0fd5aae1d1a204d6 Mon Sep 17 00:00:00 2001 From: MrBartWolf Date: Tue, 7 Apr 2020 20:45:22 -0400 Subject: [PATCH 4/4] Updated branch to meet current tests. --- tests/outputs/increment.exp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/outputs/increment.exp b/tests/outputs/increment.exp index 27b346a..03f923a 100644 --- a/tests/outputs/increment.exp +++ b/tests/outputs/increment.exp @@ -1,4 +1,3 @@ -Warning: This program does not contain a main() function and will not be run ╷ ├─ JUnit Jupiter ✔ │ └─ Main ✔ @@ -13,3 +12,5 @@ Warning: This program does not contain a main() function and will not be run [ 0 tests aborted ] [ 4 tests successful ] [ 0 tests failed ] + +Warning: This program does not contain a main() function and will not be run.