test/sequence_test.rb in citrus-2.2.2 vs test/sequence_test.rb in citrus-2.3.0

@@ -5,23 +5,23 @@
     rule = Sequence.new
     assert_equal(false, rule.terminal?)
   end
 
   def test_exec
-    a = Rule.new('a')
-    b = Rule.new('b')
-    c = Rule.new('c')
+    a = Rule.for('a')
+    b = Rule.for('b')
+    c = Rule.for('c')
     rule = Sequence.new([ a, b, c ])
 
     events = rule.exec(Input.new(''))
     assert_equal([], events)
 
     expected_events = [
-      rule.id,
-        a.id, CLOSE, 1,
-        b.id, CLOSE, 1,
-        c.id, CLOSE, 1,
+      rule,
+        a, CLOSE, 1,
+        b, CLOSE, 1,
+        c, CLOSE, 1,
       CLOSE, 3
     ]
 
     events = rule.exec(Input.new('abc'))
     assert_equal(expected_events, events)
@@ -30,12 +30,26 @@
   def test_to_s
     rule = Sequence.new(%w<a b>)
     assert_equal('"a" "b"', rule.to_s)
   end
 
-  def test_to_s_embed
+  def test_to_s_with_label
+    rule = Sequence.new(%w<a b>)
+    rule.label = 'a_label'
+    assert_equal('a_label:("a" "b")', rule.to_s)
+  end
+
+  def test_to_embedded_s
     rule1 = Sequence.new(%w<a b>)
     rule2 = Sequence.new(%w<c d>)
     rule = Sequence.new([rule1, rule2])
     assert_equal('("a" "b") ("c" "d")', rule.to_s)
+  end
+
+  def test_to_embedded_s_with_label
+    rule1 = Sequence.new(%w<a b>)
+    rule2 = Sequence.new(%w<c d>)
+    rule2.label = 'a_label'
+    rule = Sequence.new([rule1, rule2])
+    assert_equal('("a" "b") a_label:("c" "d")', rule.to_s)
   end
 end