From: Antonio Terceiro <asa@terceiro.xyz>
Date: Wed, 25 Mar 2020 09:40:47 -0300
Subject: [PATCH] Fix warnings against minitest 6

DEPRECATED:
    global use of must_equal from /src/test/*_test.rb:N.
    Use _(obj).must_equal instead. This will fail in Minitest 6.

Origin: https://github.com/apotonick/declarative/commit/600deab5fe8229e059f4d2f6626450a3d191f321.patch
---
 test/defaults_test.rb    | 16 ++++++++--------
 test/definitions_test.rb | 20 ++++++++++----------
 test/heritage_test.rb    |  6 +++---
 test/schema_test.rb      |  8 ++++----
 test/variables_test.rb   | 14 +++++++-------
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/test/defaults_test.rb b/test/defaults_test.rb
index 5a6f28d..bf43fbf 100644
--- a/test/defaults_test.rb
+++ b/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"}>}'
+      _(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"}>}'
     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"}>}'
+      _(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"}>}'
     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"}>}'
+      _(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"}>}'
     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"}>}'
+      _(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"}>}'
     end
   end
 
@@ -65,7 +65,7 @@ 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\"]}"
+      _(defaults.(nil, {}).inspect).must_equal "{:a=>1, :b=>3, :_features=>[\"A\", \"B\", \"C\"]}"
     end
 
     it "what" do
@@ -73,7 +73,7 @@ class DefaultsOptionsTest < Minitest::Spec
         { _features: Declarative::Variables::Append( ["B", "D"] ) }
       end
 
-      defaults.(nil, {}).inspect.must_equal "{:_features=>[\"A\", \"B\", \"D\"]}"
+      _(defaults.(nil, {}).inspect).must_equal "{:_features=>[\"A\", \"B\", \"D\"]}"
     end
   end
 
@@ -91,9 +91,9 @@ class DefaultsOptionsTest < Minitest::Spec
         { _features: ["B", "D"] }
       end
 
-      defaults.(nil, {}).inspect.must_equal "{:_features=>[\"A\", \"B\", \"D\"]}"
+      _(defaults.(nil, {}).inspect).must_equal "{:_features=>[\"A\", \"B\", \"D\"]}"
 
-      $stderr.string.must_match %{[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).must_match %{[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
     end
   end
 end
diff --git a/test/definitions_test.rb b/test/definitions_test.rb
index 2e89c0f..c2516ee 100644
--- a/test/definitions_test.rb
+++ b/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"}>'
+    _(schema.get(:id).inspect).must_equal '#<Declarative::Definitions::Definition: @options={:name=>"id"}>'
     # get works with string
-    schema.get("id").inspect.must_equal '#<Declarative::Definitions::Definition: @options={:name=>"id"}>'
+    _(schema.get("id").inspect).must_equal '#<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"}>'
+    _(schema.get(:id).inspect).must_equal '#<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"}>}'
+    _(schema.inspect).must_equal '{"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"}>}'
+    _(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"}>}'
   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"}>}'
+    _(schema.inspect).must_equal '{"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"}>}'
+    _(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"}>}'
   end
 
   it "#add with nested options followed by inherit: true" do
@@ -78,7 +78,7 @@ class DefinitionsTest < Minitest::Spec
 
     schema.get(:id)[:deserializer][:parse] = true
 
-    options.must_equal(render: false)
+    _(options).must_equal(render: false)
   end
 end
 
@@ -90,6 +90,6 @@ class DefinitionTest < Minitest::Spec
     options = { render: false }
     merged = definition.merge(options)
     definition.merge!(render: true)
-    merged.must_equal(:name=>"name", render: false)
+    _(merged).must_equal(:name=>"name", render: false)
   end
-end
\ No newline at end of file
+end
diff --git a/test/heritage_test.rb b/test/heritage_test.rb
index 42478a6..b2b323c 100644
--- a/test/heritage_test.rb
+++ b/test/heritage_test.rb
@@ -14,7 +14,7 @@ class HeritageTest < Minitest::Spec
     heritage.record(:property, :id, {}, &P)
   end
 
-  it { RepresenterA.heritage.inspect.must_equal "[{: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>}]" }
+  it { _(RepresenterA.heritage.inspect).must_equal "[{: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>}]" }
 
 
   describe "dup of arguments" do
@@ -29,7 +29,7 @@ class HeritageTest < Minitest::Spec
       options[:nested][:parse] = false
     end
 
-    it { B.heritage.inspect.must_equal "[{:method=>:property, :args=>[:name, {:render=>true, :nested=>{:render=>false}}], :block=>#<Proc:@heritage_test.rb:4>}]" }
+    it { _(B.heritage.inspect).must_equal "[{:method=>:property, :args=>[:name, {:render=>true, :nested=>{:render=>false}}], :block=>#<Proc:@heritage_test.rb:4>}]" }
   end
 
   describe "#call with block" do
@@ -43,7 +43,7 @@ class HeritageTest < Minitest::Spec
 
     it do
       heritage.(CallWithBlock) { |cfg| cfg[:args].last.merge!(_inherited: true) }
-      CallWithBlock.instance_variable_get(:@args).must_equal [:id, {:_inherited=>true}]
+      _(CallWithBlock.instance_variable_get(:@args)).must_equal [:id, {:_inherited=>true}]
     end
   end
 end
diff --git a/test/schema_test.rb b/test/schema_test.rb
index 8a58a44..624e619 100644
--- a/test/schema_test.rb
+++ b/test/schema_test.rb
@@ -36,7 +36,7 @@ class SchemaTest < Minitest::Spec
   it do
     Concrete.extend(Declarative::Inspect::Schema)
     Concrete.inspect
-    Concrete.inspect.gsub(/\s/, "").must_equal 'Schema:{
+    _(Concrete.inspect.gsub(/\s/, "")).must_equal '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 +56,7 @@ class SchemaTest < Minitest::Spec
   it do
     InheritingConcrete.extend(Declarative::Inspect::Schema)
     InheritingConcrete.inspect
-    InheritingConcrete.inspect.gsub(/\s/, "").must_equal 'Schema:{
+    _(InheritingConcrete.inspect.gsub(/\s/, "")).must_equal '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 +81,7 @@ class SchemaTest < Minitest::Spec
     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"}>}'
+      _(ConcreteWithOptions.extend(Declarative::Inspect::Schema).inspect).must_equal 'Schema: {"artist"=>#<Declarative::Definitions::Definition: @options={:cool=>true, :nested=>#<OpenStruct cool=true>, :name=>"artist"}>}'
     end
   end
 
@@ -105,7 +105,7 @@ class SchemaTest < Minitest::Spec
     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"}>}'
+      _(Twin.extend(Declarative::Inspect::Schema).inspect).must_equal '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
diff --git a/test/variables_test.rb b/test/variables_test.rb
index 639abe6..cde403f 100644
--- a/test/variables_test.rb
+++ b/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]}}
+    _(Declarative::Inspect(defaults)).must_equal %{{:id=>1, :connections=>{:first=>1, :second=>2}, :list=>[3]}}
   end
 
   #- Merge
@@ -16,7 +16,7 @@ class DSLOptionsTest < Minitest::Spec
       connections: Variables::Merge( second: 3, third: 4 )
     )
 
-    options.must_equal( { id: 1, connections: { first: 1, second: 3, third: 4 }, :list=>[3] } )
+    _(options).must_equal( { id: 1, connections: { first: 1, second: 3, third: 4 }, :list=>[3] } )
   end
 
   it "accepts Procs" do
@@ -25,14 +25,14 @@ class DSLOptionsTest < Minitest::Spec
       connections: proc = ->(*) { raise }
     )
 
-    options.must_equal( { id: 1, connections: proc, :list=>[3] } )
+    _(options).must_equal( { id: 1, connections: proc, :list=>[3] } )
   end
 
   it "overrides original without Merge" do
     options = Variables.merge(
     defaults, connections: { second: 3, third: 4 } )
 
-    options.must_equal( { id: 1, connections: { second: 3, third: 4 }, :list=>[3] } )
+    _(options).must_equal( { id: 1, connections: { second: 3, third: 4 }, :list=>[3] } )
   end
 
   it "creates new hash if original not existent" do
@@ -41,7 +41,7 @@ class DSLOptionsTest < Minitest::Spec
       bla: Variables::Merge( second: 3, third: 4 )
     )
 
-    options.must_equal( {:id=>1, :connections=>{:first=>1, :second=>2}, :list=>[3], :bla=>{:second=>3, :third=>4}} )
+    _(options).must_equal( {:id=>1, :connections=>{:first=>1, :second=>2}, :list=>[3], :bla=>{:second=>3, :third=>4}} )
   end
 
   #- Append
@@ -51,7 +51,7 @@ class DSLOptionsTest < Minitest::Spec
       list: Variables::Append( [3, 4, 5] )
     )
 
-    options.must_equal( { id: 1, connections: { first: 1, second: 2 }, :list=>[3, 3, 4, 5] } )
+    _(options).must_equal( { id: 1, connections: { first: 1, second: 2 }, :list=>[3, 3, 4, 5] } )
   end
 
   it "creates new array if original not existent" do
@@ -60,6 +60,6 @@ class DSLOptionsTest < Minitest::Spec
       another_list: Variables::Append( [3, 4, 5] )
     )
 
-    options.must_equal( { id: 1, connections: { first: 1, second: 2 }, :list=>[3], :another_list=>[3, 4, 5] } )
+    _(options).must_equal( { id: 1, connections: { first: 1, second: 2 }, :list=>[3], :another_list=>[3, 4, 5] } )
   end
 end