Get the tests running under jruby, even though they don't all pass yet

lstanden · Aug 3, 2012 · f0b6709 · f0b6709
1 parent d08b6f9
commit f0b6709
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/queues
+queues
+activemq-data
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
-gem 'reliable-msg', '~>1.1' if RUBY_VERSION < '1.9'
+gem 'reliable-msg', '~>1.1', :platform => :ruby if RUBY_VERSION < '1.9'
+gem 'jruby-activemq', :platform => :jruby
 gem 'appraisal'
 
 gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,21 +10,27 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (2.3.14)
+    activesupport (3.2.7)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     appraisal (0.4.1)
       bundler
       rake
     celluloid (0.11.1)
       timers (>= 1.0.0)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
+    jruby-activemq (5.5.1-java)
     json (1.7.4)
+    json (1.7.4-java)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
+    multi_json (1.3.6)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -37,12 +43,14 @@ GEM
       macaddr (~> 1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activemessaging!
   activesupport
   appraisal
   jeweler
+  jruby-activemq
   reliable-msg (~> 1.1)
   stomp
diff --git a/gemfiles/activesupport23.gemfile b/gemfiles/activesupport23.gemfile
@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "reliable-msg", "~>1.1"
+gem "reliable-msg", "~>1.1", :platform=>:ruby
+gem "jruby-activemq", :platform=>:jruby
 gem "appraisal"
 gem "activesupport", "~> 2.3.11"
 

diff --git a/gemfiles/activesupport23.gemfile.lock b/gemfiles/activesupport23.gemfile.lock
@@ -22,7 +22,9 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
+    jruby-activemq (5.5.1-java)
     json (1.7.4)
+    json (1.7.4-java)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
     rake (0.9.2.2)
@@ -37,12 +39,14 @@ GEM
       macaddr (~> 1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activemessaging!
   activesupport (~> 2.3.11)
   appraisal
   jeweler
+  jruby-activemq
   reliable-msg (~> 1.1)
   stomp
diff --git a/gemfiles/activesupport30.gemfile b/gemfiles/activesupport30.gemfile
@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "reliable-msg", "~>1.1"
+gem "reliable-msg", "~>1.1", :platform=>:ruby
+gem "jruby-activemq", :platform=>:jruby
 gem "appraisal"
 gem "activesupport", "~> 3.0.8"
 gem "i18n"

diff --git a/gemfiles/activesupport30.gemfile.lock b/gemfiles/activesupport30.gemfile.lock
@@ -23,7 +23,9 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
+    jruby-activemq (5.5.1-java)
     json (1.7.4)
+    json (1.7.4-java)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
     rake (0.9.2.2)
@@ -38,6 +40,7 @@ GEM
       macaddr (~> 1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -46,5 +49,6 @@ DEPENDENCIES
   appraisal
   i18n
   jeweler
+  jruby-activemq
   reliable-msg (~> 1.1)
   stomp
diff --git a/gemfiles/activesupport31.gemfile b/gemfiles/activesupport31.gemfile
@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "reliable-msg", "~>1.1"
+gem "reliable-msg", "~>1.1", :platform=>:ruby
+gem "jruby-activemq", :platform=>:jruby
 gem "appraisal"
 gem "activesupport", "~> 3.1.2"
 gem "i18n"

diff --git a/gemfiles/activesupport31.gemfile.lock b/gemfiles/activesupport31.gemfile.lock
@@ -24,7 +24,9 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
+    jruby-activemq (5.5.1-java)
     json (1.7.4)
+    json (1.7.4-java)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
     multi_json (1.2.0)
@@ -40,6 +42,7 @@ GEM
       macaddr (~> 1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -48,5 +51,6 @@ DEPENDENCIES
   appraisal
   i18n
   jeweler
+  jruby-activemq
   reliable-msg (~> 1.1)
   stomp
diff --git a/gemfiles/activesupport32.gemfile b/gemfiles/activesupport32.gemfile
@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "reliable-msg", "~>1.1"
+gem "reliable-msg", "~>1.1", :platform=>:ruby
+gem "jruby-activemq", :platform=>:jruby
 gem "appraisal"
 gem "activesupport", "~> 3.2.2"
 

diff --git a/gemfiles/activesupport32.gemfile.lock b/gemfiles/activesupport32.gemfile.lock
@@ -25,7 +25,9 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
+    jruby-activemq (5.5.1-java)
     json (1.7.4)
+    json (1.7.4-java)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
     multi_json (1.3.6)
@@ -41,12 +43,14 @@ GEM
       macaddr (~> 1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activemessaging!
   activesupport (~> 3.2.2)
   appraisal
   jeweler
+  jruby-activemq
   reliable-msg (~> 1.1)
   stomp
diff --git a/lib/activemessaging/adapters/jms.rb b/lib/activemessaging/adapters/jms.rb
@@ -1,6 +1,7 @@
 if defined?(JRUBY_VERSION)
 #require 'java'
 include Java
+require 'activemq'
 
 begin
   java_import javax.naming.InitialContext
@@ -239,4 +240,4 @@ def find_destination queue_name, type
   end
 end
 
-end
+end
diff --git a/test/jms_test.rb b/test/jms_test.rb
@@ -9,9 +9,9 @@ class JmsTest < Test::Unit::TestCase
   def setup
     @test_txt = 'Yo Homie!'
     @isolation_const = rand(99999999)
-    @connection = ActiveMessaging::Adapters::Jms::Connection.new(:url => 'tcp://localhost:61616',
-      :login => '', 
-      :passcode => '', 
+    @connection = ActiveMessaging::Adapters::Jms::Connection.new(:url => 'vm://jms_test',
+      :login => '',
+      :passcode => '',
       :connection_factory => 'org.apache.activemq.ActiveMQConnectionFactory')
   end
 
@@ -42,6 +42,7 @@ def test_receive_multi
 
   def test_one_off_receive
     @connection.send "/queue/OneOff#{@isolation_const}", "one off message"
+    sleep 2
     message = @connection.receive "/queue/OneOff#{@isolation_const}"
     assert_equal "one off message", message.body
     assert_equal "MESSAGE", message.command