use Trailblazer::Core::Utils.inspect for future compat tests.

Author: apotonick

declarative.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-line"
+  spec.add_development_dependency "trailblazer-core-utils"
 end

test/defaults_test.rb

@@ -15,7 +15,7 @@ class DefaultsOptionsTest < Minitest::Spec
       schema.add :author_name
       schema.add :description, _defaults: defaults
 
-      _(schema.inspect).must_equal '{"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"TITLE", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"DESCRIPTION", :name=>"description"}>}'
+      assert_equal CU.inspect(schema), %({"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"TITLE", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"DESCRIPTION", :name=>"description"}>})
     end
   end
 
@@ -29,7 +29,7 @@ class DefaultsOptionsTest < Minitest::Spec
       schema.add :author_name
       schema.add :description, _defaults: defaults
 
-      _(schema.inspect).must_equal '{"title"=>#<Declarative::Definitions::Definition: @options={:as=>"TITLE", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:as=>"DESCRIPTION", :name=>"description"}>}'
+      assert_equal CU.inspect(schema), %({"title"=>#<Declarative::Definitions::Definition: @options={:as=>"TITLE", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:as=>"DESCRIPTION", :name=>"description"}>})
     end
   end
 
@@ -41,7 +41,7 @@ class DefaultsOptionsTest < Minitest::Spec
       schema.add :author_name
       schema.add :description, _defaults: defaults
 
-      _(schema.inspect).must_equal '{"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :name=>"description"}>}'
+      assert_equal CU.inspect(schema), %({"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :name=>"description"}>})
     end
   end
 
@@ -55,7 +55,7 @@ class DefaultsOptionsTest < Minitest::Spec
       schema.add :author_name
       schema.add :description, _defaults: defaults
 
-      _(schema.inspect).must_equal '{"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"Title", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"DESCRIPTION", :name=>"description"}>}'
+      assert_equal CU.inspect(schema), %({"title"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"Title", :name=>"title"}>, "author_name"=>#<Declarative::Definitions::Definition: @options={:name=>"author_name"}>, "description"=>#<Declarative::Definitions::Definition: @options={:render_nil=>true, :as=>"DESCRIPTION", :name=>"description"}>})
     end
   end
 
@@ -65,15 +65,15 @@ class DefaultsOptionsTest < Minitest::Spec
       defaults.merge!(a: 1, b: 2)
       defaults.merge!(      b: 3, _features: Declarative::Variables::Append(["A"]) )
       defaults.merge!(            _features: Declarative::Variables::Append(["B", "C"]) )
-      _(defaults.(nil, {}).inspect).must_equal "{:a=>1, :b=>3, :_features=>[\"A\", \"B\", \"C\"]}"
+      assert_equal CU.inspect(defaults.(nil, {})), "{:a=>1, :b=>3, :_features=>[\"A\", \"B\", \"C\"]}"
     end
 
     it "what" do
       defaults.merge!( _features: Declarative::Variables::Append(["A"]) ) do |name, options|
         { _features: Declarative::Variables::Append( ["B", "D"] ) }
       end
 
-      _(defaults.(nil, {}).inspect).must_equal "{:_features=>[\"A\", \"B\", \"D\"]}"
+      assert_equal CU.inspect(defaults.(nil, {})), "{:_features=>[\"A\", \"B\", \"D\"]}"
     end
   end
 
@@ -91,7 +91,7 @@ class DefaultsOptionsTest < Minitest::Spec
         { _features: ["B", "D"] }
       end
 
-      assert_equal "{:_features=>[\"A\", \"B\", \"D\"]}", defaults.(nil, {}).inspect
+      assert_equal CU.inspect(defaults.(nil, {})), "{:_features=>[\"A\", \"B\", \"D\"]}"
 
       assert_equal %{[Declarative] Defaults#merge! and #call still accept arrays and automatically prepend those. This is now deprecated, you should replace `ary` with `Declarative::Variables::Append(ary)`.\n}*2, $stderr.string
     end

test/definitions_test.rb

@@ -13,19 +13,19 @@ class DefinitionsTest < Minitest::Spec
     # #add works with name
     schema.add :id
     # get works with symbol
-    _(schema.get(:id).inspect).must_equal '#<Declarative::Definitions::Definition: @options={:name=>"id"}>'
+    assert_equal CU.inspect(schema.get(:id).inspect), '#<Declarative::Definitions::Definition: @options={:name=>"id"}>'
     # get works with string
-    _(schema.get("id").inspect).must_equal '#<Declarative::Definitions::Definition: @options={:name=>"id"}>'
+    assert_equal CU.inspect(schema.get("id").inspect), '#<Declarative::Definitions::Definition: @options={:name=>"id"}>'
 
     # #add with name and options
     schema.add(:id, unique: true)
-    _(schema.get(:id).inspect).must_equal '#<Declarative::Definitions::Definition: @options={:unique=>true, :name=>"id"}>'
+    assert_equal CU.inspect(schema.get(:id).inspect), '#<Declarative::Definitions::Definition: @options={:unique=>true, :name=>"id"}>'
   end
 
   it "overwrites old when called twice" do
     schema.add :id
     schema.add :id, cool: true
-    _(schema.inspect).must_equal '{"id"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :name=>"id"}>}'
+    assert_equal CU.inspect(schema.inspect), '{"id"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :name=>"id"}>}'
   end
 
   it "#add with block" do
@@ -36,7 +36,7 @@ class DefinitionsTest < Minitest::Spec
       end
     end
 
-    _(schema.inspect).must_equal '{"artist"=>#<Declarative::Definitions::Definition: @options={:nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>, "band"=>#<Declarative::Definitions::Definition: @options={:nested=>{"location"=>#<Declarative::Definitions::Definition: @options={:name=>"location"}>}, :name=>"band"}>}, :name=>"artist"}>}'
+    assert_equal CU.inspect(schema.inspect), '{"artist"=>#<Declarative::Definitions::Definition: @options={:nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>, "band"=>#<Declarative::Definitions::Definition: @options={:nested=>{"location"=>#<Declarative::Definitions::Definition: @options={:name=>"location"}>}, :name=>"band"}>}, :name=>"artist"}>}'
   end
 
   it "#add with :nested instead of block" do
@@ -47,7 +47,7 @@ class DefinitionsTest < Minitest::Spec
 
     schema.add :artist, nested: nested_schema
 
-    _(schema.inspect).must_equal '{"artist"=>#<Declarative::Definitions::Definition: @options={:nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>}, :name=>"artist"}>}'
+    assert_equal CU.inspect(schema.inspect), '{"artist"=>#<Declarative::Definitions::Definition: @options={:nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>}, :name=>"artist"}>}'
   end
 
 
@@ -69,7 +69,7 @@ class DefinitionsTest < Minitest::Spec
 
     schema.add :id, unique: false, inherit: true
 
-    _(schema.inspect).must_equal '{"artist"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>, "band"=>#<Declarative::Definitions::Definition: @options={:crazy=>nil, :nested=>{"location"=>#<Declarative::Definitions::Definition: @options={:name=>"location"}>, "genre"=>#<Declarative::Definitions::Definition: @options={:name=>"genre"}>}, :name=>"band", :normal=>false}>}, :name=>"artist", :uncool=>false}>, "id"=>#<Declarative::Definitions::Definition: @options={:unique=>false, :value=>1, :name=>"id"}>}'
+    assert_equal CU.inspect(schema.inspect), '{"artist"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :nested=>{"name"=>#<Declarative::Definitions::Definition: @options={:name=>"name"}>, "band"=>#<Declarative::Definitions::Definition: @options={:crazy=>nil, :nested=>{"location"=>#<Declarative::Definitions::Definition: @options={:name=>"location"}>, "genre"=>#<Declarative::Definitions::Definition: @options={:name=>"genre"}>}, :name=>"band", :normal=>false}>}, :name=>"artist", :uncool=>false}>, "id"=>#<Declarative::Definitions::Definition: @options={:unique=>false, :value=>1, :name=>"id"}>}'
   end
 
   it "#add with nested options followed by inherit: true" do
@@ -92,4 +92,4 @@ class DefinitionTest < Minitest::Spec
     definition.merge!(render: true)
     _(merged).must_equal(:name=>"name", render: false)
   end
-end
+end

test/heritage_test.rb

@@ -20,7 +20,7 @@ module RepresenterA
     else
       exp = "[{:method=>:representation_wrap=, :args=>[true], :block=>nil}, {:method=>:property, :args=>[:name, {:enable=>true}], :block=>nil}, {:method=>:property, :args=>[:id, {}], :block=>#<Proc:@heritage_test.rb:4>}]"
     end
-    assert_equal exp, RepresenterA.heritage.inspect
+    assert_equal exp, CU.inspect(RepresenterA.heritage.inspect)
   end
 
 
@@ -42,7 +42,7 @@ module B
       else
         exp = "[{:method=>:property, :args=>[:name, {:render=>true, :nested=>{:render=>false}}], :block=>#<Proc:@heritage_test.rb:4>}]"
       end
-      assert_equal exp, B.heritage.inspect
+      assert_equal exp, CU.inspect(B.heritage.inspect)
     }
   end
 

test/schema_test.rb

@@ -36,7 +36,8 @@ class Concrete < Decorator
   it do
     Concrete.extend(Declarative::Inspect::Schema)
     Concrete.inspect
-    _(Concrete.inspect.gsub(/\s/, "")).must_equal 'Schema:{
+
+    assert_equal CU.inspect(Concrete.inspect).gsub(/\s/, ""), 'Schema:{
     "links"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"LINKS",:name=>"links"}>,
     "artist"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"ARTIST",:cool=>true,:nested=>Schema:{
       "links"=>#<Declarative::Definitions::Definition:@options={:name=>"links"}>,
@@ -56,7 +57,7 @@ class InheritingConcrete < Concrete
   it do
     InheritingConcrete.extend(Declarative::Inspect::Schema)
     InheritingConcrete.inspect
-    _(InheritingConcrete.inspect.gsub(/\s/, "")).must_equal 'Schema:{
+    assert_equal CU.inspect(InheritingConcrete.inspect).gsub(/\s/, ""), 'Schema:{
     "links"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"LINKS",:name=>"links"}>,
     "artist"=>#<Declarative::Definitions::Definition:@options={:render_nil=>true,:as=>"ARTIST",:cool=>true,:nested=>Schema:{
       "links"=>#<Declarative::Definitions::Definition:@options={:name=>"links"}>,
@@ -81,7 +82,7 @@ class ConcreteWithOptions < Decorator
     end
 
     it do
-      _(ConcreteWithOptions.extend(Declarative::Inspect::Schema).inspect).must_equal 'Schema: {"artist"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :nested=>#<OpenStruct cool=true>, :name=>"artist"}>}'
+      assert_equal CU.inspect(ConcreteWithOptions.extend(Declarative::Inspect::Schema).inspect), 'Schema: {"artist"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :nested=>#<OpenStruct cool=true>, :name=>"artist"}>}'
     end
   end
 
@@ -105,7 +106,7 @@ module D; end
     end
 
     it do
-      _(Twin.extend(Declarative::Inspect::Schema).inspect).must_equal 'Schema: {"id"=>#<Declarative::Definitions::Definition: @options={:a=>"a", :b=>"b", :first=>1, :nested=>Schema: {}, :name=>"id"}>}'
+      assert_equal CU.inspect(Twin.extend(Declarative::Inspect::Schema).inspect), 'Schema: {"id"=>#<Declarative::Definitions::Definition: @options={:a=>"a", :b=>"b", :first=>1, :nested=>Schema: {}, :name=>"id"}>}'
       # :_features get merged.
       Twin.definitions.get(:id)[:nested].is_a? Twin::A
       Twin.definitions.get(:id)[:nested].is_a? Twin::B

test/test_helper.rb

@@ -1,4 +1,13 @@
 require "minitest/autorun"
 require "declarative"
 require "declarative/testing"
-require "ostruct"
+require "ostruct"
+require "trailblazer/core"
+
+CU = Trailblazer::Core::Utils
+
+Minitest::Spec.class_eval do
+  def assert_equal(asserted, expected)
+    super(expected, asserted)
+  end
+end

test/variables_test.rb

@@ -6,7 +6,7 @@ class DSLOptionsTest < Minitest::Spec
   Variables = Declarative::Variables
 
   after do
-    _(Declarative::Inspect(defaults)).must_equal %{{:id=>1, :connections=>{:first=>1, :second=>2}, :list=>[3]}}
+    assert_equal CU.inspect(Declarative::Inspect(defaults)), %{{:id=>1, :connections=>{:first=>1, :second=>2}, :list=>[3]}}
   end
 
   #- Merge