move some tests to strings and test_multiple!

4 files changed, 75 insertions, 66 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 7441eb7..ce8ee51 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -85,10 +85,82 @@ mod tests {
         assert_errs!(run_string("<!>\n", true), [ErrorKind::Unreachable]);
     }
 
-    test_file!(order_of_operations, "tests/order-of-operations.tdy");
-    test_file!(variables, "tests/variables.tdy");
+    macro_rules! test_multiple {
+        ($mod:ident, $( $fn:ident : $prog:literal ),+ $( , )? ) => {
+            mod $mod {
+                $( test_string!($fn, $prog); )+
+            }
+        }
+    }
+
+    test_multiple!(
+        order_of_operations,
+        terms_and_factors: "1 + 1 * 2 <=> 3
+                            1 * 2 + 3 <=> 5",
+        in_rhs: "5 <=> 1 * 2 + 3",
+        parenthesis: "(1 + 2) * 3 <=> 9",
+        negation: "-1 <=> 0 - 1
+                   -1 + 2 <=> 1
+                   -(1 + 2) <=> -3
+                   1 + -1 <=> 0
+                   2 * -1 <=> -2",
+    );
+
+    test_multiple!(
+        variables,
+        single_variable: "a := 1
+                          a <=> 1",
+        two_variables: "a := 1
+                        b := 2
+                        a <=> 1
+                        b <=> 2",
+        stack_ordering: "a := 1
+                         b := 2
+                         b <=> 2
+                         a <=> 1",
+        assignment: "a := 1
+                     b := 2
+                     a = b
+                     a <=> 2
+                     b <=> 2",
+    );
+
+    test_multiple!(
+        if_,
+        compare_constants_equality: "if 1 == 2 {
+                                       <!>
+                                     }",
+        compare_constants_unequality: "if 1 != 1 {
+                                         <!>
+                                       }",
+        compare_variable: "a := 1
+                           if a == 0 {
+                             <!>
+                           }
+                           if a != 1 {
+                             <!>
+                           }",
+        else_: "a := 1
+                res := 0
+                if a == 0 {
+                  <!>
+                } else {
+                  res = 1
+                }
+                res <=> 1",
+        else_if: "a := 1
+                  res := 0
+                  if a == 0 {
+                    <!>
+                  } else if a == 1 {
+                    res = 1
+                  } else {
+                    <!>
+                  }
+                  res <=> 1",
+    );
+
     test_file!(scoping, "tests/scoping.tdy");
-    test_file!(if_, "tests/if.tdy");
     test_file!(for_, "tests/for.tdy");
     test_file!(fun, "tests/fun.tdy");
 }
diff --git a/tests/if.tdy b/tests/if.tdy
deleted file mode 100644
index be3e3ca..0000000
--- a/tests/if.tdy
+++ /dev/null
@@ -1,29 +0,0 @@
-a : int = 0
-res : int = 0
-
-if 1 == 2 {
-    <!>
-}
-
-a = 1
-if a == 0 {
-    <!>
-}
-
-a = 1
-res = 0
-if a == 1 {
-    res = 1
-}
-res <=> 1
-
-a = 1
-res = 0
-if a == 0 {
-    <!>
-} else if a == 1 {
-    res = 1
-} else {
-    <!>
-}
-res <=> 1
diff --git a/tests/order-of-operations.tdy b/tests/order-of-operations.tdy
deleted file mode 100644
index 4f635b0..0000000
--- a/tests/order-of-operations.tdy
+++ /dev/null
@@ -1,10 +0,0 @@
-1 + 1 * 2 <=> 3
-1 * 2 + 3 <=> 5
-5 <=> 1 * 2 + 3
-(1 + 2) * 3 <=> 9
-//-
--1 <=> 0 - 1
--1 + 2 <=> 1
--(1 + 2) <=> -3
-1 + -1 <=> 0
-2 * -1 <=> -2
diff --git a/tests/variables.tdy b/tests/variables.tdy
deleted file mode 100644
index 74d8cdd..0000000
--- a/tests/variables.tdy
+++ /dev/null
@@ -1,24 +0,0 @@
-// a variable
-a : int = 1
-a <=> 1
-
-// another variable
-b : int = 2
-b <=> 2
-
-// assignment
-a = b
-a <=> 2
-
-// ordering
-c : int = 3
-d : int = 4
-c <=> 3
-d <=> 4
-
-// No types
-
-e := 1
-f := e + 1
-e <=> 1
-f <=> 2