Implement conditionals tests for YS2

Author: weaversam8

examples/yarn2/conditionals-metadata.csv

@@ -0,0 +1 @@
+id,node,lineNumber,tags

examples/yarn2/conditionals.csv

@@ -0,0 +1,5 @@
+id,text,file,node,lineNumber
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/conditionals.yarn-Start-0,This is a test of conditionals and variables.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/conditionals.yarn,Start,3
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/conditionals.yarn-Start-1,"This is a fallback, and should not run.",/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/conditionals.yarn,Start,12
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/conditionals.yarn-var_is_1-2,This node should never be reached.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/conditionals.yarn,var_is_1,18
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/conditionals.yarn-var_is_2-3,This node should be reached.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/conditionals.yarn,var_is_2,22

examples/yarn2/conditionals.yarn

@@ -0,0 +1,23 @@
+title: Start
+---
+This is a test of conditionals and variables.
+
+<<set $var to 2>>
+
+<<if $var eq 1>>
+    <<jump var_is_1>>
+<<elseif $var eq 2>>
+    <<jump var_is_2>>
+<<else>>
+    This is a fallback, and should not run.
+<<endif>>
+
+===
+title: var_is_1
+---
+This node should never be reached.
+===
+title: var_is_2
+---
+This node should be reached.
+===

examples/yarn2/conditionals.yarnc

@@ -1,28 +1,52 @@
 import os
 from .context import YarnRunner
 
-compiled_yarn_f = open(os.path.join(os.path.dirname(
+compiled_yarn_f1 = open(os.path.join(os.path.dirname(
     __file__), '../examples/yarn1/conditionals.yarnc'), 'rb')
-names_csv_f = open(os.path.join(os.path.dirname(
+names_csv_f1 = open(os.path.join(os.path.dirname(
     __file__), '../examples/yarn1/conditionals.csv'), 'r')
+compiled_yarn_f2 = open(os.path.join(os.path.dirname(
+    __file__), '../examples/yarn2/conditionals.yarnc'), 'rb')
+names_csv_f2 = open(os.path.join(os.path.dirname(
+    __file__), '../examples/yarn2/conditionals.csv'), 'r')
 
-runner = YarnRunner(compiled_yarn_f, names_csv_f, autostart=False)
+runner1 = YarnRunner(compiled_yarn_f1, names_csv_f1, autostart=False)
+runner2 = YarnRunner(compiled_yarn_f2, names_csv_f2, autostart=False)
 
 
-def test_start_node_text():
-    runner.debug_program_proto()
-    runner.resume()
+def test_start_node_text1():
+    runner1.debug_program_proto()
+    runner1.resume()
 
-    assert "This is a test of conditionals and variables." == runner.get_line()
-    assert runner.has_line()
+    assert "This is a test of conditionals and variables." == runner1.get_line()
+    assert runner1.has_line()
 
 
-def test_conditional_traversal():
-    choices = runner.get_choices()
+def test_start_node_text2():
+    runner2.debug_program_proto()
+    runner2.resume()
+
+    assert "This is a test of conditionals and variables." == runner2.get_line()
+    assert runner2.has_line()
+
+
+def test_conditional_traversal1():
+    choices = runner1.get_choices()
+
+    assert len(choices) == 0
+
+    assert "This node should be reached." == runner1.get_line()
+    assert not runner1.has_line()
+    assert runner1.finished
+    assert runner1.current_node == 'var_is_2'
+
+
+def test_conditional_traversal2():
+    choices = runner2.get_choices()
 
     assert len(choices) == 0
 
-    assert "This node should be reached." == runner.get_line()
-    assert not runner.has_line()
-    assert runner.finished
-    assert runner.current_node == 'var_is_2'
+    assert "This node should be reached." == runner2.get_line()
+    assert not runner2.has_line()
+    assert runner2.finished
+    assert runner2.current_node == 'var_is_2'

tests/test_conditionals.py

@@ -16,3 +16,31 @@
     'Xor': (2, lambda p: p[0] ^ p[1]),
     'Not': (1, lambda p: not p[0])
 }
+
+typeMethods = {
+    'Boolean': ['EqualTo',
+                'NotEqualTo',
+                'And',
+                'Or',
+                'Xor',
+                'Not'],
+    'Number': ['EqualTo',
+               'NotEqualTo',
+               'Add',
+               'Minus',
+               'Divide',
+               'Multiply',
+               'Modulo',
+               'UnaryMinus',
+               'GreaterThan',
+               'GreaterThanOrEqualTo',
+               'LessThan',
+               'LessThanOrEqualTo'],
+    'String': ['EqualTo',
+               'NotEqualTo',
+               'Add']
+}
+
+for type, methods in typeMethods.items():
+    for method in methods:
+        functions[f'{type}.{method}'] = functions[method]