make sure warnings can get (and are actually) disabled while testing

Author: kares

lib/arjdbc/jdbc.rb

@@ -19,9 +19,9 @@ def deprecate(message, once = nil)
 
     def warn?(message, once)
       return nil unless message
-      return true if ! once
-      @@warns << message.dup unless printed = @@warns.include?(message)
-      ! printed
+      return false if @@warns.include?(message)
+      @@warns << message.dup if once
+      true
     end
 
   end

lib/arjdbc/tasks/databases.rake

@@ -42,7 +42,7 @@ namespace :db do
   end
 
   if defined? adapt_jdbc_config
-    puts "ArJdbc: double loading #{__FILE__} please delete lib/tasks/jdbc.rake if present!"
+    ArJdbc.warn "double loading #{__FILE__} please delete lib/tasks/jdbc.rake if present!"
   end
 
   def adapt_jdbc_config(config)

test/rake_test_support.rb

@@ -15,9 +15,17 @@ module ClassMethods
     def startup
       super
       load 'rails_stub.rb'
+      if defined? ArJdbc
+        __file__ = File.expand_path('../../lib/arjdbc/tasks/databases.rake', __FILE__)
+        ArJdbc.disable_warn "double loading #{__file__} please delete lib/tasks/jdbc.rake if present!"
+      end
     end
 
     def shutdown
+      if defined? ArJdbc
+        __file__ = File.expand_path('../../lib/arjdbc/tasks/databases.rake', __FILE__)
+        ArJdbc.enable_warn "double loading #{__file__} please delete lib/tasks/jdbc.rake if present!"
+      end
       Object.send(:remove_const, :Rails)
       super
     end
@@ -76,7 +84,7 @@ def load_tasks
 
     task :environment do
       ActiveRecord::Base.configurations = configurations
-      ActiveRecord::Base.establish_connection @rails_env
+      ActiveRecord::Base.establish_connection @rails_env.to_sym
       @full_env_loaded = true
     end
 
@@ -191,13 +199,9 @@ def restore_stdout
   end
   private :restore_stdout
 
-  def rails_env
-    'unittest'
-  end
+  def rails_env; 'unittest' end
 
-  def db_name
-    'test_rake_db'
-  end
+  def db_name; 'test_rake_db' end
 
   @@db_config = nil
 

test/test_helper.rb

@@ -23,6 +23,10 @@
 
 if defined?(JRUBY_VERSION)
   require 'arjdbc'
+  module ArJdbc
+    def self.disable_warn(message); @@warns << message end
+    def self.enable_warn(message); @@warns.delete message end
+  end
 else # we support running tests against MRI
   require 'active_record'
 end
@@ -168,6 +172,10 @@ def self.current_connection_config
 
   def current_connection_config; self.class.current_connection_config; end
 
+  def deprecation_silence(&block)
+    ActiveSupport::Deprecation.silence(&block)
+  end
+
   protected
 
   def assert_queries(count, matching = nil)