testkit123 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f614e8e95327241b534bbf266dad46525c6cd71adbedf8ca8044527cc9882a62
-  data.tar.gz: 0777ac2e0d3c01b7d4a6238a428be34496f2cb3910f5bcb86075af1f37329325
+  metadata.gz: 7b69d7193e9f8255f026689f71a93794fa710adf05c2cce1992a1003d92a8886
+  data.tar.gz: 1386ccfd90a285cba41135fe003846d43ab1cb894e4856c2e5d481f245dc2c02
 SHA512:
-  metadata.gz: c36ff119e0864242544c179d34a2674524873b2458a65b43384018a46bff12ea9f9ed8579fa76b31a22e1723656a38d23ecea3bb001ccf160ec70b3191e1eb54
-  data.tar.gz: 5596f0154676cb0893ad1db11bf20a35430ec566e5abd4f77f6208cce7af4f7d3ded1cff57848e55469a3d033669a2f1a2870a2124fda5b8e3277380328b20bc
+  metadata.gz: 2b9aa7567633aaf7104624da65dea865d4ed10a5936c1f824c474e8dd8e5e8b596673cd75e8947ed0fada4904bb505215f65a5af8979b15b2001e561da3bb12a
+  data.tar.gz: f95045d7b9381c9b8fa6b96fd17e3eb511c8e1bcda6414e385c876e999b24821865e6701be264954d02caa8d630c8f4dc5ee5abe00e69c65f4470bcc9f472dfb

data/lib/testkit123.rb

@@ -135,12 +135,14 @@ end
     ext = config[:testdata_ext][/\.?td$/] ? 'td' : 'xml'
     testdata_file = File.join(datafilepath, "testdata_#{proj}.#{ext}")
     puts 'testdata_file: ' + testdata_file.inspect if @debug
+    puts 'source code filepath: '  + test_rbfile.inspect if @debug
     
     s = File.read(test_rbfile).gsub(/^(  )?end/,'')
     require_gems = s.scan(/^require +['"]([^'"]+)/).map(&:first)
     
-    before_test = s[/(?<=def tests\(\)).*(?=\n    test )/m].lstrip
-        
+    before_test = s[/(?<=def tests\(\)).*/m].split(/    test /)[0].lstrip
+    puts '** before_test: ' + before_test.inspect
+
     a = s.split(/(?=    test )/)
     a.shift
 
@@ -162,13 +164,36 @@ end
     puts 'xml: ' + xml.inspect if @debug
     
     doc = Rexle.new(xml)
-    testnode = doc.root.xpath('records//test')[n-1]
+    puts 'after doc : ' if @debug
+    r = doc.root.xpath('records//test') || doc.root.xpath('records/test')
+    
+    if @debug then
+      puts 'r: ' + r.inspect 
+      puts 'r.length: '  + r.length.inspect
+      puts 'n: ' + n.inspect
+    end
+    
+    testnode = r[n-1]
+    puts 'testnode: ' + testnode.xml.inspect if @debug
+    
     title = testnode.text('summary/type')
     i = tests.index tests.assoc(title)
-    
+        
     testcode = a[i].strip.lines[1..-2].map do |line|
       line.sub(/^ {6}/,'')
     end.join
+    
+    # replace the input variable names with the input variable names defined 
+    # in the testdata file and prefix them with *test_*.
+    
+    input_vars = testnode.xpath('records/input/summary/*/name()')
+    
+    puts 'input_vars: '  + input_vars.inspect
+    puts 'tests[i][1]: '  + tests[i][1].inspect
+    puts 'zip: ' + tests[i][1].zip(input_vars).inspect
+    tests[i][1].zip(input_vars).each do |x|
+      testcode.gsub!(x[0], 'test_' + x[1])
+    end  
 
     args = testnode.xpath('records/input/summary/*').map do |input|
       "test_%s =<<EOF\n%s\nEOF\n" % [input.name, 
@@ -185,12 +210,15 @@ end
     
     puts 'gems: ' + require_gems.inspect if @debug
     
+    codex = testcode.rstrip.lines
+    
     "# Test %d. Type: %s\n# Description: %s\n" \
         % [n, title, testnode.text('summary/type')] + \
     "# --------------------------------------------\n\n" + \
     "require '#{proj}'\n" + require_gems.map {|x| "require '%s'" \
                                               % x}.join("\n") + "\n\n\n" \
-     + before_test.gsub(/^    /,'') + "\n" + args.join("\n") + testcode
+     + before_test.gsub(/^    /,'') + "\n" + args.join("\n") \
+     + codex[0..-2].join + 'puts ' + codex.last
 
   end
 
@@ -290,3 +318,4 @@ EOF
   end
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testkit123
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - James Robertson