Update visits and shortcuts tests for YS2.

Author: weaversam8

examples/yarn2/shortcuts-metadata.csv

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

examples/yarn2/shortcuts.csv

@@ -0,0 +1,9 @@
+id,text,file,node,lineNumber
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn-Start-0,This is a test of shortcut functionality.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn,Start,3
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn-Start-1,Option 1,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn,Start,5
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn-Start-2,Option 1 selected.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn,Start,6
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn-Start-3,Option 2,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn,Start,7
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn-Start-4,Option 2 selected.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn,Start,8
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn-Start-5,Option 3,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn,Start,9
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn-Start-6,Option 4,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn,Start,10
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn-Start-7,This is the last line.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/shortcuts.yarn,Start,12

examples/yarn2/shortcuts.yarn

@@ -0,0 +1,13 @@
+title: Start
+---
+This is a test of shortcut functionality.
+
+-> Option 1
+    Option 1 selected.
+-> Option 2
+    Option 2 selected.
+-> Option 3
+-> Option 4
+
+This is the last line.
+===

examples/yarn2/shortcuts.yarnc

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

examples/yarn2/visits-metadata.csv

@@ -0,0 +1,3 @@
+id,text,file,node,lineNumber
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/visits.yarn-loop-0,This is the loop node.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/visits.yarn,loop,8
+line:/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/visits.yarn-end-1,This is the end.,/Users/sweaver/Git/YarnRunner-Python/examples/yarn2/visits.yarn,end,19

examples/yarn2/visits.csv

@@ -0,0 +1,20 @@
+title: Start
+---
+<<jump loop>>
+===
+title: loop
+---
+
+This is the loop node.
+
+<<if $visits_loop > 3>>
+<<jump end>>
+<<endif>>
+
+<<jump loop>>
+===
+title: end
+---
+
+This is the end.
+===

examples/yarn2/visits.yarn

@@ -1,22 +1,54 @@
 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/shortcuts.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/shortcuts.csv'), 'r')
+compiled_yarn_f2 = open(os.path.join(os.path.dirname(
+    __file__), '../examples/yarn2/shortcuts.yarnc'), 'rb')
+names_csv_f2 = open(os.path.join(os.path.dirname(
+    __file__), '../examples/yarn2/shortcuts.csv'), 'r')
 
-runner = YarnRunner(compiled_yarn_f, names_csv_f)
+runner1 = YarnRunner(compiled_yarn_f1, names_csv_f1)
+runner2 = YarnRunner(compiled_yarn_f2, names_csv_f2)
 
 
-def test_start_node_text():
-    assert "This is a test of shortcut functionality." == runner.get_line()
-    assert not runner.has_line()
-    assert not runner.finished
+def test_start_node_text1():
+    assert "This is a test of shortcut functionality." == runner1.get_line()
+    assert not runner1.has_line()
+    assert not runner1.finished
 
 
-def test_start_node_choices():
-    choices = runner.get_choices()
+def test_start_node_choices1():
+    choices = runner1.get_choices()
+
+    assert len(choices) == 4
+    assert choices[0]["text"] == "Option 1"
+    assert choices[1]["text"] == "Option 2"
+    assert choices[2]["text"] == "Option 3"
+    assert choices[3]["text"] == "Option 4"
+
+
+def test_shortcuts1():
+    runner1.choose(0)
+
+    assert "Option 1 selected." == runner1.get_line()
+    assert runner1.has_line()
+    assert "This is the last line." == runner1.get_line()
+    assert not runner1.has_line()
+    assert runner1.finished
+    assert runner1.current_node == 'Start'
+
+
+def test_start_node_text2():
+    assert "This is a test of shortcut functionality." == runner2.get_line()
+    assert not runner2.has_line()
+    assert not runner2.finished
+
+
+def test_start_node_choices2():
+    choices = runner2.get_choices()
 
     assert len(choices) == 4
     assert choices[0]["text"] == "Option 1"
@@ -26,11 +58,11 @@ def test_start_node_choices():
 
 
 def test_shortcuts():
-    runner.choose(0)
-
-    assert "Option 1 selected." == runner.get_line()
-    assert runner.has_line()
-    assert "This is the last line." == runner.get_line()
-    assert not runner.has_line()
-    assert runner.finished
-    assert runner.current_node == 'Start'
+    runner2.choose(0)
+
+    assert "Option 1 selected." == runner2.get_line()
+    assert runner2.has_line()
+    assert "This is the last line." == runner2.get_line()
+    assert not runner2.has_line()
+    assert runner2.finished
+    assert runner2.current_node == 'Start'

examples/yarn2/visits.yarnc

@@ -16,3 +16,5 @@ def test_variables():
     assert runner.variables["$value_float"] == 1.25
     assert runner.variables["$value_bool"] == True
     assert runner.variables["$value_null"] is None
+
+# TODO, the variables.yarnc wouldn't compile under YSC 2.0.1-a2eff4c