rtyler
/
jruby
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'jruby-1_7' 

* jruby-1_7:
  missed parenthesis in assert around [ array.join(', ') ]
  deal with jruby-openssl pre-release not being reported by `Gem.loaded_specs`
  swap assert argument order - so that first is always the expectation (less confusing)
  more 1-by-1 checks for jar-dependencies & jruby-openssl in build.log
  check jar-dependencies & jruby-openssl in log 1-by-1
  do not assume gem order in (osgi) embed test
This commit is contained in:
kares 2015-07-31 09:21:52 +02:00
parent e65ff513e2 b05091c126
commit 707df9f0dd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
View File

@ -92,7 +92,7 @@ public class JRubyOsgiEmbedTest {
String gemPath = (String) jruby.runScriptlet( "Gem::Specification.dirs.inspect" );
gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
assertEquals( gemPath, "[\"uri:bundle://specifications\"]" );
assertEquals( "[\"uri:bundle://specifications\"]", gemPath );
// ensure we can load rake from the default gems
boolean loaded = (Boolean) jruby.runScriptlet( "require 'rake'" );

2
maven/jruby/src/templates/osgi_all_inclusive/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
View File

@ -93,7 +93,7 @@ public class JRubyOsgiEmbedTest {
gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
// TODO fix the URLResource to produce uri:classloader:// urls only
assertEquals( gemPath, "[\"uri:classloader:/specifications\", \"uri:classloader://specifications\"]" );
assertEquals( "[\"uri:classloader:/specifications\", \"uri:classloader://specifications\"]", gemPath );
jruby.runScriptlet( "require 'jar-dependencies'" );