testkit123 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c71572c20bbe4fe67752af0bf83c7c096e89baa74b177941cfaca9409f2f3fb
-  data.tar.gz: 72bc398488905987600db9b1f10e6fb9200006d76ecf9002a8594912fe2c781b
+  metadata.gz: 78e24b1565f8efab12a23a79131432444dbef249f1b5cb341b2a970485bebe65
+  data.tar.gz: 891ecd6e1d304083f3abcb703828e784270bba141a26b743824e4413223e3a52
 SHA512:
-  metadata.gz: c264eefc27f45dcd8c25f4553b85dcdb93832fcde33b43914021d362e8b9bbc9d9711ce20201a406595b36e26b9738e3a3f8802d2c4deb448b4612fcf7f7b9d6
-  data.tar.gz: daeee25fdf8781a1fa6502f1c9b532bf4850cab8e3d0d2186aedfaed5bbf0a56a28e87cca294cd6829f23847b644d1ca5099ff31ec50515e8787fd6b02b45a8c
+  metadata.gz: a7f9971e4ccd66cdc623f8667520218f9e795c78d7b7dc599ef14e90fd6cc821ad06f0576396f00c8158d11a6e87ccd02268a4180a9202ed15587ced1703708e
+  data.tar.gz: d3d94f0ae845bd38f0ae4f56f9be9b7ea3cee7195918a8c5ebd6224b7ade291a3dfb1e9f67cb792a0ea103eead48e1cc61a660e7a1600db70bc4d10a93a14c7b

data/lib/testkit123.rb

@@ -24,6 +24,8 @@ class TestKit123
   using StringFormat
   using ColouredText
   
+  attr_reader :testdata_file
+  
   def initialize(templates: {testdata: nil, testx: nil}, project: nil, 
         debug: false, localpath: nil, datapath: nil, 
         gemtest_url: nil, rubyver: 'ruby-2.5.1')
@@ -41,9 +43,49 @@ class TestKit123
 
     @localpath, @datapath, @gemtest_url = localpath, datapath, gemtest_url
     @rubyver = rubyver
+    
+    if File.exists? @project_config then
+      
+      config = SimpleConfig.new(@project_config, debug: false).to_h
+      puts ('config: ' + config.inspect).debug if @debug
+      
+      proj = config[:project]
+      puts 'create_standalone: proj: ' + proj.inspect if @debug
+      
+      raise 'config[:data_path] not found' unless config[:data_path]
+      
+      datafilepath = config[:data_path] + '/' + proj
+      test_rbfile = File.join(datafilepath, "test_#{proj}.rb")    
+      
+      ext = (config[:testdata_ext] and config[:testdata_ext][/\.?td$/]) ? 'td' : 'xml'
+      @testdata_file = File.join(datafilepath, "testdata_#{proj}.#{ext}")      
+      
+    end
 
   end
 
+  # expects a test node; see new_testnode()
+  #
+  def add_test(testnode)    
+    
+    s2 , filetype = RXFHelper.read @testdata_file
+    puts 'filetype: ' + filetype.inspect if @debug
+
+    xml = if s2.lstrip[0] == '<' then
+      s2
+    else
+      TestdataText.parse s2
+    end
+
+    puts 'xml: ' + xml.inspect if @debug
+    
+    doc = Rexle.new(xml)
+    id = doc.root.xpath('records/test/summary/path/text()').last.to_i + 1
+    testnode.root.element('summary/path').text = id.to_s
+    doc.root.element('records').add testnode
+    return doc
+  end  
+
   def create_files(project=@project_config)
 
     puts 'running create_files ...' if @debug
@@ -138,10 +180,13 @@ end
     
     proj = config[:project]
     puts 'create_standalone: proj: ' + proj.inspect if @debug
+    
+    raise 'config[:data_path] not found' unless config[:data_path]
+    
     datafilepath = config[:data_path] + '/' + proj
     test_rbfile = File.join(datafilepath, "test_#{proj}.rb")    
     
-    ext = config[:testdata_ext][/\.?td$/] ? 'td' : 'xml'
+    ext = (config[:testdata_ext] and 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
@@ -205,7 +250,7 @@ end
     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])
+      testcode.gsub!(/\b#{x[0]}\b/, 'test_' + x[1])
     end  
 
     args = testnode.xpath('records/input/summary/*').map do |input|
@@ -262,16 +307,24 @@ end
     
   end
   
-  def make_testdata(s)
+  def new_testnode(s=nil, type: '', inputs: {}, outputs: {result: ''})
+    
+    if s then
+      
+      # the scan is intended to find the input variables from an 
+      # example Ruby script
+      
+      inputs = s.scan(/test_([\w]+) += +['"]([^'"]+)/)\
+          .inject({}){|r,x| r.merge(x.first.to_sym => x.last)}    
+    end
     
-    inputs = s.scan(/test_([\w]+) += +['"]([^'"]+)/)\
-        .inject({}){|r,x| r.merge(x.first.to_sym => x.last)}    
+    # observe *test* is masked with *_test* because it is a built-in method name.
     
     h = {
       _test: {
         summary: {
           path: '',
-          type: '',
+          type: type,
           description: ''
         },
         records: {
@@ -280,7 +333,7 @@ end
             records: {}
           },
           output: {
-            summary: {result: ''},
+            summary: outputs,
             records: {}
           }
         }      
@@ -289,7 +342,7 @@ end
 
     a = RexleBuilder.new(h, debug: false).to_a
 
-    Rexle.new(a).xml pretty: true
+    Rexle.new(a)
     
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testkit123
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   owBtF8qd/v9x+t6h+/j/LPTmgwDrPhKl4HmH77oloyec9426T3EW7OvcMiMXAfQG
   KKJn9TVnRGoWZTIHtu1e5v36
   -----END CERTIFICATE-----
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -43,40 +43,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: testdata_text
   requirement: !ruby/object:Gem::Requirement