testdata 1.1.4 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa0d7a1cdf51ffa92c4a9bba5fc50034e39886f6
-  data.tar.gz: 662ea0551714417be64ad5237a3fd7f3a1257396
+SHA256:
+  metadata.gz: 32849b0ae198aae1f9d452d43546af0b38a536a1020244a1c665e57849f2a737
+  data.tar.gz: d36e7b2b424dba8d996e340ec339efc5d2994ce50d19b5b2597d2c257617a7c4
 SHA512:
-  metadata.gz: 89b31c101e4426854bf6435d70156c81d400d8bf3afafc42dcbe19d79ed5788f57255583b9ca2b505d01282941e4b93e8577dbc1e17bab3d62c70912ccc698db
-  data.tar.gz: 80a398b1075d8a74b3b70d9740cf6c0b26e0a808a255f998402a9364db39cc4befec706a02653625ebd7cce6f7118fc7c3127349bef89a8dcade199115f7542e
+  metadata.gz: 0afd9e441d73dc0c4a46e46d85a19eb9e48c41d9660a20c0526ea9526c510d86657542bd2949aa0fa499ef73706935127e67108ac72c0f13063d0972fe1e0b78
+  data.tar.gz: eae8ad80bd813f4c18b61062ac7c406a32f5f3fd0258ebd6cc1f6cdb4f7f126032cb55e01f602333a7602ee1aab74ba14c29b37f7839d9af4cd40393bc3ac5fb

data/lib/testdata.rb

@@ -4,8 +4,9 @@
 
 require 'app-routes'
 require 'testdata_text'
-require 'diffy'
+require 'diffyc32'
 require 'polyrex'
+require 'yaml'
 
 
 class TestdataException < Exception
@@ -14,6 +15,7 @@ end
 module Testdata
   
   class Base
+    using ColouredText
 
     include AppRoutes
 
@@ -54,6 +56,15 @@ module Testdata
 
     def run(raw_x=nil, debug2=nil)
       
+      # verify the document  has unique path numbers
+      
+      a = @doc.root.xpath('records/test/summary/path/text()')
+      duplicates = a.select{ |e| a.count(e) > 1 }.uniq
+      
+      if duplicates.any? then
+        raise 'Duplicate path found. Path: ' + duplicates.inspect 
+      end
+
       @debug2 = debug2 ? true : false
       @success = []
       
@@ -63,7 +74,7 @@ module Testdata
       else
         raw_x
       end
-      
+
       procs = {NilClass: :test_all, Range: :test_range, String: :test_id, 
                Integer: :test_id, Fixnum: :test_id}
 
@@ -74,28 +85,19 @@ module Testdata
     private
     
     def testdata_values(id)
-      #puts 'testdata_values: id ' + id.inspect
-      #exit
+
       node = @doc.root.element "records/test[summary/path='#{id}']"
-      #puts 'node: ' + node.xml.inspect
-      #exit
       raise TestdataException, "Path error: node title not found" unless node
 
       path_no = node.text('summary/path')
-      #puts 'path_no : ' + path_no.inspect
+
       input_summary = node.element 'records/input/summary'      
       input_summary.delete 'schema | format_mask | recordx_type'
-      #puts 'input_summary ' + input_summary.xml.inspect
 
-      #puts 'node : ' + node.xml.inspect
       input_nodes = input_summary.xpath('*') #[1..-1]
-
-      #puts 'input:nodes : ' + input_nodes.inspect
-      input_values = input_nodes.map{|x| x.texts.join.strip}  + []
-      #puts 'input_values : ' + input_values.inspect
-
+      input_values = input_nodes.map{|x| x.texts.map(&:unescape).join.strip}
       input_names = input_nodes.map(&:name)
-      #puts 'input_names : ' + input_names.inspect
+
       raise TestdataException, 'inputs not found' if input_values.empty? \
                                                         or input_names.empty?
 
@@ -117,12 +119,25 @@ module Testdata
       x ||=(0..-1)
 
       break_on_fail = @doc.root.element('summary/break_on_fail/text()') == 'true'
+      
+      test_id = nil
 
-      @doc.root.xpath("records/test/summary/path/text()")[x].each do |id|
+      begin
+        
+        @doc.root.xpath("records/test/summary/path/text()")[x].each do |id|
+          
+          test_id = id
+          puts 'testing id: ' + id.inspect
+          result = test_id(id)
+          break if result == false and break_on_fail 
+          
+        end
+        
+      rescue
 
-        result = test_id(id)
-        break if result == false and break_on_fail 
+        @success << [false, test_id.to_i]
       end
+      
 
     end
 
@@ -132,7 +147,7 @@ module Testdata
       path_no, inputs, input_names, type, expected, @desc = 
                                             testdata_values(id.to_s)
       @inputs = inputs
-      #puts 'after inputs'
+
       tests() # load the routes
 
       raw_actual = run_route type
@@ -153,10 +168,10 @@ module Testdata
             inputs = input_names.zip(inputs).map{|x| '  ' + x.join(": ")}\
               .join("\n")
 
-            puts "\ninputs: \n" + inputs
-            puts "\ntype or description:\n %s: %s" % [type, @desc]
-            puts "\nexpected : \n  " + b.inspect
-            puts "\nactual : \n  " + a.inspect + "\n"
+            puts "\ninputs: \n".bold + inputs
+            puts "\ntype or description:".bold + "\n %s %s".cyan % [type, @desc]
+            puts "\nexpected : \n  ".bold + b.inspect
+            puts "\nactual : \n  ".bold + a.inspect + "\n"
           end
 
           result = a == b
@@ -164,7 +179,13 @@ module Testdata
           if (@debug == true or @debug2 == true) and result == false then
 
             # diff the expected and actual valuess
-            puts Diffy::Diff.new(a.first, b.first)
+            r = Diffy::Diff.new(a.first, b.first).to_s
+            r2 = r.lines.map do |line|
+              line.sub(/^\- {4}/) {|x| "-    ".light_green}\
+                  .sub(/^\+ {4}/) {|x| "+    ".light_red}
+            end
+            #puts 'r: ' + r.lines.inspect
+            puts r2
           end
         else
           result = [raw_actual].compact == expected
@@ -191,7 +212,7 @@ module Testdata
     end
     
     def read_rdx(buffer)
-      
+      puts 'inside read_rdf: buffer: ' + buffer.inspect
       dx = Dynarex.new
       dx.import buffer
 
@@ -216,7 +237,8 @@ module Testdata
 
         px.create.test(path: (i+1).to_s, type: dx.test_type) do |create|
           
-          raw_inputs.each do |fld_in| 
+          raw_inputs.each do |fld_in|
+
             create.input(fld_in[0..-4].to_sym => \
                                         x.method(fld_in.to_sym).call)
           end
@@ -250,6 +272,7 @@ module Testdata
     end
     
     def read_td(buffer)
+      puts 'buffer: ' + buffer
       TestdataText.parse buffer
     end
 
@@ -261,11 +284,19 @@ module Testdata
     def summary()
       success = @success.map(&:first)
       a = @success.map(&:last).sort
-      {
+      h = {
         passed: success.all?,
         score:  [success.grep(true), success].map(&:length).join('/'),
         failed:  @success.select{|x| x[0] == false}.map(&:last).sort
       }
+      
+      def h.to_s()
+        passed = self[:passed] ? self[:passed].to_s.light_green : self[:passed].to_s.light_red
+        "{passed: #{passed}, score: #{self[:score]}, failed: #{self[:failed]}}"        
+        
+      end
+      
+      h
     end
   end
 
@@ -327,4 +358,4 @@ end
       
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testdata
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.9
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTIyNTExNDczMVoXDTE3MTIyNTExNDczMVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAN48hsjFFejQq6VTAOeKCq1sb2Wmcwjfoucvk6zf4VHq35eC0oMBsDcEIwAL
-  yEW/eGBe/H0YDmlFBB4CQa38M4jkYQu7nGMsJbCiHdPMXyAfyF1Ouqv/5NOKiCMk
-  NSQHfeayhMFYvUn1LJN/mDuhd5Dwg8dOH+THo1QIixzFIygr+raVNsvr2a4lhQvi
-  czS7H32qybyuJ+RevxeRcD/kaBAUcWBHjesPt1etPPuuTmZEIP9l8ww3ti0qSD0L
-  lKaLYAYE8ee8N5CBuKx43Xm8y00zlYKcQ2uejmV5xgXkW/HZshTmuk3/NmufOjFI
-  usmlT3F0+0qOe0qGuJ7DBqtqrVkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUb+rBhQ/jhwFcfgn1KwdZ2oFkhj4wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAPrvJ0HyV
-  A+VMfo63URQ/epzq0iRuwQhOIqB4gw0FN8RSwad7cDLL6sjt6lrV3Pmw67vNoqqY
-  uifs539/2aOFv0dMRU4dxBSpGnz607k2rz0Ukp+MYxuzTnBayGKCaTHPcYAHWIVn
-  /j7Tt1bC0Vy3nvV2GxUFVqWHVBm+3VTZJdVRfByGaKmKPSmCJ5adqtfueY+7GzVb
-  0LkKyCM8UrKlk4SEvrt82e1phro39PhGMqgv6YUOYcLvrM2gHQvFZEpMNmQIKY9d
-  3EL9FRRxK/4JM2Z+vmP6g8N2mZqc+DZBXtWG4HduYn6QMiRDyUecO0T8lz2nyQCg
-  Cf9gUOV9A/6lvA==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkxMDA3MDk0MTU2WhcN
+  MjAxMDA2MDk0MTU2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC2E/7O
+  uQtSwiOjY7M3mU5cZOQeF3mNUXsYF9Sg37oHlh9a960rQ86X/JTNjw/H9GpMwxQA
+  bZCEElZUfMFTCQmxK46elKkhd1q4A1vClsYNKGwT85yO619Mqq7W7RzqsyuMN6AC
+  EvtUXz3FJ9hXtacFEXdUNMu7zuV+GMfeOXZlsORKGsI5GR9XPQ0GquyZr8sdOJh0
+  ijFDX+MPg3R2Px1NHu/iYZZeh/AHmdce4tTbQpqIE+wlc66P2NjOOZ6y3Yc2V/Mc
+  XfbQMq02FXwVVX60bTzh6KFvrYifsLQvGdW4TEY0+JOAyTUIO/WxwYDTJ+6suES7
+  r9sUEKxzJ6EHmPj3olz+86PwsOySY073euOXA3afBTvYkaVm2WVzUjBTz35+F7pv
+  Ov2mmUDkNUUD8ZftL3QZD39SWuR6QK6uBuunhEGTIXLspAMVECTeNpi8wRMafWgE
+  dVKiSjRVBBLfW2z1pmVj6U6ZTjKGeznKEG94AcApj8xVMw5sDIidyGxcW5cCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUe5iftB4c
+  UGlQ0UyqEkg2Qq02Sn4wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEATciFgyRCUKVEJFrO291gbPIEAkeCsLtCRxB0Qz7R
+  Z/7bcVTdrk8/S2VQupuuni8UGeIQuxMTIkoWshCztNrIJ77xxdvk6/WqKqyxeRyZ
+  WKp6dPBvK0CXPRnboicdgWyiJZFr8WXGHmJuRG+SIhMPjR552kTpoKuUqf/aMs0q
+  krS/PjRP7MX2lCx2ZYi6/CdwyJmI5tO4ffXBNFpfquiwAa/tzPKKpbzEFjuUdTs0
+  ByW7I/n/h2fQkhR+/hbzh/xzCuRatkvUkAHmtW1StGSbPn0Hoam6hwWp+NuuUfEU
+  tA2AMgGW5/Ft/vBLFyCfMr/9x6QJEW3VtfwqL8zie4jp2sVCrW1gdotA3+4XdaEF
+  fUI/y8o+W/4oN7aCyhUzCXTSlGzwEHLqqCYX3DFerUd+mdQhSNLYAQuJtj/4zoNc
+  U1Tt/KPr9FeWlvj5ihis4H6UPWZxY2G9k94y2W7ylWkcKNXR8i45F+nCzDL3W0Ll
+  Vt/9GDfEI95Jg3QNvXMDdzNf
   -----END CERTIFICATE-----
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -42,7 +46,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,69 +56,69 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
   name: testdata_text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: diffyc32
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: polyrex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.3.1
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -139,9 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: testdata
+summary: A test framework which accepts test data in a Polyrex format.
 test_files: []

metadata.gz.sig

@@ -1,2 +1,3 @@
-2g��S���y�2�RdNu��Z��
�э�1?j�Y��b9�=P�g]F��o>��2�߈	�T�3�^�P��$L:�����ۤ���.���<Ec�KE�0�����7�
��;|!d8��$ؔ-eY
-���&_��Q��KX��rսأ}ۧy�ɇ8���:�~`���X3��˞D�o��eJ׋�� 狠J��<�%�i֣;�R�#Jv��$��B���]g���O߆Ѳ�F����
+�HT��1����1���=
+��♯�RP#�R��ȴ���R(����#]�m�6��bŦ�4�'�'������%�Q��ֹ�/�G���`�n��Vh�6LG�E1��,�v-��Slf	{�����4���`�q��e��;U��d�����ك����-�y��bW��
�ϫ�3~�3�5�-lo
+�����̂���.P3n#��