livetext 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9a5d4be00258f23687ca280b306794cb67f2e7c89ba1a453c60dfd59f4268d
-  data.tar.gz: 423d1901855f09e06f5448008e12095713110d1d4dc8ba4f31ddf871319d2bb3
+  metadata.gz: d9e6ad9c8d933b361da03fadc6cc4d28e0a8b699f8f50e434db9bf41f0b9d66b
+  data.tar.gz: 49e59704162aea72ac92122d69f0006591856b9fe09f2b2fdbf6843b7253b80b
 SHA512:
-  metadata.gz: dfd42d9206980d3819e45fc174baf74378c01d13e61c8a8ce58f00bc3d3b7889b1bace1b74076c5491657978e704b55e6f82543e57ffdaa128993f6ec584c5e9
-  data.tar.gz: 570a8c6f92f4baaadad6c946871910e7ae2107741bef4212e16e7a49e90e1f929a8149c9f99553319a811eb42a6ce37fff0e15b8985235b91858f800d3ca77be
+  metadata.gz: 74b1b06e0bc91d976c0f60a2136ed8bb1c4d2d5ba33359620752b44a51918a89fbba2cec9c542ae12a6368de82bdc4db64b30a4d95146caab4e5a290f9c7fa8b
+  data.tar.gz: ed0c0fa3b4da538ddbd31cd799a84f5647d45a369f0f45d729c223f74c7b0f2445bfc0812aa0c319b9a9f5992efa6af521d550eed38a8e2c551b183e28a16722

data/lib/errors.rb

@@ -3,11 +3,13 @@
 
 def make_exception(sym, str, target_class = Object)
   return if target_class.constants.include?(sym)
-  target_class.const_set(sym, StandardError.dup)
+  klass = sym   # :"#{sym}_Class"
+  target_class.const_set(klass, StandardError.dup)
   define_method(sym) do |*args|
+    args = [] unless args.first
     msg = str.dup
     args.each.with_index {|arg, i| msg.sub!("%#{i+1}", arg) }
-    target_class.class_eval(sym.to_s).new(msg)
+    target_class.class_eval(klass.to_s).new(msg)
   end
 end
 

data/lib/functions.rb

@@ -1,5 +1,5 @@
 
-require_relative 'standard'  # FIXME?
+require_relative 'standard'  # FIXME  umm, why is this necessary??
 
 # Class Functions is where '$$func' functions are stored dynamically... 
 # user-def AND pre-def??

data/lib/helpers.rb

@@ -18,4 +18,8 @@ module Helpers
     end
   end
 
+  def grab_file(fname)
+    File.read(fname)
+  end
+
 end

data/lib/livetext.rb

@@ -1,7 +1,7 @@
 # Class Livetext skeleton (top level).
 
 class Livetext
-  VERSION = "0.9.13"
+  VERSION = "0.9.14"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -9,6 +9,7 @@ end
 
 require 'fileutils'
 
+require 'helpers'
 require_relative 'errors'
 require_relative 'functions'
 require_relative 'userapi'
@@ -20,10 +21,14 @@ Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../plugin"))
 
 TTY = ::File.open("/dev/tty", "w")
 
+make_exception(:EndWithoutOpening, "Error: found .end with no opening command")
+
 # Class Livetext reopened (top level).
 
 class Livetext
 
+  include Helpers
+
   Vars = {}
 
   Space = " "
@@ -192,7 +197,7 @@ class Livetext
 
   def process_file(fname, btrace=false)
     _setfile(fname)
-    text = File.readlines(fname)   # FIXME currently causes failure
+    text = File.readlines(fname)
     enum = text.each
     @backtrace = btrace
     @main.source(enum, fname, 0)
@@ -228,20 +233,21 @@ class Livetext
     line = line.sub(/# .*$/, "")
     name = _get_name(line).to_sym
     result = nil
-    if @main.respond_to?(name)
-      result = @main.send(name)
+    case
+      when name == :end   # special case
+        puts @body
+        raise EndWithoutOpening()
+      when @main.respond_to?(name)
+        result = @main.send(name)
     else
       @main._error! "Name '#{name}' is unknown"
       return
     end
     result
   rescue => err
+    puts @body  # earlier correct output, not flushed yet
     STDERR.puts "Error: #{err.inspect}"
-    # STDERR.puts err.backtrace
-    # @main._error!(err)
-    puts @body
-    @body = ""
-    return @body
+    STDERR.puts err.backtrace
   end
 
 end

data/lib/parser/general.rb

@@ -7,7 +7,7 @@ make_exception(:NilValue,         "Error: nil value")
 make_exception(:NullString,       "Error: null string")
 make_exception(:ExpectedString,   "Error: expected a string")
 
-class Livetext::ParseMisc < StringParser
+class Livetext::ParseGeneral < StringParser
 
   def initialize(str)
     super

data/lib/parser/mixin.rb

@@ -8,13 +8,7 @@ make_exception(:NoEqualSign,     "Error: no equal sign found")
 
 class Livetext::ParseMixin   # < StringParser
 
-#   def self.parse(str)
-#     self.new(str).parse
-#   end
-# 
-#   def initialize(line)
-#     super
-#   end
+  include Helpers
 
   def cwd_root?
     File.dirname(File.expand_path(".")) == "/"

data/lib/processor.rb

@@ -40,12 +40,8 @@ class Livetext
 
     def _error!(err, raise_error=false, trace=false)   # FIXME much bullshit happens here
       where = @sources.last || @save_location
-      # puts @parent.body
-      # puts "[lib/processor] Error: #{err}"
-      # puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
-      STDERR.puts "Error: #{err}"  #  (at #{where[1]} line #{where[2]})"
+      STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
       STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
-      # raise "lib/processor error!" # FIXME
       raise GenericError.new("Error: #{err}") if raise_error
     end
 
@@ -76,9 +72,6 @@ class Livetext
       nil
     end
 
-    def grab_file(fname)
-      File.read(fname)
-    end
 
   end
 

data/lib/standard.rb

@@ -24,7 +24,7 @@ module Livetext::Standard
 
   attr_reader :_data
 
-  def data=(val)    # FIXME this is weird, let's not do it
+  def data=(val)    # FIXME this is weird, let's remove it soonish
     @_data = val.chomp
     @_args = val.split rescue []
     @_mixins = []
@@ -154,6 +154,8 @@ module Livetext::Standard
     set_variables(pairs)
   end
 
+  # FIXME really these should be one method...
+
   def variables!  # cwd, not FileDir - weird, fix later
     prefix = _args[0]
     file = _args[1]
@@ -164,7 +166,7 @@ module Livetext::Standard
     else
       lines = _body
     end
-    pairs = Livetext::ParseMisc.parse_vars(prefix, lines)
+    pairs = Livetext::ParseGeneral.parse_vars(prefix, lines)
     set_variables(pairs)
   end
 
@@ -178,7 +180,7 @@ module Livetext::Standard
     else
       lines = _body
     end
-    pairs = Livetext::ParseMisc.parse_vars(prefix, lines)
+    pairs = Livetext::ParseGeneral.parse_vars(prefix, lines)
     set_variables(pairs)
   end
 
@@ -225,13 +227,6 @@ module Livetext::Standard
     _optional_blank_line
   end
 
-  def in_out  # FIXME dumb name!
-    file, dest = *@_args
-    check_file_exists(file)
-    @parent.process_file(file, dest)
-    _optional_blank_line
-  end
-
   def _include   # dot command
     file = _format(@_args.first)  # allows for variables
     check_file_exists(file)
@@ -260,7 +255,7 @@ module Livetext::Standard
     name = @_args.first   # Expect a module name
     return if @_mixins.include?(name)
     @_mixins << name
-    parse = Livetext::ParseMixin.new(name)  # FIXME??
+    parse = Livetext::ParseMixin.new  # (name)  # FIXME??
     file = parse.find_mixin(name)
     parse.use_mixin(name, file)
     _optional_blank_line

data/lib/userapi.rb

@@ -94,10 +94,6 @@ module Livetext::UserAPI
     else
       lines
     end
-# rescue => err
-#   str = err.inspect + "\n"
-#   str << err.backtrace.map {|x| "  " + x }.join("\n")
-#   _error!(str)
   end
 
   def _body_text(raw=false)

data/test/all.rb

@@ -1,3 +1,4 @@
 
 require_relative 'unit/all'
 require_relative 'snapshots'             # snapshots
+require_relative 'formatting-tests'      # one-liners in input

data/test/formatting-tests.rb

@@ -0,0 +1,35 @@
+require 'minitest/autorun'
+
+require_relative '../lib/livetext'
+
+# Just another testing class. Chill.
+
+class TestingLivetext < MiniTest::Test
+
+  TestLines = []
+
+  items = []
+  formatting_tests = File.open("formatting-tests.txt")
+  loop do 
+    4.times { items << formatting_tests.gets.chomp }
+    # Blank line terminates each "stanza"
+    raise "Oops? #{items.inspect}" unless items.last.empty?
+    TestLines << items
+    break if formatting_tests.eof?
+  end
+
+  TestLines.each.with_index do |item, num|
+    msg, src, exp, blank = *item
+    define_method("test_formatting_#{num}") do
+      actual = FormatLine.parse!(src)
+      # FIXME could simplify assert logic?
+      if exp[0] == "/" # regex!   FIXME doesn't honor %r[...]
+        exp = Regexp.compile(exp[1..-2])   # skip slashes
+        assert_match(exp, actual, msg)
+      else
+        assert_equal(exp, actual, msg)
+      end
+    end
+  end
+end
+

data/test/snapshots/OMIT.txt

@@ -0,0 +1,10 @@
+# Comments are ignored.
+# Other lines:  name_of_snapshot and any comments here are ignored (no # needed)
+# fake_test_name      Use # to un-omit   ;)
+error_no_such_inc     Output BEFORE error doesn't get passed through
+error_no_such_copy    ^ Same behavior as  error_no_such_inc
+simple_mixin          Mixin doesn't work?? But no error... maybe _def isn't working.
+error_missing_end     Output is duplicated somehow. Look for: puts @body or puts @main.body
+error_no_such_mixin   ^ Same behavior as error_missing_end
+error_line_num        Same behavior as error_missing_end
+error_invalid_name    ^ Same behavior as  error_no_such_inc

data/test/snapshots/error_inc_line_num/match-error.txt

@@ -0,0 +1 @@
+1 /Error: Name 'foobar' is unknown/

data/test/snapshots/error_invalid_name/match-error.txt

@@ -0,0 +1 @@
+ 1 /Error: Illegal name 'to_s'/

data/test/snapshots/error_line_num/match-error.txt

@@ -0,0 +1 @@
+1 /Error: Name 'foobar' is unknown/

data/test/snapshots/error_mismatched_end/expected-output.txt

@@ -4,5 +4,3 @@ without something
 beginning a block:
 <p>
 
-foo bar
-baz

data/test/snapshots/error_mismatched_end/match-error.txt

@@ -0,0 +1 @@
+1 /Error: found .end with no opening command/

data/test/snapshots/error_missing_end/match-error.txt

@@ -0,0 +1 @@
+1 /Error: Expected .end, found end of file/

data/test/snapshots/error_no_such_copy/match-error.txt

@@ -0,0 +1 @@
+ 1 /Error: file nosuchfile.txt not found/

data/test/snapshots/error_no_such_inc/match-error.txt

@@ -0,0 +1 @@
+ 1 /Error: file nosuchinc.lt3 not found/

data/test/snapshots/error_no_such_mixin/match-error.txt

@@ -0,0 +1 @@
+1 /No such mixin 'nosuchthing'/

data/test/snapshots/predef_vars/match-output.txt

@@ -0,0 +1,6 @@
+ 1  Here we go...
+ 2  File = source.lt3
+ 3  /FileDir = .*.test.snapshots.predef_vars/
+ 4  /User = [A-Za-z][A-Za-z0-9]*/
+ 5  /Version = 0\.\d{1,2}\.\d{1,2}/
+ 6  NoSuchVar = [NoSuchVar is undefined]

data/test/snapshots.rb

@@ -8,17 +8,27 @@ Snapshots...
 NOTE that the external_files method has been replaced by the Snapshot class.
 
 You can add any ordinary test method above. But so far, most of these tests simply 
-call external_files.
+call Snapshot.new
 
-The external_files method works this way: 
+It works this way: 
   - If the test (caller) method is test_my_silly_feature, then we will
     look for a directory called snapshots/my_silly_feature
-  - In here, there must be a source.lt3, expected-output.txt, and expected-error.txt
-  - Technically, any of these can be empty
+  - In here, there must be a source.lt3
+  - ...and also either expected-output.txt OR match-output.txt (not both)
+  - ...and also either expected-error.txt OR match-error.txt (not both)
+  - Technically, any existing file can be empty
+  - The expected-* files are "literal" data
+      * compared byte-for-byte
+      * watch spaces and bad regexes, etc. #duh
+      * each of these files corresponds to a single assertion 
+  - A match-* file has two entries per line: 
+      * a ONE-BASED line number (in actual-* file)
+      * a String OR a Regexp (to match against that line)
+      * If there is nonsense here, it currently isn't caught
+      * each of these files MAY correspond to many assertions 
   - We run livetext on the source and compare actual vs expected (stdout, stderr)
-  - The "real" output gets checked first
+  - The error output gets checked first (expected or match), THEN standard output
   - Of course, both must compare correctly for the test to pass
-  - See also: match*
 =end
 
 
@@ -58,13 +68,12 @@ class TestingLivetext < MiniTest::Test
         info = "Expected line #{line_num} of #{actual.inspect} to match #{item.inspect} (was: #{lines[line_num].inspect})"
         good = item === lines[line_num]
         @errors = true unless good
-#       assert item === lines[line_num], info   # string or regex
         @assertion.call item === lines[line_num], info   # string or regex
       end
     end
 
     def sdiff(f1, f2, out)
-      File.open(out, "w") {|file| file.puts "#{'%-60s'% 'EXPECTED'}| #{'%-60s'% 'ACTUAL'}" }
+      File.open(out, "w") {|file| file.puts "#{'%-60s'% 'ACTUAL'}| #{'%-60s'% 'EXPECTED'}" }
       system("/usr/bin/sdiff -t -w 121 #{f1} #{f2} >>#{out}")
     end
 
@@ -75,8 +84,7 @@ class TestingLivetext < MiniTest::Test
         @errors = true if not same
         file = "out-sdiff.txt"
         sdiff(ACTUAL_OUT, EXP_OUT, file)
-#       assert same, "Discrepancy in STDOUT - see #@base/#{file}"
-        @assertion.call same, "Discrepancy in STDOUT - see #@base/#{file}"
+        @assertion.call same, "Discrepancy in STDOUT - see #{file} in test/snapshots/#@base"
       else
         check_matches(ACTUAL_OUT, MATCH_OUT)
       end
@@ -89,8 +97,7 @@ class TestingLivetext < MiniTest::Test
         @errors = true if not same
         file = "err-sdiff.txt"
         sdiff(ACTUAL_ERR, EXP_ERR, file)
-#       assert same, "Discrepancy in STDERR - see #@base/#{file}"
-        @assertion.call same, "Discrepancy in STDERR - see #@base/#{file}"
+        @assertion.call same, "Discrepancy in STDERR - see #{file} in test/snapshots/#@base"
       else
         check_matches(ACTUAL_ERR, MATCH_ERR)
       end
@@ -101,6 +108,9 @@ class TestingLivetext < MiniTest::Test
       system("rm -f #{ACTUAL_OUT} #{ACTUAL_ERR} *sdiff.txt")
     end
 
+    def filter  # TODO move subset/omit logic here??
+    end
+
     def run
       @errors = false   # oops, need to reset
       Dir.chdir(@base) do
@@ -115,7 +125,7 @@ class TestingLivetext < MiniTest::Test
 
   TTY = File.open("/dev/tty","w")
 
-  cmdline = ARGV.first == "cmdline"
+  cmdline = ARGV.first == "cmdline"   # FIXME remove??
   if cmdline
     dir = "../"
     Dir.chdir `livetext --path`.chomp.chomp
@@ -124,38 +134,29 @@ class TestingLivetext < MiniTest::Test
   end
 
   Data = "#{dir}test/snapshots"
-  TestLines = []
   Dir.chdir(Data)
 
-  items = []
-  short_tests = File.open("lines.txt")
-  loop do 
-    4.times { items << short_tests.gets.chomp }
-    # Blank line terminates each "stanza"
-    raise "Oops? #{items.inspect}" unless items.last.empty?
-    TestLines << items
-    break if short_tests.eof?
-  end
+  TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
 
-  if File.size("subset.txt")  == 0
-    puts "Defining via TestLines"
-    TestLines.each.with_index do |item, num|
-      msg, src, exp, blank = *item
-      define_method("test_formatting_#{num}") do
-        actual = FormatLine.parse!(src)
-        if exp[0] == "/" # regex!
-          exp = Regexp.compile(exp[1..-2])   # skip slashes
-          assert_match(exp, actual, msg)
-        else
-          assert_equal(exp, actual, msg)
-        end
-      end
-    end
+  selected = File.readlines("subset.txt").map(&:chomp)
+
+  omitfile = "OMIT.txt"
+  omitted  = File.readlines(omitfile).map(&:chomp)
+  omitted.reject! {|line| line.start_with?("#") }
+  omit_names = omitted.map {|line| line.split.first }
+  STDERR.puts
+  STDERR.puts "  >>> Warning: Omitting #{omitted.size} snapshot tests:\n " 
+  indented = " "*7
+  omitted.each do |line| 
+    STDERR.print indented 
+    name, info = line.split(" ", 2)
+    STDERR.printf "%-20s  %s\n", name, info
   end
+  STDERR.puts
 
-  TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
-  selected = File.readlines("subset.txt").map(&:chomp)
-  Subset   = selected.empty? ? TestDirs : selected
+  wanted   = selected.empty? ? TestDirs : selected
+
+  Subset = wanted - omit_names
 
   Subset.each do |tdir|
     define_method("test_#{tdir}") do
@@ -164,56 +165,4 @@ class TestingLivetext < MiniTest::Test
       this.run
     end
   end
-
-  def green(str)
-    "" + str.to_s + ""
-  end
-
-  def red(str)
-    "" + str.to_s + ""
-  end
-
-  def sdiff(which, f1, f2, out, rx)
-    return "\n >>> No match for std#{which}!" if rx
-    File.open(out, "w") {|file| file.puts "#{'%-60s'% 'EXPECTED'}| #{'%-60s'% 'ACTUAL'}" }
-    system("/usr/bin/sdiff -t -w 121 #{f1} #{f2} >>#{out}")
-    return "\n  >>> Unexpected std#{which}! See #{out}"
-  end
-
-  def external_files(base)
-    Dir.chdir(base) do
-      src, out, exp = "source.lt3", "/tmp/#{base}--actual-output.txt", "expected-output.txt"
-      err, erx = "/tmp/#{base}--actual-error.txt", "expected-error.txt"
-     
-      # New features - match out/err by regex
-      expout_regex = "expected-out-line1match.txt"
-      experr_regex = "expected-err-line1match.txt"
-
-      cmd = "livetext #{src} >#{out} 2>#{err}"
-      system(cmd)
-
-      output   = File.read(out)
-      errors   = File.read(err)
-      rx_out = rx_err = nil
-
-      expected = File.exist?(expout_regex) ?  rx_out = /#{Regexp.escape(File.read(expout_regex).chomp)}/ : File.read(exp)
-      errexp   = File.exist?(experr_regex) ?  rx_err = /#{Regexp.escape(File.read(experr_regex).chomp)}/ : File.read(erx)
-
-      out_ok = rx_out ? output =~ rx_out : output == expected
-      err_ok = rx_err ? errors =~ rx_err : errors == errexp
-
-      system("mkdir -p /tmp/#{base}")
-      bad_out = bad_err = nil
-      bad_out = sdiff("out", exp, out, "/tmp/#{base}/exp.out.sdiff", rx_out) unless out_ok
-      bad_err = sdiff("err", erx, err, "/tmp/#{base}/exp.err.sdiff", rx_err) unless err_ok
-
-      assert(err_ok, bad_err)
-      assert(out_ok, bad_out)
-      # only on success
-      system("rm -rf #{out} #{err} /tmp/#{base}") if out_ok && err_ok
-    end
-  end
-
 end
-
-

data/test/unit/parser/general.rb

@@ -3,9 +3,9 @@ require 'minitest/autorun'
 
 require_relative '../../../lib/parser/general'
 
-ParseMisc = ::Livetext::ParseMisc
+ParseGeneral = ::Livetext::ParseGeneral
 
-class TestParseMisc < MiniTest::Test
+class TestParseGeneral < MiniTest::Test
 
   def setup
   end
@@ -14,45 +14,45 @@ class TestParseMisc < MiniTest::Test
   end
 
   def test_strip_quotes
-    assert_raises(NilValue)         { ParseMisc.new(nil).strip_quotes }
-    assert_raises(NullString)       { ParseMisc.new("").strip_quotes }
-    assert_raises(MismatchedQuotes) { ParseMisc.new(%['test]).strip_quotes }
-#   assert_raises(MismatchedQuotes) { ParseMisc.new(%[test']).strip_quotes }
-    assert_raises(MismatchedQuotes) { ParseMisc.new(%["test]).strip_quotes }
-#   assert_raises(MismatchedQuotes) { ParseMisc.new(%[test"]).strip_quotes }
-    assert_raises(MismatchedQuotes) { ParseMisc.new(%["test']).strip_quotes }
-    assert_raises(MismatchedQuotes) { ParseMisc.new(%['test"]).strip_quotes }
-
-    assert ParseMisc.new(%[24601]).strip_quotes  == "24601", "Failure 1"
-    assert ParseMisc.new(%[3.14]).strip_quotes   == "3.14",  "Failure 2"
-    assert ParseMisc.new(%[test]).strip_quotes   == "test",  "Failure 3"
-    assert ParseMisc.new(%['test']).strip_quotes == "test",  "Failure 4"
-    assert ParseMisc.new(%["test"]).strip_quotes == "test",  "Failure 5"
+    assert_raises(NilValue)         { ParseGeneral.new(nil).strip_quotes }
+    assert_raises(NullString)       { ParseGeneral.new("").strip_quotes }
+    assert_raises(MismatchedQuotes) { ParseGeneral.new(%['test]).strip_quotes }
+#   assert_raises(MismatchedQuotes) { ParseGeneral.new(%[test']).strip_quotes }
+    assert_raises(MismatchedQuotes) { ParseGeneral.new(%["test]).strip_quotes }
+#   assert_raises(MismatchedQuotes) { ParseGeneral.new(%[test"]).strip_quotes }
+    assert_raises(MismatchedQuotes) { ParseGeneral.new(%["test']).strip_quotes }
+    assert_raises(MismatchedQuotes) { ParseGeneral.new(%['test"]).strip_quotes }
+
+    assert ParseGeneral.new(%[24601]).strip_quotes  == "24601", "Failure 1"
+    assert ParseGeneral.new(%[3.14]).strip_quotes   == "3.14",  "Failure 2"
+    assert ParseGeneral.new(%[test]).strip_quotes   == "test",  "Failure 3"
+    assert ParseGeneral.new(%['test']).strip_quotes == "test",  "Failure 4"
+    assert ParseGeneral.new(%["test"]).strip_quotes == "test",  "Failure 5"
   end
 
   def test_variables
     vars = ["foo 234\n", "bar 456\n"]
     expect = [%w[foo 234], %w[bar 456]]
-    assert_equal ParseMisc.parse_vars(vars), expect
+    assert_equal ParseGeneral.parse_vars(vars), expect
 
     vars = ["foo2 234", "bar2 456"]     # newline irrelevant
     expect = [%w[foo2 234], %w[bar2 456]]
-    assert_equal ParseMisc.parse_vars(vars), expect
+    assert_equal ParseGeneral.parse_vars(vars), expect
 
     # quotes are not stripped... hmm
     vars = ["alpha 'simple string'", 'beta "another string"']
     expect = [["alpha", "'simple string'"], ["beta", '"another string"']]
-    assert_equal ParseMisc.parse_vars(vars), expect
+    assert_equal ParseGeneral.parse_vars(vars), expect
 
     # prefix (namespacing)
     vars = ["alpha 'simple string'", 'beta "another string"']
     expect = [["this.alpha", "'simple string'"], ["this.beta", '"another string"']]
-    assert_equal ParseMisc.parse_vars(vars, prefix: "this"), expect
+    assert_equal ParseGeneral.parse_vars(vars, prefix: "this"), expect
 
     # prefix (namespacing)
     vars = ["alpha 'simple string'", 'beta "another string"']
     expect = [["this.that.alpha", "'simple string'"], ["this.that.beta", '"another string"']]
-    assert_equal ParseMisc.parse_vars(vars, prefix: "this.that"), expect
+    assert_equal ParseGeneral.parse_vars(vars, prefix: "this.that"), expect
 
   end
 

data/test/unit/parser/mixin.rb

@@ -1,7 +1,7 @@
 
 require 'minitest/autorun'
 
-require_relative 'set'
+require_relative '../../../lib/parser/set'
 
 ParseSet = Livetext::ParseSet
 

data/test/unit/parser.rb

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