[tests] simplify custom cross-runtime expectation matchers

Author: chadlwilson

src/spec/ruby/jruby/rack/booter_spec.rb

@@ -294,17 +294,17 @@
         @runtime.evalScriptlet("load 'jruby/rack/boot/rack.rb'")
 
         # booter got setup :
-        should_not_eval_as_nil "defined?(JRuby::Rack.booter)"
-        should_not_eval_as_nil "JRuby::Rack.booter"
+        should_eval_as_not_nil "defined?(JRuby::Rack.booter)"
+        should_eval_as_not_nil "JRuby::Rack.booter"
         should_eval_as_eql_to "JRuby::Rack.booter.class.name", 'JRuby::Rack::Booter'
 
         # Booter.boot! run :
-        should_not_eval_as_nil "ENV['RACK_ENV']"
+        should_eval_as_not_nil "ENV['RACK_ENV']"
         # rack got required :
-        should_not_eval_as_nil "defined?(Rack::RELEASE)"
-        should_not_eval_as_nil "defined?(Rack.release)"
+        should_eval_as_not_nil "defined?(Rack::RELEASE)"
+        should_eval_as_not_nil "defined?(Rack.release)"
         # check if it got loaded correctly :
-        should_not_eval_as_nil "Rack::Request.new({}) rescue nil"
+        should_eval_as_not_nil "Rack::Request.new({}) rescue nil"
       end
 
     end
@@ -341,13 +341,13 @@
         @runtime.evalScriptlet("load 'jruby/rack/boot/rails.rb'")
 
         # booter got setup :
-        should_not_eval_as_nil "defined?(JRuby::Rack.booter)"
-        should_not_eval_as_nil "JRuby::Rack.booter"
+        should_eval_as_not_nil "defined?(JRuby::Rack.booter)"
+        should_eval_as_not_nil "JRuby::Rack.booter"
         should_eval_as_eql_to "JRuby::Rack.booter.class.name", 'JRuby::Rack::RailsBooter'
 
         # Booter.boot! run :
-        should_not_eval_as_nil "ENV['RACK_ENV']"
-        should_not_eval_as_nil "ENV['RAILS_ENV']"
+        should_eval_as_not_nil "ENV['RACK_ENV']"
+        should_eval_as_not_nil "ENV['RAILS_ENV']"
 
         # rack not yet required (let bundler decide which rack version to load) :
         should_eval_as_nil "defined?(Rack::RELEASE)"

src/spec/ruby/rack/application_spec.rb

@@ -300,8 +300,8 @@ def newRuntime()
 
       it "creates a new Ruby runtime with the jruby-rack environment pre-loaded" do
         @runtime = app_factory.newRuntime
-        should_not_eval_as_nil "defined?(::Rack)"
-        should_not_eval_as_nil "defined?(::Rack::Handler::Servlet)"
+        should_eval_as_not_nil "defined?(::Rack)"
+        should_eval_as_not_nil "defined?(::Rack::Handler::Servlet)"
         should_eval_as_nil "defined?(Rack::Handler::Bogus)"
       end
 
@@ -330,14 +330,14 @@ def newRuntime()
         app_factory.checkAndSetRackVersion(@runtime)
         @runtime.evalScriptlet "require 'rack'"
 
-        should_not_eval_as_nil "defined?(Bundler)"
+        should_eval_as_not_nil "defined?(Bundler)"
         should_eval_as_eql_to "Rack.release", '2.2.0'
         should_eval_as_eql_to "Gem.loaded_specs['rack'].version.to_s", '2.2.0'
       end
 
       it "initializes the $servlet_context global variable" do
         @runtime = app_factory.new_runtime
-        expect(@runtime.evalScriptlet("defined?($servlet_context)")).to be_truthy
+        should_eval_as_not_nil "defined?($servlet_context)"
       end
 
       it "clears environment variables if the configuration ignores the environment" do

src/spec/ruby/spec_helper.rb

@@ -86,42 +86,25 @@ def expect_eql_java_bytes(actual, expected)
 
   # org.jruby.Ruby.evalScriptlet helpers - comparing values from different runtimes
 
-  def should_eval_as_eql_to(code, expected, options = {})
-    if options.is_a?(Hash)
-      runtime = options[:runtime] || @runtime
-    else
-      runtime, options = options, {}
-    end
-    message = options[:message] || "expected eval #{code.inspect} to be == $expected but was $actual"
-    be_flag = options.has_key?(:should) ? options[:should] : be_truthy
-
-    expected = expected.inspect.to_java
-    actual = runtime.evalScriptlet(code).inspect.to_java
-    expect(actual.equals(expected)).to be_flag, message.gsub('$expected', expected.to_s).gsub('$actual', actual.to_s)
+  def should_eval_as_eql_to(code, expected)
+    actual = @runtime.evalScriptlet(code)
+    expect(actual.inspect).to eq(expected.inspect), "expected eval #{code.inspect} to be == #{expected.to_s} but was #{actual.to_s}"
   end
 
-  def should_eval_as_not_eql_to(code, expected, options = {})
-    should_eval_as_eql_to(code, expected, options.merge(
-      :should => be_falsy,
-      :message => options[:message] || "expected eval #{code.inspect} to be != $expected but was not")
-    )
+  def should_eval_as_not_eql_to(code, expected)
+    actual = @runtime.evalScriptlet(code)
+    expect(actual.inspect).not_to eq(expected.inspect), "expected eval #{code.inspect} NOT to be == #{expected.to_s}"
   end
 
-  def should_eval_as_nil(code, runtime = @runtime)
-    should_eval_as_eql_to code, nil, :runtime => runtime,
-                          :message => "expected eval #{code.inspect} to be nil but was $actual"
+  def should_eval_as_nil(code)
+    actual = @runtime.evalScriptlet(code)
+    expect(actual).to be_nil, "expected eval #{code.inspect} to be nil but was #{actual.to_s}"
   end
 
-  def should_eval_as_not_nil(code, runtime = @runtime)
-    should_eval_as_eql_to code, nil, :should => be_falsy, :runtime => runtime,
-                          :message => "expected eval #{code.inspect} to not be nil but was"
+  def should_eval_as_not_nil(code)
+    actual = @runtime.evalScriptlet(code)
+    expect(actual).to_not be_nil, "expected eval #{code.inspect} to not be nil"
   end
-
-  def should_not_eval_as_nil(code, runtime = @runtime)
-    # alias
-    should_eval_as_not_nil(code, runtime)
-  end
-
 end
 
 # NOTE: avoid chunked-patch (loaded by default from a hook at