livetext 0.9.20 → 0.9.24

data/test/unit/parser/set.rb

@@ -1,9 +1,9 @@
 
 require 'minitest/autorun'
 
-require_relative '../../../lib/parser/set'
+require_relative '../parser'      # nested
 
-ParseSet = Livetext::ParseSet
+ParseSet = ::Livetext::ParseSet
 
 class TestParseSet < MiniTest::Test
 
@@ -13,7 +13,7 @@ class TestParseSet < MiniTest::Test
   def teardown
   end
 
-  def ztest_one_unquoted
+  def test_one_unquoted
     set = ParseSet.new('my_var_123 = 789').parse
     pair = set.first
     assert_equal pair, %w[my_var_123 789]
@@ -23,38 +23,37 @@ class TestParseSet < MiniTest::Test
     assert_equal pair, %w[var_234 naked_string]
   end
 
-  def ztest_one_single_quoted
+  def test_one_single_quoted
     set = ParseSet.new("fancy.var.name = 'simple string'").parse
     pair = set.first
     assert_equal pair, ["fancy.var.name", "simple string"]
   end
 
-  def ztest_one_double_quoted
+  def test_one_double_quoted
     set = ParseSet.new('fancy.var2 = "another string"').parse
     pair = set.first
     assert_equal pair, ["fancy.var2", "another string"]
   end
 
-  def ztest_multiple_unquoted
-puts __method__
+  def test_multiple_unquoted
     pair1, pair2 = ParseSet.new("this=345, that=678").parse
     assert_equal pair1, %w[this 345]
     assert_equal pair2, %w[that 678]
   end
 
-  def ztest_multiple_unquoted_quoted
+  def test_multiple_unquoted_quoted
     pair1, pair2 = ParseSet.new('alpha = 567, beta = "oh well"').parse
     assert_equal pair1, %w[alpha 567]
     assert_equal pair2, ["beta", "oh well"]
   end
 
-  def ztest_quote_embedded_comma
+  def test_quote_embedded_comma
     set = ParseSet.new('gamma = "oh, well"').parse
     pair = set.first
     assert_equal pair, ["gamma", "oh, well"]
   end
 
-  def ztest_get_var
+  def test_get_var
     @parse = ParseSet.new("foo=345")
     assert_equal @parse.get_var, "foo"
     @parse = ParseSet.new("foo = 345")
@@ -79,7 +78,7 @@ puts __method__
     assert_raises(BadVariableName) { @parse.get_var }
   end
 
-  def ztest_skip_equal
+  def test_skip_equal
     @parse = ParseSet.new("=")
     assert_nil @parse.skip_equal
     @parse = ParseSet.new("   = ")
@@ -97,7 +96,7 @@ puts __method__
     assert_raises(NoEqualSign) { @parse.skip_equal }
   end
 
-  def ztest_quoted_value
+  def test_quoted_value
     @parse = ParseSet.new(%['this'])
     assert_equal @parse.quoted_value, "this"
     @parse = ParseSet.new(%["that"])
@@ -119,7 +118,7 @@ puts __method__
     #  - allow (escaped?) comma in quoted string
   end
 
-  def ztest_unquoted_value
+  def test_unquoted_value
     # Note: an unquoted value is still a string!
     @parse = ParseSet.new(%[342 ])
     assert_equal @parse.unquoted_value, "342"
@@ -138,27 +137,26 @@ puts __method__
     #  - allow/disallow escaping??
   end
 
-  # BUG: FormatLine doesn't know variables in this context!
-
-  def xtest_4  # FIXME
+  def test_var_eq_var
     set = ParseSet.new("file = $File").parse
+    set = set.first  # [["var", "value"]]
     assert_equal set.first, "file"
-    assert set.last !~ /undefined/
+    assert set.last =~ /undefined/, "Found 'undefined' for variable value"
+    # ^ ParseSet isn't smart enough to know about variables/functions
   end
 
-  # BUG: ...or functions.
-  # (Additional bug: Failing silently seems wrong.)
-
-  def xtest_5  # FIXME
+  def test_var_eq_func
     set = ParseSet.new("date = $$date").parse
+    set = set.first  # [["var", "value"]]
     assert_equal set.first, "date"
-    assert set.last =~ /^\d\d.\d\d.\d\d/
+    assert set.last =~ /undefined/, "Found 'undefined' for variable value"
+    # ^ ParseSet isn't smart enough to know about variables/functions
   end
 
   def test_two_strings
-    line = %[bday="May_31", date="5/31"]
+    line = %[bday="May 31", date='5/31']
     set = ParseSet.new(line).parse
-    assert set == [["bday", "May_31"], ["date", "5/31"]]
+    assert set == [["bday", "May 31"], ["date", "5/31"]]
   end
 
 end

data/test/unit/parser/string.rb

@@ -1,6 +1,6 @@
 require 'minitest/autorun'
 
-require_relative '../../../lib/parser/string'
+require_relative '../parser'      # nested
 
 class TestStringParser < MiniTest::Test
 
@@ -81,20 +81,16 @@ class TestStringParser < MiniTest::Test
     assert_nil char1
     assert_nil char2
     assert @zero.i == 0
-    assert @zero.last?
     assert @zero.eos?
 
-    refute @one.last?    # FIXME??
     char1 = @one.peek
-    refute @one.last?    # FIXME??
     char2 = @one.grab
     char3 = @one.peek
     assert char1
     assert char2 == char1
     assert char3 == @str1[1]
     assert @one.i == 1
-    assert @one.last?
-    assert @one.eos?     # FIXME??
+    assert @one.eos?
 
     char1 = @many.peek
     char2 = @many.grab
@@ -103,7 +99,6 @@ class TestStringParser < MiniTest::Test
     assert char2 == char1
     assert char3 == @strN[1]
     assert @many.i == 1
-    refute @many.last?
     refute @many.eos?
   end
 
@@ -126,5 +121,49 @@ class TestStringParser < MiniTest::Test
     refute some.peek == " "
     assert_equal some.peek, "x"
     assert_equal some.i, 3
+
+    some = StringParser.new("abc   123")
+    3.times { some.grab }
+    assert_equal some.peek, " "
+    some.skip_spaces
+    refute some.peek == " "
+    assert_equal some.peek, "1"
+    assert_equal some.i, 6
+  end
+
+  def test_ungrab
+    parse = StringParser.new("abcdef")
+    assert_equal parse.i, 0
+    assert_equal parse.peek, "a"
+    3.times { parse.grab }
+    assert_equal parse.i, 3
+    assert_equal parse.peek, "d"
+    parse.ungrab
+    assert_equal parse.i, 2
+    assert_equal parse.peek, "c"
+  end
+
+  def test_lookahead
+    parse = StringParser.new("abcdef")
+    assert_equal parse.peek, "a"
+    assert_equal parse.lookahead, "b"
+    assert_equal parse.i, 0
+    3.times { parse.grab }
+    before = parse.i
+    assert_equal parse.lookahead, "e"
+    after = parse.i
+    assert_equal before, after
+  end
+  
+  def test_prev
+    parse = StringParser.new("abcdef")
+    assert_nil parse.prev
+    assert_equal parse.i, 0
+    3.times { parse.grab }
+    before = parse.i
+    assert_equal parse.prev, "c"
+    after = parse.i
+    assert_equal before, after
   end
+  
 end

data/test/unit/parser.rb

@@ -3,4 +3,3 @@ require_relative 'parser/string'
 require_relative 'parser/set'
 require_relative 'parser/general'
 require_relative 'parser/mixin'       # currently empty
-require_relative 'parser/importable'  # currently empty

data/test/unit/standard.rb

@@ -1,6 +1,5 @@
 require 'minitest/autorun'
 
-
 require_relative '../../lib/livetext'
 
 class TestingLivetext < MiniTest::Test