jruby-jms 1.1.0-java → 1.2.0-java

data/test/session_pool_test.rb

@@ -1,65 +1,49 @@
-# Allow examples to be run in-place without requiring a gem install
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require_relative 'test_helper'
+require 'timeout'
 
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'jms'
-require 'yaml'
-
-class JMSTest < Test::Unit::TestCase
-  context 'JMS Session' do
-    # Load configuration from jms.yml
-    setup do
-      # To change the JMS provider, edit jms.yml and change :default
-
-      # Load Connection parameters from configuration file
-      cfg = YAML.load_file(File.join(File.dirname(__FILE__), 'jms.yml'))
-      jms_provider = cfg['default']
-      @config = cfg[jms_provider]
-      raise "JMS Provider option:#{jms_provider} not found in jms.yml file" unless @config
-      @queue_name = @config.delete(:queue_name) || raise("Mandatory :queue_name missing from jms.yml")
-      @topic_name = @config.delete(:topic_name) || raise("Mandatory :topic_name missing from jms.yml")
-      @pool_params = {
-        :pool_name         => 'Test::JMS::SessionPool',
-        :pool_size         => 10,
-        :pool_warn_timeout => 5.0,
-        #:pool_logger       =>
+class SessionPoolTest < Minitest::Test
+  describe JMS::SessionPool do
+    before do
+      @config, @queue_name, @topic_name = read_config
+      @pool_params                      = {
+        pool_size:         10,
+        pool_warn_timeout: 5.0
       }
     end
 
-    should 'create a session pool' do
+    it 'create a session pool' do
       JMS::Connection.start(@config) do |connection|
         pool = connection.create_session_pool(@pool_params)
         pool.session do |session|
-          assert_not_nil session
+          assert session
           assert session.is_a?(javax.jms.Session)
         end
         pool.close
       end
     end
 
-    should 'remove bad session from pool' do
+    it 'remove bad session from pool' do
       JMS::Connection.start(@config) do |connection|
-        pool = connection.create_session_pool(@pool_params.merge(:pool_size=>1))
-        s = nil
-        r = begin
-          pool.session do |session|
-            assert_not_nil session
-            assert session.is_a?(javax.jms.Session)
-            s = session
-            s.close
-            s.create_map_message
-            false
+        pool = connection.create_session_pool(@pool_params.merge(pool_size: 1))
+        s    = nil
+        r    =
+          begin
+            pool.session do |session|
+              assert session
+              assert session.is_a?(javax.jms.Session)
+              s = session
+              s.close
+              s.create_map_message
+              false
+            end
+          rescue javax.jms.IllegalStateException
+            true
           end
-        rescue javax.jms.IllegalStateException
-          true
-        end
         assert r == true
 
         # Now verify that the previous closed session was removed from the pool
         pool.session do |session|
-          assert_not_nil session
+          assert session
           assert session.is_a?(javax.jms.Session)
           assert s != session
           session.create_map_message
@@ -67,14 +51,14 @@ class JMSTest < Test::Unit::TestCase
       end
     end
 
-    should 'allow multiple sessions to be used concurrently' do
+    it 'allow multiple sessions to be used concurrently' do
       JMS::Connection.start(@config) do |connection|
         pool = connection.create_session_pool(@pool_params)
         pool.session do |session|
-          assert_not_nil session
+          assert session
           assert session.is_a?(javax.jms.Session)
           pool.session do |session2|
-            assert_not_nil session2
+            assert session2
             assert session2.is_a?(javax.jms.Session)
             assert session != session2
           end

data/test/session_test.rb

@@ -1,47 +1,32 @@
-# Allow examples to be run in-place without requiring a gem install
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'jms'
+require_relative 'test_helper'
 require 'yaml'
 
-class JMSTest < Test::Unit::TestCase
-  context 'JMS Session' do
-    # Load configuration from jms.yml
-    setup do
-      # To change the JMS provider, edit jms.yml and change :default
-
-      # Load Connection parameters from configuration file
-      cfg = YAML.load_file(File.join(File.dirname(__FILE__), 'jms.yml'))
-      jms_provider = cfg['default']
-      @config = cfg[jms_provider]
-      raise "JMS Provider option:#{jms_provider} not found in jms.yml file" unless @config
-      @queue_name = @config.delete(:queue_name) || raise("Mandatory :queue_name missing from jms.yml")
-      @topic_name = @config.delete(:topic_name) || raise("Mandatory :topic_name missing from jms.yml")
+class SessionTest < Minitest::Test
+  describe 'JMS::Session' do
+    before do
+      @config, @queue_name, @topic_name = read_config
     end
 
-    should 'create a session' do
+    it 'create a session' do
       JMS::Connection.session(@config) do |session|
-        assert_not_nil session
+        assert session
       end
     end
 
-    should 'create automatic messages' do
+    it 'create automatic messages' do
       JMS::Connection.session(@config) do |session|
-        assert_not_nil session
+        assert session
         # Create Text Message
         assert_equal session.message("Hello").java_kind_of?(JMS::TextMessage), true
 
         # Create Map Message
-        assert_equal session.message('hello'=>'world').java_kind_of?(JMS::MapMessage), true
+        assert_equal session.message('hello' => 'world').java_kind_of?(JMS::MapMessage), true
       end
     end
 
-    should 'create explicit messages' do
+    it 'create explicit messages' do
       JMS::Connection.session(@config) do |session|
-        assert_not_nil session
+        assert session
         # Create Text Message
         assert_equal session.create_text_message("Hello").java_kind_of?(JMS::TextMessage), true
 
@@ -50,71 +35,71 @@ class JMSTest < Test::Unit::TestCase
       end
     end
 
-    should 'create temporary destinations in blocks' do
+    it 'create temporary destinations in blocks' do
       JMS::Connection.session(@config) do |session|
-        assert_not_nil session
+        assert session
 
         # Temporary Queue
-        session.destination(:queue_name => :temporary) do |destination|
+        session.destination(queue_name: :temporary) do |destination|
           assert_equal destination.java_kind_of?(JMS::TemporaryQueue), true
         end
 
         # Temporary Topic
-        session.create_destination(:topic_name => :temporary) do |destination|
+        session.create_destination(topic_name: :temporary) do |destination|
           assert_equal destination.java_kind_of?(JMS::TemporaryTopic), true
         end
       end
     end
 
-    should 'create temporary destinations' do
+    it 'create temporary destinations' do
       JMS::Connection.session(@config) do |session|
-        assert_not_nil session
+        assert session
 
         # Temporary Queue
-        destination = session.create_destination(:queue_name => :temporary)
+        destination = session.create_destination(queue_name: :temporary)
         assert_equal destination.java_kind_of?(JMS::TemporaryQueue), true
         destination.delete
 
         # Temporary Topic
-        destination = session.create_destination(:topic_name => :temporary)
+        destination = session.create_destination(topic_name: :temporary)
         assert_equal destination.java_kind_of?(JMS::TemporaryTopic), true
         destination.delete
       end
     end
 
-    should 'create destinations in blocks' do
+    it 'create destinations in blocks' do
       JMS::Connection.session(@config) do |session|
-        assert_not_nil session
+        assert session
 
         # Temporary Queue
-        session.destination(:queue_name => @queue_name) do |destination|
+        session.destination(queue_name: @queue_name) do |destination|
           assert_equal destination.java_kind_of?(JMS::Queue), true
         end
 
         # Temporary Topic
-        session.create_destination(:topic_name => @topic_name) do |destination|
+        session.create_destination(topic_name: @topic_name) do |destination|
           assert_equal destination.java_kind_of?(JMS::Topic), true
         end
       end
     end
 
-    should 'create destinations' do
+    it 'create destinations' do
       JMS::Connection.session(@config) do |session|
-        assert_not_nil session
+        assert session
 
         # Queue
-        queue = session.create_destination(:queue_name => @queue_name)
+        queue = session.create_destination(queue_name: @queue_name)
         assert_equal queue.java_kind_of?(JMS::Queue), true
 
         # Topic
-        topic = session.create_destination(:topic_name => @topic_name)
+        topic = session.create_destination(topic_name: @topic_name)
         assert_equal topic.java_kind_of?(JMS::Topic), true
       end
     end
 
-    should 'create destinations using direct methods' do
+    it 'create destinations using direct methods' do
       JMS::Connection.session(@config) do |session|
-        assert_not_nil session
+        assert session
 
         # Queue
         queue = session.queue(@queue_name)

data/test/test_helper.rb

@@ -0,0 +1,33 @@
+# Allow test to be run in-place without requiring a gem install
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+# Configure Rails Environment
+ENV['RAILS_ENV'] = 'test'
+
+require 'minitest/autorun'
+require 'minitest/reporters'
+require 'yaml'
+require 'jms'
+
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
+SemanticLogger.add_appender('test.log', &SemanticLogger::Appender::Base.colorized_formatter)
+SemanticLogger.default_level = :trace
+
+# Set Log4J properties file so that it does not need to be in the CLASSPATH
+java.lang.System.properties['log4j.configuration'] = 'test/log4j.properties'
+
+# Load configuration from jms.yml
+# Returns [Hash, String, String] the configuration, queue_name and topic_name
+def read_config
+  # To change the JMS provider, edit jms.yml and change :default
+
+  # Load Connection parameters from configuration file
+  cfg          = YAML.load_file(File.join(File.dirname(__FILE__), 'jms.yml'))
+  jms_provider = cfg['default']
+  config       = cfg[jms_provider]
+  raise "JMS Provider option:#{jms_provider} not found in jms.yml file" unless config
+  queue_name = config.delete(:queue_name) || raise("Mandatory :queue_name missing from jms.yml")
+  topic_name = config.delete(:topic_name) || raise("Mandatory :topic_name missing from jms.yml")
+  [config, queue_name, topic_name]
+end

metadata

@@ -1,63 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: jruby-jms
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: java
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   name: gene_pool
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: semantic_logger
   prerelease: false
   type: :runtime
-description: JRuby-JMS is a Java and Ruby library that exposes the Java JMS API in a ruby friendly way. For JRuby only.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: jruby-jms is a complete JRuby API into Java Messaging Specification (JMS) V1.1. For JRuby only.
 email:
 - reidmo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
 - HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile
-- examples/advanced/session_pool.rb
-- examples/client-server/replier.rb
-- examples/client-server/requestor.rb
-- examples/file-to-q/files_to_q.rb
-- examples/file-to-q/q_to_files.rb
-- examples/invm/invm.rb
-- examples/invm/log4j.properties
-- examples/jms.yml
-- examples/performance/consumer.rb
-- examples/performance/producer.rb
-- examples/producer-consumer/browser.rb
-- examples/producer-consumer/consumer.rb
-- examples/producer-consumer/consumer_async.rb
-- examples/producer-consumer/producer.rb
-- examples/publish-subscribe/publish.rb
-- examples/publish-subscribe/subscribe.rb
 - lib/jms.rb
 - lib/jms/bytes_message.rb
 - lib/jms/connection.rb
 - lib/jms/imports.rb
-- lib/jms/logging.rb
 - lib/jms/map_message.rb
 - lib/jms/message.rb
 - lib/jms/message_consumer.rb
@@ -71,15 +66,13 @@ files:
 - lib/jms/session_pool.rb
 - lib/jms/text_message.rb
 - lib/jms/version.rb
-- nbproject/private/private.properties
-- nbproject/private/rake-d.txt
-- parallel_minion.gemspec
 - test/connection_test.rb
 - test/jms.yml
 - test/log4j.properties
 - test/message_test.rb
 - test/session_pool_test.rb
 - test/session_test.rb
+- test/test_helper.rb
 homepage: https://github.com/reidmorrison/jruby-jms
 licenses:
 - Apache License V2.0
@@ -100,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: JRuby interface into JMS
@@ -111,3 +104,4 @@ test_files:
 - test/message_test.rb
 - test/session_pool_test.rb
 - test/session_test.rb
+- test/test_helper.rb

data/Gemfile

@@ -1,8 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rake'
-gem 'gene_pool'
-
-group :development do
-  gem 'shoulda'
-end

data/Gemfile.lock

@@ -1,36 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
-    gene_pool (1.3.2)
-    i18n (0.6.9)
-    minitest (4.7.5)
-    multi_json (1.8.4)
-    rake (10.1.1)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.5.0)
-      activesupport (>= 3.0.0)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
-    tzinfo (0.3.38)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  gene_pool
-  rake
-  shoulda