* fix version in GH-1983 test

* fix not more loadService debug * fix list of activated gems
jruby · Oct 3, 2014 · a0f96db · a0f96db
1 parent b1df10c
commit a0f96db
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/irb.sh b/maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/irb.sh
@@ -1,5 +1,5 @@
 JAVA=`which java`
 # jirb_swing does not work in those test environments
 for i in irb jirb ; do
-    echo "puts 'hello $i'" | PATH= $JAVA -jar jruby-complete-1.7.16-SNAPSHOT.jar -S $i
+    echo "puts 'hello $i'" | PATH= $JAVA -jar jruby-complete-${1}.jar -S $i
 done
diff --git a/maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/pom.xml b/maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/pom.xml
@@ -8,15 +8,15 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
-      <version>1.7.16-SNAPSHOT</version>
+      <version>@project.version@</version>
       <type>jar</type>
     </dependency>
   </dependencies>
 
   <build>
     <resources>
       <resource>  
-	<directory>../../local-repo/org/jruby/jruby-complete/1.7.16-SNAPSHOT</directory>
+	<directory>../../local-repo/org/jruby/jruby-complete/@project.version@</directory>
         <includes>
           <include>jruby-complete-*.jar</include>
         </includes>
@@ -36,6 +36,7 @@
               <executable>sh</executable>
 	      <arguments>
 		<argument>irb.sh</argument>
+		<argument>@project.version@</argument>
 	      </arguments>
 	    </configuration>
 	  </execution>

diff --git a/...ng_classpath_uri/osgi_app/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java b/...ng_classpath_uri/osgi_app/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
@@ -69,7 +69,7 @@ public Option[] config() {
 
     @Test
     public void testSomething() throws Exception {
-	System.setProperty( "jruby.debug.loadService", "true");
+	//System.setProperty( "jruby.debug.loadService", "true");
         IsolatedScriptingContainer container = new IsolatedScriptingContainer();
 	container.addLoadPath( org.jruby.osgi.bundle.Bundle.class.getClassLoader() );
 

diff --git a/...s_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java b/...s_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
@@ -109,13 +109,13 @@ public void testJRubyCreate() throws Exception {
         assertEquals( gemPath, "[\"uri:bundle://specifications\", \"uri:bundle://specifications\", \"uri:bundle://META-INF/jruby.home/lib/ruby/gems/shared/specifications\"]" );
 
 	list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
-        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"krypt\", \"krypt-core\", \"krypt-provider-jdk\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");
 
         // ensure we can load can load embedded gems
         loaded = (Boolean) jruby.runScriptlet( "require 'virtus'" );
         assertEquals(true, loaded);
 
 	list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
-        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"krypt\", \"krypt-core\", \"krypt-provider-jdk\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
     }
 }