testdata 0.2.12 → 0.3.0

data/lib/testdata.rb

@@ -2,12 +2,15 @@
 
 # file: testdata.rb
 
+require 'builder'
 require 'rexml/document'
 
 class Path
   include REXML
 
-  def initialize(doc, success) @doc, @success = doc, success end
+  def initialize(doc, log, success) 
+    @doc, @log, @success = doc, log, success 
+  end
 
   def tested? description
 
@@ -19,6 +22,7 @@ class Path
     output_values = XPath.match(node, "records/io/summary[type='output']/*").map(&stringify)
 
     path_no = node.text('summary/path')
+    actual = XPath.first(@log.root, "records/result[path_no='#{path_no}']/actual")
 
     
     result = nil
@@ -36,14 +40,17 @@ class Path
       if raw_result then
         a = [raw_result].flatten.map(&:strip)
         b = expected.map(&:strip)
-        #puts 'a : ' + a.inspect + ' a :' + a[0].length.to_s
-        #puts 'b : ' + b.inspect + ' b :' + b[0].length.to_s
-        result = [raw_result].flatten.map(&:strip) == expected.map(&:strip)
+        actual.text = a.join("\n")[/</] ? CData.new("\n%s\n" % a.join("\n")) : a.join("\n")
+
+        # puts 'a : ' + a.inspect + ' a :' + a[0].length.to_s
+        # puts 'b : ' + b.inspect + ' b :' + b[0].length.to_s
+        result = a == b
       else
         result = [raw_result].compact == expected
       end
 
     rescue
+      puts 'error: ' + ($!).to_s
       result = false
     ensure
       @success[-1][0] = result
@@ -61,14 +68,23 @@ class Testdata
  
   def initialize(s)
     #puts 'filex : ' + $0
+    #puts 'filez : ' + __FILE__
+    #puts 'pwd : ' + Dir.pwd
+    #exit
     @filepath = File.dirname s
     buffer = self.send('read_' + (s[/https?:\/\//] ? 'file' : 'url'), s)   
     @doc = Document.new(buffer)
     raise "Testdata error: doc %s not found" % s unless @doc
     @success = []
+
+    @log =  Document.new(tests)
+  end
+
+  def paths() 
+    yield(path = Path.new(@doc, @log, @success)) 
+    File.open(Dir.pwd + '/.test_log.xml','w'){|f| f.write @log }
   end
 
-  def paths() yield(path = Path.new(@doc, @success)) end
   def read_file(s) File.open(s, 'r').read  end
   def read_url(xml_url)  open(xml_url, 'UserAgent' => 'S-Rscript').read  end
 
@@ -79,6 +95,12 @@ class Testdata
     {false: @success.select{|x| x[0] == false}.map(&:last).sort,
      nil: ((a[0]..a[-1]).to_a - a)}
   end
+  
+  def find_by(s)
+    XPath.match(@doc.root, "records/test/summary[type='#{s}']/description/text()").map(&:to_s)
+  end
+
+  private
 
   def tests()
     script = XPath.first(@doc.root, "summary/script/text()").to_s
@@ -104,7 +126,7 @@ class Testdata
       path_no = node.text('summary/path').to_s
       output_values = XPath.match(node, "records/io/summary[type='output']/*").map(&stringify)
       raw_output = (output_values - ['output'])
-      output = "#=> " + raw_output.join("\n")
+      output = raw_output.join("\n")
 
       values = input_values - ['input']
       body = content[i][2].strip.gsub("\n      ","\n")
@@ -113,13 +135,45 @@ class Testdata
           body.gsub!(/#{keyword}(?!:)/, "'%s'" % value )
         end
       end
-      ["# #{path_no}) #{content[i][0]}\n", body + "\n", output + "\n\n"]  
+      [path_no, content[i][0], body, output]  
     end
 
-    r.each {|x| x.join("\n")}.join("\n")
+    #r.each {|x| x.join("\n")}.join("\n")
+    tests_to_dynarex(r)
   end
-  
-  def find_by(s)
-    XPath.match(@doc.root, "records/test/summary[type='#{s}']/description/text()").map(&:to_s)
+
+  def tests_to_dynarex(tests)
+
+    xml = Builder::XmlMarkup.new( target: buffer='', indent: 2 )
+    xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
+
+    xml.results do
+      xml.summary do
+        xml.recordx_type 'dynarex'
+        xml.format_mask '[!path_no] [!title] [!test] [!expected] [!actual]'
+        xml.schema 'results/result(path_no, title, test, expected, actual)'
+      end
+      xml.records do
+        tests.each do |path_no, title, test, expected|
+          xml.result do
+            xml.path_no path_no
+            xml.title title
+
+            xml.test do
+              test[/[<>]/] ? xml.cdata!("\n%s\n" % test) : test
+            end
+
+            xml.expected do
+              expected[/</] ? xml.cdata!("\n%s\n" % expected) : expected
+            end
+
+            xml.actual
+          end
+        end
+      end
+    end    
+
+    buffer
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: testdata
 version: !ruby/object:Gem::Version 
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors: []
 
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +00:00
+date: 2011-01-09 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: 
 executables: []