livetext 0.9.14 → 0.9.20

data/test/snapshots.rb

@@ -43,6 +43,70 @@ class TestingLivetext < MiniTest::Test
     EXP_OUT,    EXP_ERR    = "expected-output.txt", "expected-error.txt"
     MATCH_OUT,  MATCH_ERR  =  "match-output.txt", "match-error.txt"
 
+    TTY = File.open("/dev/tty","w")
+
+    def self.get_dir   # FIXME - uh what?
+      cmdline = ARGV.first == "cmdline"   # FIXME remove??
+      if cmdline
+        dir = "../"
+        Dir.chdir `livetext --path`.chomp.chomp
+      else
+        dir = ""
+      end
+    end
+
+    args = ARGV - ["cmdline"]
+
+    dir = self.get_dir
+
+    Data = "#{dir}test/snapshots"
+    Dir.chdir(Data)
+
+    TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
+
+
+    def self.filter  # TODO move subset/omit logic here??
+puts "Data = #{Data}"
+      all = Dir.entries(Data).reject {|fname| ! File.directory?(fname) } - %w[. ..]
+      included, excluded = [], []
+      @iflag, @eflag = true, false   # defaults to INCLUDE
+      control = File.new("clusion.txt")
+      control.each_line do |line|
+        line.sub!(/#.*/, "")
+        line.strip!
+        lower = line.downcase
+        dejavu = false
+        case
+          when lower.empty?
+            # ignore
+          when lower == "default include all"
+            raise "Only one 'default' allowed" if dejavu
+            @iflag, @eflag = true, false   # defaults to INCLUDE
+            dejavu = true
+          when lower == "default exclude all"
+            raise "Only one 'default' allowed" if dejavu
+            @iflag, @eflag = false, true
+            dejavu = true
+          when lower == "quit"
+            break
+          when lower[0] == "i"
+            TTY.puts "Warning: Can't include with 'i' when that is default" if @iflag
+            included << line.split(" ", 2)[1] # add to included
+          when lower[0] == "x"
+            TTY.puts "Warning: Can't exclude with 'x' when that is default" if @eflag
+            excluded << line.split(" ", 2)[1] # add to excluded
+            # add to excluded
+        end
+        [included, excluded]
+      end
+    end
+
+    i, e = self.filter
+    p i
+    p e
+
+    exit
+
     def initialize(base, assertion = nil)
       @assertion = assertion
       @base = base
@@ -53,7 +117,8 @@ class TestingLivetext < MiniTest::Test
         @match_out = File.exist?(MATCH_OUT)
         @match_err = File.exist?(MATCH_ERR)
       end
-      bad_files = (@literal_out && @match_out) || (@literal_err && @match_err)
+      bad_files = (@literal_out && @match_out) || (@literal_err && @match_err) ||
+                  (! @literal_out && ! @match_out)
       raise "Inconsistent structure for #@base" if bad_files
     end
 
@@ -108,56 +173,39 @@ 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
         cmd = "../../../bin/livetext #{SOURCE} >#{ACTUAL_OUT} 2>#{ACTUAL_ERR}"
         system(cmd)
-        check_stdout
         check_stderr
+        check_stdout
         cleanup
       end
     end
   end
 
-  TTY = File.open("/dev/tty","w")
-
-  cmdline = ARGV.first == "cmdline"   # FIXME remove??
-  if cmdline
-    dir = "../"
-    Dir.chdir `livetext --path`.chomp.chomp
+  if args.empty?
+    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
+    wanted   = selected.empty? ? TestDirs : selected
+    Subset = wanted - omit_names
   else
-    dir = ""
+    Subset = args
   end
 
-  Data = "#{dir}test/snapshots"
-  Dir.chdir(Data)
-
-  TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
-
-  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
-
-  wanted   = selected.empty? ? TestDirs : selected
-
-  Subset = wanted - omit_names
-
   Subset.each do |tdir|
     define_method("test_#{tdir}") do
       myproc = Proc.new {|bool, info| assert bool, info }

data/test/unit/all.rb

@@ -1,3 +1,4 @@
 
 require_relative 'standard'
 require_relative 'parser'      # nested
+require_relative 'formatline'