Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: caee6c4b3922
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 758a1cb3e290
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 11, 2016

  1. Copy the full SHA
    cc956f6 View commit details
  2. Copy the full SHA
    758a1cb View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −1 core/src/test/java/org/jruby/test/TestRubyArray.java
  2. +2 −1 test/jruby/test_java_extension.rb
2 changes: 1 addition & 1 deletion core/src/test/java/org/jruby/test/TestRubyArray.java
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ public void testToArray() throws Exception {
}

public void testSetsValuesToNullOnClearWhenNotShared() throws Exception {
final RubyArray arr = (RubyArray)runtime.evalScriptlet("$h = ['foo','bar']");
final RubyArray arr = (RubyArray)runtime.evalScriptlet("$h = []; $h << 'foo'; $h << 'bar'");
assertNotSame("first element nil", runtime.getNil(), arr.eltInternal(0));
assertNotSame("second element nil", runtime.getNil(), arr.eltInternal(1));
arr.rb_clear();
3 changes: 2 additions & 1 deletion test/jruby/test_java_extension.rb
Original file line number Diff line number Diff line change
@@ -57,7 +57,8 @@ def test_comparable_error
[ java.lang.Short.new(1), java.lang.Integer.new(0) ].sort!
rescue => e
assert_instance_of TypeError, e
assert_equal 'java.lang.Short cannot be cast to java.lang.Integer', e.message
assert 'java.lang.Short cannot be cast to java.lang.Integer' == e.message ||
'java.lang.Integer cannot be cast to java.lang.Short' == e.message
end
end