Merge pull request #15 from dzjuck/rspec_tests

Rewrite tests from minitest to rspec

Author: jdantonio

.gitignore

@@ -1,5 +1,5 @@
 Gemfile.lock
-test/*.jar
+spec/*.jar
 .rspec-local
 *.gem
 lib/1.8

.rspec

@@ -0,0 +1,2 @@
+--require spec_helper
+--format progress

.travis.yml

@@ -40,4 +40,4 @@ matrix:
     - rvm: jruby-head
     - rvm: 1.9.3
 
-script: "rake TESTOPTS='--seed=1'"
+script: "rake test"

Gemfile

@@ -3,8 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'minitest', '~> 5.5.1'
-  gem 'minitest-reporters', '~> 1.0.11'
+  gem 'rspec', '~> 3.2.0'
   gem 'simplecov', '~> 0.9.2', :require => false
   gem 'coveralls', '~> 0.7.11', :require => false
 end

Rakefile

@@ -1,5 +1,6 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rspec'
+require 'rspec/core/rake_task'
 
 ## safely load all the rake tasks in the `tasks` directory
 def safe_load(file)
@@ -10,16 +11,17 @@ def safe_load(file)
     puts ex.message
   end
 end
+
 Dir.glob('tasks/**/*.rake').each do |rakefile|
   safe_load rakefile
 end
 
 task :default => :test
 
 if defined?(JRUBY_VERSION)
-  require "ant"
+  require 'ant'
 
-  directory "pkg/classes"
+  directory 'pkg/classes'
   directory 'pkg/tests'
 
   desc "Clean up build artifacts"
@@ -43,10 +45,10 @@ if defined?(JRUBY_VERSION)
 
   desc "Build test jar"
   task 'test-jar' => 'pkg/tests' do |t|
-    ant.javac :srcdir => 'test/src', :destdir => t.prerequisites.first,
+    ant.javac :srcdir => 'spec/src', :destdir => t.prerequisites.first,
       :source => "1.5", :target => "1.5", :debug => true
 
-    ant.jar :basedir => 'pkg/tests', :destfile => 'test/package.jar', :includes => '**/*.class'
+    ant.jar :basedir => 'pkg/tests', :destfile => 'spec/package.jar', :includes => '**/*.class'
   end
 
   task :package => [ :clean, :compile, :jar, 'test-jar' ]
@@ -55,7 +57,6 @@ else
   task :package
 end
 
-Rake::TestTask.new :test => :package do |t|
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*.rb"]
+RSpec::Core::RakeTask.new :test => :package do |t|
+  t.rspec_opts = '--color --backtrace --tag ~unfinished --seed 1 --format documentation ./spec'
 end

spec/.gitignore

@@ -0,0 +1,31 @@
+require 'simplecov'
+require 'coveralls'
+require 'logger'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start do
+  project_name 'thread_safe'
+  add_filter '/coverage/'
+  add_filter '/pkg/'
+  add_filter '/spec/'
+  add_filter '/tasks/'
+  add_filter '/yard-template/'
+end
+
+$VERBOSE = nil # suppress our deprecation warnings
+require 'thread_safe'
+
+logger                          = Logger.new($stderr)
+logger.level                    = Logger::WARN
+
+# import all the support files
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require File.expand_path(f) }
+
+RSpec.configure do |config|
+  #config.raise_errors_for_deprecations!
+  config.order = 'random'
+end

spec/spec_helper.rb

@@ -0,0 +1 @@
+THREADS = (RUBY_ENGINE == 'ruby' ? 100 : 10)

test/src/thread_safe/SecurityManager.java renamed to spec/src/thread_safe/SecurityManager.java

@@ -0,0 +1,75 @@
+module ThreadSafe
+  module Test
+    class Latch
+      def initialize(count = 1)
+        @count = count
+        @mutex = Mutex.new
+        @cond  = ConditionVariable.new
+      end
+
+      def release
+        @mutex.synchronize do
+          @count -= 1 if @count > 0
+          @cond.broadcast if @count.zero?
+        end
+      end
+
+      def await
+        @mutex.synchronize do
+          @cond.wait @mutex if @count > 0
+        end
+      end
+    end
+
+    class Barrier < Latch
+      def await
+        @mutex.synchronize do
+          if @count.zero? # fall through
+          elsif @count > 0
+            @count -= 1
+            @count.zero? ? @cond.broadcast : @cond.wait(@mutex)
+          end
+        end
+      end
+    end
+
+    class HashCollisionKey
+      attr_reader :hash, :key
+      def initialize(key, hash = key.hash % 3)
+        @key  = key
+        @hash = hash
+      end
+
+      def eql?(other)
+        other.kind_of?(self.class) && @key.eql?(other.key)
+      end
+
+      def even?
+        @key.even?
+      end
+
+      def <=>(other)
+        @key <=> other.key
+      end
+    end
+
+    # having 4 separate HCK classes helps for a more thorough CHMV8 testing
+    class HashCollisionKey2 < HashCollisionKey; end
+    class HashCollisionKeyNoCompare < HashCollisionKey
+      def <=>(other)
+        0
+      end
+    end
+    class HashCollisionKey4 < HashCollisionKeyNoCompare; end
+
+    HASH_COLLISION_CLASSES = [HashCollisionKey, HashCollisionKey2, HashCollisionKeyNoCompare, HashCollisionKey4]
+
+    def self.HashCollisionKey(key, hash = key.hash % 3)
+      HASH_COLLISION_CLASSES[rand(4)].new(key, hash)
+    end
+
+    class HashCollisionKeyNonComparable < HashCollisionKey
+      undef <=>
+    end
+  end
+end

spec/support/.gitignore

@@ -0,0 +1,18 @@
+module ThreadSafe
+  describe Array do
+    let!(:ary) { described_class.new }
+
+    it 'concurrency' do
+      (1..THREADS).map do |i|
+        Thread.new do
+          1000.times do
+            ary << i
+            ary.each { |x| x * 2 }
+            ary.shift
+            ary.last
+          end
+        end
+      end.map(&:join)
+    end
+  end
+end