Fixed build tests.

Author: jdantonio

build-tests/atomic_reference_builds_spec.rb

@@ -23,62 +23,62 @@ def atomic_reference_test(clazz, opts = {})
   stats
 end
 
-describe Concurrent::Atomic do
+describe Concurrent::AtomicReference do
 
   let!(:threads) { 10 }
   let!(:tests) { 1000 }
 
-  describe Concurrent::MutexAtomic do
+  describe Concurrent::MutexAtomicReference do
 
     specify 'is defined' do
-      expect(defined?(Concurrent::MutexAtomic)).to be_truthy
+      expect(defined?(Concurrent::MutexAtomicReference)).to be_truthy
     end
 
     specify 'runs the benchmarks' do
-      stats = atomic_reference_test('MutexAtomic', threads: threads, tests: tests)
+      stats = atomic_reference_test('MutexAtomicReference', threads: threads, tests: tests)
       expect(stats).to be_benchmark_results
     end
   end
 
   if jruby? && 'JRUBY' == ENV['TEST_PLATFORM'].strip
 
-    describe Concurrent::JavaAtomic do
+    describe Concurrent::JavaAtomicReference do
 
-      specify 'Concurrent::JavaAtomic is defined' do
-        expect(defined?(Concurrent::JavaAtomic)).to be_truthy
+      specify 'Concurrent::JavaAtomicReference is defined' do
+        expect(defined?(Concurrent::JavaAtomicReference)).to be_truthy
       end
 
       specify 'runs the benchmarks' do
-        stats = atomic_reference_test('JavaAtomic', threads: threads, tests: tests)
+        stats = atomic_reference_test('JavaAtomicReference', threads: threads, tests: tests)
         expect(stats).to be_benchmark_results
       end
     end
 
   else
 
-    specify 'Concurrent::JavaAtomic is not defined' do
-      expect(defined?(Concurrent::JavaAtomic)).to be_falsey
+    specify 'Concurrent::JavaAtomicReference is not defined' do
+      expect(defined?(Concurrent::JavaAtomicReference)).to be_falsey
     end
   end
 
   if 'EXT' == ENV['TEST_PLATFORM'].strip
 
-    describe Concurrent::CAtomic do
+    describe Concurrent::CAtomicReference do
 
-      specify 'Concurrent::CAtomic is defined' do
-        expect(defined?(Concurrent::CAtomic)).to be_truthy
+      specify 'Concurrent::CAtomicReference is defined' do
+        expect(defined?(Concurrent::CAtomicReference)).to be_truthy
       end
 
       specify 'runs the benchmarks' do
-        stats = atomic_reference_test('CAtomic', threads: threads, tests: tests)
+        stats = atomic_reference_test('CAtomicReference', threads: threads, tests: tests)
         expect(stats).to be_benchmark_results
       end
     end
 
   else
 
-    specify 'Concurrent::CAtomic is not defined' do
-      expect(defined?(Concurrent::CAtomic)).to be_falsey
+    specify 'Concurrent::CAtomicReference is not defined' do
+      expect(defined?(Concurrent::CAtomicReference)).to be_falsey
     end
   end
 end

build-tests/runner.rb

@@ -69,13 +69,13 @@ def run_test_suite(files, ext, platform = '')
 
   test_platform = if ext
                     'EXT'
-                  elsif jruby?(platform)
+                  elsif jruby?
                     'JRUBY'
                   else
                     'RUBY'
                   end
 
-  cmd = if jruby?(platform)
+  cmd = if jruby?
           install_java_gem_command
         else
           install_gems_command(ext, platform)
@@ -102,10 +102,7 @@ def run_test_suite(files, ext, platform = '')
 puts SUITE_BREAK
 
 run_test_suite(TEST_FILES, false)
-if jruby?
-  puts SUITE_BREAK
-  run_test_suite(TEST_FILES, false, 'jruby')
-elsif mri?
+if mri?
   if ! windows?
     puts SUITE_BREAK
     run_test_suite(TEST_FILES, true)