--- a/testing2/docdiff_test.sh Tue Oct 29 14:34:51 2019 +0000
+++ b/testing2/docdiff_test.sh Tue Oct 29 23:56:13 2019 +0000
@@ -15,13 +15,13 @@
# compilation tests
function scala_compile {
- (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc "$1" 2>> $out 1>> $out)
+ (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala "$1" 2>> $out 1>> $out)
}
# functional tests
function scala_assert {
- (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
+ (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
}
# purity test
@@ -37,10 +37,10 @@
if (scala_vars docdiff.scala)
then
- echo " --> fail (make triple-sure your program conforms to the required format)" >> $out
+ echo -e " --> FAIL (make triple-sure your program conforms to the required format)" >> $out
tsts0=$(( 0 ))
else
- echo " --> success" >> $out
+ echo -e " --> success" >> $out
tsts0=$(( 0 ))
fi
@@ -53,10 +53,10 @@
if (scala_compile docdiff.scala)
then
- echo " --> success" >> $out
+ echo -e " --> success" >> $out
tsts=$(( 0 ))
else
- echo " --> scala did not run docdiff.scala" >> $out
+ echo -e " --> SCALA DID NOT RUN docdiff.scala" >> $out
tsts=$(( 1 ))
fi
else
@@ -67,15 +67,15 @@
if [ $tsts -eq 0 ]
then
- echo "docdiff.scala tests:" >> $out
- echo " clean(\"ab a abc\") == List(\"ab\", \"a\", \"abc\")" >> $out
- echo " clean(\"ab*a abc1\") == List(\"ab\", \"a\", \"abc1\")" >> $out
+ echo -e "docdiff.scala tests:" >> $out
+ echo -e " clean(\"ab a abc\") == List(\"ab\", \"a\", \"abc\")" >> $out
+ echo -e " clean(\"ab*a abc1\") == List(\"ab\", \"a\", \"abc1\")" >> $out
if (scala_assert "docdiff.scala" "docdiff_test1.scala")
then
- echo " --> success" >> $out
+ echo -e " --> success\n" >> $out
else
- echo " --> one of the tests failed" >> $out
+ echo -e " --> ONE OF THE TESTS FAILED\n" >> $out
fi
fi
@@ -83,17 +83,17 @@
if [ $tsts -eq 0 ]
then
- echo " occurrences(List(\"a\", \"b\", \"b\", \"c\", \"d\")) == " >> $out
- echo " Map(\"a\" -> 1, \"b\" -> 2, \"c\" -> 1, \"d\" -> 1)" >> $out
- echo " " >> $out
- echo " occurrences(List(\"d\", \"b\", \"d\", \"b\", \"d\")) == " >> $out
- echo " Map(\"d\" -> 3, \"b\" -> 2)" >> $out
+ echo -e " occurrences(List(\"a\", \"b\", \"b\", \"c\", \"d\")) == " >> $out
+ echo -e " Map(\"a\" -> 1, \"b\" -> 2, \"c\" -> 1, \"d\" -> 1)" >> $out
+ echo -e " " >> $out
+ echo -e " occurrences(List(\"d\", \"b\", \"d\", \"b\", \"d\")) == " >> $out
+ echo -e " Map(\"d\" -> 3, \"b\" -> 2)" >> $out
if (scala_assert "docdiff.scala" "docdiff_test2.scala")
then
- echo " --> success" >> $out
+ echo -e " --> success\n" >> $out
else
- echo " --> one of the tests failed" >> $out
+ echo -e " --> ONE OF THE TESTS FAILED\n" >> $out
fi
fi
@@ -101,18 +101,18 @@
if [ $tsts -eq 0 ]
then
- echo " val l1 = List(\"a\", \"b\", \"b\", \"c\", \"d\")" >> $out
- echo " val l2 = List(\"d\", \"b\", \"d\", \"b\", \"d\")" >> $out
- echo " " >> $out
- echo " prod(l1, l2) == 7 " >> $out
- echo " prod(l1, l1) == 7 " >> $out
- echo " prod(l2, l2) == 13 " >> $out
+ echo -e " val l1 = List(\"a\", \"b\", \"b\", \"c\", \"d\")" >> $out
+ echo -e " val l2 = List(\"d\", \"b\", \"d\", \"b\", \"d\")" >> $out
+ echo -e " " >> $out
+ echo -e " prod(l1, l2) == 7 " >> $out
+ echo -e " prod(l1, l1) == 7 " >> $out
+ echo -e " prod(l2, l2) == 13 " >> $out
if (scala_assert "docdiff.scala" "docdiff_test3.scala")
then
- echo " --> success" >> $out
+ echo -e " --> success\n" >> $out
else
- echo " --> one of the tests failed" >> $out
+ echo -e " --> ONE OF THE TESTS FAILED\n" >> $out
fi
fi
@@ -120,17 +120,17 @@
if [ $tsts -eq 0 ]
then
- echo " val l1 = List(\"a\", \"b\", \"b\", \"c\", \"d\")" >> $out
- echo " val l2 = List(\"d\", \"b\", \"d\", \"b\", \"d\")" >> $out
- echo " " >> $out
- echo " overlap(l1, l2) == 0.5384615384615384 " >> $out
- echo " overlap(l1, l1) == 1.0 " >> $out
- echo " overlap(l2, l2) == 1.0 " >> $out
+ echo -e " val l1 = List(\"a\", \"b\", \"b\", \"c\", \"d\")" >> $out
+ echo -e " val l2 = List(\"d\", \"b\", \"d\", \"b\", \"d\")" >> $out
+ echo -e " " >> $out
+ echo -e " overlap(l1, l2) == 0.5384615384615384 " >> $out
+ echo -e " overlap(l1, l1) == 1.0 " >> $out
+ echo -e " overlap(l2, l2) == 1.0 " >> $out
if (scala_assert "docdiff.scala" "docdiff_test4.scala")
then
- echo " --> success" >> $out
+ echo -e " --> success\n" >> $out
else
- echo " --> one of the tests failed" >> $out
+ echo -e " --> ONE OF THE TESTS FAILED\n" >> $out
fi
fi