testdata 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6145667ecd2aa92eb08103530d303160237f404f
-  data.tar.gz: 9c55c92ce7498adee293ec5a94fcf2a60c5cc57e
+  metadata.gz: 85df418ee36fbf63d1251c05026d15f1dce0bd3d
+  data.tar.gz: 32271bb343c7bbec815b1544c2b6619cf84ff996
 SHA512:
-  metadata.gz: 62e712a8cb605daffe324266565440ce38e7d1cfbc006f98f38cb7da9a629571a48930f9610e8615d1324b92c312994805686cd407ba6200686366ff938d697e
-  data.tar.gz: b57e5005f2b2189f49c85317b26debca8e89579f59acaf9df46a4f97052ec5ceb9609355312a1c68beea4b24064f0849296cf16993b6d7075928bae4520c03cb
+  metadata.gz: 5f6029e4db3a86de52f62bb8b558c536e421b01a1259c26e5fbb04c9214083c85285a5cf012df827fe63b5c1c5f7a4263b8fffadf4858dff6b23113fa77aff61
+  data.tar.gz: c8455c98ebdb47410d1c7c42d83b07b01c98bab4259bb3e199125d26a87f650ffe01406dc998f6541fbd938b9b44fad3aceee9e96fafc39562f9d1c7a402ac8e

data/lib/testdata.rb

@@ -61,15 +61,14 @@ class Testdata
 
     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 != ''}
+    summary = XPath.first node, 'summary'
+    type, desc = summary.text('type'), summary.text('description')
 
     xpath = "records/io/summary[type='output']/*"
     raw_output = XPath.match(node, xpath)
     output_values = raw_output.length > 0 ? raw_output[1..-1].map(&stringify) : []
     
-    [path_no, input_values, input_names, type_or_desc, output_values]
+    [path_no, input_values, input_names, type, output_values, desc]
   end
 
   def run(x=nil, debug2=nil)
@@ -95,11 +94,13 @@ class Testdata
 
   def test_id(id='')
 
-    path_no, inputs, input_names, tod, expected = testdata_values(id.to_s)
-
+    path_no, inputs, input_names, type, expected, @desc = 
+                                          testdata_values(id.to_s)
     @inputs = inputs
     tests() # load the routes
-    raw_actual = run_route tod
+
+    raw_actual = run_route type
+    puts  "warning: no test route found for " + type unless raw_actual
 
     result = nil
     @success << [nil, path_no.to_i]      
@@ -117,7 +118,7 @@ class Testdata
             .join("\n")
 
           puts "\ninputs: \n" + inputs
-          puts "\ntype or description:\n  " + tod
+          puts "\ntype or description:\n %s: %s" % [type, @desc]
           puts "\nexpected : \n  " + b.inspect
           puts "\nactual : \n  " + a.inspect + "\n"
         end
@@ -163,8 +164,8 @@ class Testdata
 
 
   def test(s)
-    @inputs = @inputs.first if @inputs.length == 1
-    self.add_route(s){yield(@inputs)}
+    #@inputs = @inputs.first if @inputs.length == 1
+    self.add_route(s){yield(*(@inputs + [@desc]))}
   end
 
   def summary()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testdata
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   vWFtb5VPsjLRwClW20j7R9zEUv5XjYoyxcUn1W1xQINMVIQMtvMhouLBeWTXF7g4
   ab2xQAvsYawLTw==
   -----END CERTIFICATE-----
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes