forth

Author: ErikSchierboom

exercises/practice/forth/.meta/Generator.tpl

@@ -8,7 +8,10 @@ public class {{ testClass }}
     public void {{ test.testMethod }}()
     {
         {{- if test.expected.error }}
-            Assert.Throws<InvalidOperationException>(() => {{ testedClass }}.{{ test.testedMethod }}({{ test.input.instructions }}));
+            Assert.Throws<{{ if test.expected.error == "divide by zero" }}DivideByZeroException{{ else }}InvalidOperationException{{ end }}>(() => {{ testedClass }}.{{ test.testedMethod }}({{ test.input.instructions }}));
+        {{ else if test.property == "evaluateBoth" }}
+            Assert.Equal("{{test.expected[0] | array.join " "}}", {{ testedClass }}.Evaluate({{ test.input.instructionsFirst }}));
+            Assert.Equal("{{test.expected[1] | array.join " "}}", {{ testedClass }}.Evaluate({{ test.input.instructionsSecond }}));
         {{ else }}
             Assert.Equal("{{test.expected | array.join " "}}", {{ testedClass }}.{{ test.testedMethod }}({{ test.input.instructions }}));
         {{ end -}}

exercises/practice/forth/ForthTests.cs

@@ -102,7 +102,7 @@ public void Division_performs_integer_division()
     [Fact(Skip = "Remove this Skip property to run this test")]
     public void Division_errors_if_dividing_by_zero()
     {
-        Assert.Throws<InvalidOperationException>(() => Forth.Evaluate(["4 0 /"]));
+        Assert.Throws<DivideByZeroException>(() => Forth.Evaluate(["4 0 /"]));
     }
 
     [Fact(Skip = "Remove this Skip property to run this test")]
@@ -294,7 +294,8 @@ public void User_defined_words_errors_if_executing_a_non_existent_word()
     [Fact(Skip = "Remove this Skip property to run this test")]
     public void User_defined_words_only_defines_locally()
     {
-        Assert.Equal("[0] [2]", Forth.EvaluateBoth());
+        Assert.Equal("0", Forth.Evaluate([": + - ;", "1 1 +"]));
+        Assert.Equal("2", Forth.Evaluate(["1 1 +"]));
     }
 
     [Fact(Skip = "Remove this Skip property to run this test")]