testdata 0.8.0 → 0.8.3

data/lib/testdata.rb

@@ -17,9 +17,22 @@ class Testdata
     @debug = false
 
     # open the testdata document
-    buffer = self.send('read_' + (s[/https?:\/\//] ? 'url' : 'file'), s)   
-    @doc = Document.new(buffer)
+    procs = {
+      String: proc {|x|
+                    
+        if x.strip[/^</] then
+          x
+        elsif x[/https?:\/\//] then
+          read_url x
+        else
+          read_file x
+        end                   
+      },
+      Polyrex: proc {|x| x.to_xml}
+    }
 
+    buffer =  procs[s.class.to_s.to_sym].call(s)
+    @doc = Document.new(buffer)
     o = {log: false}.merge(options)
     @log =  o[:log] == true ? Document.new(tests) : nil
   end
@@ -37,8 +50,10 @@ class Testdata
     path_no = node.text('summary/path').to_s
 
     xpath = "records/io/summary[type='input']/*"
-    input_values = XPath.match(node, xpath)[1..-1].map(&stringify)
-
+    input_nodes = XPath.match(node, xpath)[1..-1]
+    input_values = input_nodes.map(&stringify)   
+    input_names = input_nodes.map(&:name)
+    
     # find the type or description
     xpath = "summary/type/text() | summary/description/text()"
     type_or_desc = XPath.match(node, xpath).map(&:to_s).find{|x| x != ''}
@@ -47,7 +62,7 @@ class Testdata
     raw_output = XPath.match(node, xpath)
     output_values = raw_output.length > 0 ? raw_output[1..-1].map(&stringify) : []
     
-    [path_no, input_values, type_or_desc, output_values]
+    [path_no, input_values, input_names, type_or_desc, output_values]
   end
 
   def run(x=nil, debug2=nil)
@@ -69,8 +84,8 @@ class Testdata
 
   def test_id(id='')
 
-    path_no, @inputs, tod, expected = testdata_values(id.to_s)
-    routes()
+    path_no, @inputs, input_names, tod, expected = testdata_values(id.to_s)
+    tests() # load the routes
     raw_actual = run_route tod
 
     result = nil
@@ -79,13 +94,17 @@ class Testdata
     begin
 
       if raw_actual then
-        a = [raw_actual].flatten.map(&:strip)
+
+        a = raw_actual.is_a?(String) ? [raw_actual].flatten.map(&:strip) : raw_actual
         b = expected.map(&:strip)
 
         if @debug == true or @debug2 == true then
-          puts "\n" + tod
-          puts "\nexpected : " + b.inspect
-          puts "\nactual : " + a.inspect + "\n"
+          inputs = input_names.zip(@inputs).map{|x| '  ' + x.join(": ")}\
+            .join("\n")
+          puts "\ninputs: \n" + inputs
+          puts "\ntype or description:\n  " + tod
+          puts "\nexpected : \n  " + b.inspect
+          puts "\nactual : \n  " + a.inspect + "\n"
         end
 
         result = a == b
@@ -103,22 +122,23 @@ class Testdata
     end
   end
 
-  def routes(*args)
+  def tests(*args)
     # override this method in the child class
   end
 
   def read_file(s) File.open(s, 'r').read  end
   def read_url(xml_url)  open(xml_url, 'UserAgent' => 'S-Rscript').read  end
 
-  def get(s)
+  def test(s)
     @inputs = @inputs.first if @inputs.length == 1
-    super(s){yield(@inputs)}
+    get(s){yield(@inputs)}
   end
 
   def summary()
     success = @success.map(&:first)
     a = @success.map(&:last).sort
     {
+      passed: success.all?,
       score:  [success.grep(true), success].map(&:length).join('/'),
       failed:  @success.select{|x| x[0] == false}.map(&:last).sort
     }

metadata

@@ -2,7 +2,7 @@
 name: testdata
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.0
+  version: 0.8.3
 platform: ruby
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +01:00
+date: 2011-04-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency