ass_tests 1.2.0.alpha → 2.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5759b3b984cf4cc39328bc1000524c7219abbb17
-  data.tar.gz: d1b60660362f009f702cc52b20e412b10430a8d7
+  metadata.gz: b78be6444481da3348e90016698fc3f76e83f003
+  data.tar.gz: ba2dc6b4fc10c6e434518753671e57cf106b540c
 SHA512:
-  metadata.gz: 1dbc3df6a7bc7f6fb6380c63fe4a838fea03de32e799af5af3684f6a462ce428f2110cc28abc4490b251039c52f164cc0f9ddb5e7c067134bbe98a149c0990e1
-  data.tar.gz: ff6c2770137227159bef588d836b84e42b144d30e3ca7c9f3942cd477ec6b712120de92c87bbb57b07a20cfd4d71a0247f94fe3ef6669504a9a6d23374364fcc
+  metadata.gz: 7b362b76b12415ab195d40a8ad2e06ef9ff60ebc41008faf11ae16867a985541dea38e0512de10990ed70dc5e5e2cc99e6c516c649eef0a8822bb9d6690f8a0c
+  data.tar.gz: c71472e4cbb111221ce1874cf300f88060f6f3f47e262ddb3a16e488aaf8d69bd0438ba7e1e008319b072e3065185cb5cdf767e76acd05facaa9e16527b2c7ff

data/lib/ass_tests/minitest/assertions.rb

@@ -12,100 +12,118 @@ module  Minitest
 end
 
 module AssTests
-  module Assertions
-    UNKNOWN_XML_TYPE = 'UNKNOWN_XML_TYPE'
-
-    GOOD_OLE_CONNECTORS = [
-      AssLauncher::Enterprise::Ole::IbConnection,
-      AssLauncher::Enterprise::Ole::ThickApplication
-    ]
-    def _assert_xml_type(exp, obj, mess = nil)
-      act = xml_type_get(obj)
-      mess = message(mess) do
-        "Expected #{exp} xml type but #{act} given"
+  module Minitest
+    module Assertions
+      # @api private
+      module Comparable
+        UNKNOWN_XML_TYPE = 'UNKNOWN_XML_TYPE'
+        SRV_CONNECTORS = [AssLauncher::Enterprise::Ole::IbConnection,
+          AssLauncher::Enterprise::Ole::ThickApplication]
+
+        class ClientContext
+          attr_reader :obj, :ole_connector
+          def initialize(obj, ole_connector)
+            @obj = obj
+            @ole_connector = ole_connector
+          end
+
+          def string_internal
+            fail NotImplementedError,
+              "You should patch method #string_internal in class: #{self.class.name}"
+          end
+
+          def xml_type
+            fail NotImplementedError,
+              "You should patch method #xml_type in class: #{self.class.name}"
+          end
+
+          def as_string
+            ole_connector.sTring obj
+          end
+
+          def make
+            r = {}
+            r[:as_string] = as_string
+            r[:xml_type] = xml_type
+            r[:as_string_internal] = string_internal
+            r
+          end
+        end
+
+        class SrvContext < ClientContext
+          def string_internal
+            ole_connector.ValueToStringInternal obj
+          end
+
+          def xml_type
+            return UNKNOWN_XML_TYPE if ole_connector.xmlTypeOf(obj).nil?
+            ole_connector.xmlTypeOf(obj).typeName
+          end
+        end
+
+        def self.new(obj, ole_connector)
+          return SrvContext.new(obj, ole_connector) if\
+            SRV_CONNECTORS.include? ole_connector.class
+          ClientContext.new(obj, ole_connector)
+        end
       end
-      assert exp == act, mess
-    end
-
-    def _assert_ref_empty(obj, mess = nil)
-      mess = message(mess) {"Ref must be empty"}
-      assert obj.ref.IsEmpty, mess
-    end
-
-    def _refute_ref_empty(obj, mess = nil)
-      mess = message(mess) {"Ref must not be empty"}
-      refute obj.ref.IsEmpty, mess
-    end
-
-    def _assert_equal(exp, act, mess = nil)
-      fail_not_comparable(exp, act) if not_comparable?(exp, act)
-      exp_ = to_comparable(exp)
-      act_ = to_comparable(act)
-      mess = message(mess, Minitest::Assertions::E){diff exp_, act_}
-      assert exp_ == act_, mess
-    end
 
-    def to_comparable(obj)
-      return obj unless obj.is_a? WIN32OLE
-      return obj.__real_obj__ if obj.__ruby__?
-      # TODO: make comparsation ruby object from internal Ass string
+      def _assert_xml_type(exp, obj, mess = nil)
+        act = Comparable.new(obj, ole_connector).xml_type
+        mess = message(mess) do
+          "Expected #{exp} xml type but #{act} given"
+        end
+        assert exp == act, mess
+      end
 
-      return to_comparable_srv_context(obj) if\
-        GOOD_OLE_CONNECTORS.include? ole_connector.class
-      to_comparable_client_context(obj)
-    end
-    private :to_comparable
+      def _assert_ref_empty(obj, mess = nil)
+        mess = message(mess) {"Ref must be empty"}
+        assert obj.ref.IsEmpty, mess
+      end
 
-    def to_comparable_client_context(obj)
-      fail 'You should define own method #to_comparable_client_context'\
-        ' and returns #new_comparable Hash'
-    end
-    private :to_comparable_client_context
+      def _refute_ref_empty(obj, mess = nil)
+        mess = message(mess) {"Ref must not be empty"}
+        refute obj.ref.IsEmpty, mess
+      end
 
-    def to_comparable_srv_context(obj)
-      new_comparable ole_connector.sTring(obj),
-        xml_type_get(obj),
-        ole_connector.ValueToStringInternal(obj)
-    end
-    private :to_comparable_srv_context
-
-    def new_comparable(as_string, xml_type, as_string_internal)
-      r = {}
-      r[:as_string] = as_string
-      r[:xml_type] = xml_type
-      r[:as_string_internal] = as_string_internal
-      r
-    end
-    private :new_comparable
+      def _assert_equal(exp, act, mess = nil)
+        fail_not_comparable(exp, act) if not_comparable?(exp, act)
+        exp_ = to_comparable(exp)
+        act_ = to_comparable(act)
+        mess = message(mess, ::Minitest::Assertions::E){diff exp_, act_}
+        assert exp_ == act_, mess
+      end
 
-    def xml_type_get(obj)
-      return UNKNOWN_XML_TYPE if ole_connector.xmlTypeOf(obj).nil?
-      ole_connector.xmlTypeOf(obj).typeName
-    end
-    private :xml_type_get
+      def to_comparable(obj)
+        return obj unless obj.is_a? WIN32OLE
+        return obj.__real_obj__ if obj.__ruby__?
+        Comparable.new(obj, ole_connector).make
+      end
+      private :to_comparable
 
-    def not_comparable?(exp, act)
-       is_ruby?(exp) ^ is_ruby?(act)
-    end
-    private :not_comparable?
+      def not_comparable?(exp, act)
+         ruby?(exp) ^ ruby?(act)
+      end
+      private :not_comparable?
 
-    def is_ruby?(obj)
-      !obj.is_a? WIN32OLE or obj.__ruby__?
-    end
-    private :is_ruby?
+      def ruby?(obj)
+        !obj.is_a? WIN32OLE or obj.__ruby__?
+      end
+      private :ruby?
 
-    def fail_not_comparable(exp, act)
-      fail ArgumentError,
-        "Not comparable types `#{not_comparable_class exp}'"\
-        " and `#{not_comparable_class act}'"
-    end
-    private :fail_not_comparable
+      def fail_not_comparable(exp, act)
+        fail ArgumentError,
+          "Not comparable types `#{not_comparable_class exp}'"\
+          " and `#{not_comparable_class act}'"
+      end
+      private :fail_not_comparable
 
-    def not_comparable_class(obj)
-      return obj.__real_obj__.class if obj.respond_to? :__real_obj__
-      obj.class
+      def not_comparable_class(obj)
+        return obj.__real_obj__.class if obj.respond_to? :__real_obj__
+        obj.class
+      end
+      private :not_comparable_class
     end
-    private :not_comparable_class
   end
 end
 

data/lib/ass_tests/version.rb

@@ -1,3 +1,3 @@
 module AssTests
-  VERSION = "1.2.0.alpha"
+  VERSION = "2.0.0.alpha"
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: ass_tests
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha
+  version: 2.0.0.alpha
 platform: ruby
 authors:
 - Leonid Vlasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ass_ole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ass_maintainer-info_base
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: It make possible to write tests for 1C:Enterprise on Ruby easy. Access
@@ -144,9 +144,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".simplecov"
-- ".travis.yml"
+- .gitignore
+- .simplecov
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -178,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Framework for unit testing code written on 1C:Enterprise embedded programming