@@ -164,14 +164,14 @@ begin desc "Run integration tests" Spec::Rake::SpecTask.new("integration") do |t| - t.spec_files = FileList["spec/integration/*_test.rb"] + t.spec_files = Dir["spec/integration/*_test.rb"] t.spec_opts = spec_opts.call end %w'postgres sqlite mysql informix oracle ado'.each do |adapter| desc "Run #{adapter} specs without coverage" Spec::Rake::SpecTask.new("spec_#{adapter}") do |t| - t.spec_files = ["spec/adapters/#{adapter}_spec.rb"] + t.spec_files = ["spec/adapters/#{adapter}_spec.rb"] + Dir["spec/integration/*_test.rb"] t.spec_opts = spec_opts.call end end Rakefile @@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper.rb') unless defined?(ADO_DB) ADO_DB = Sequel.ado(:host => 'MY_SQL_SERVER', :database => 'MyDB', :user => 'my_usr', :password => 'my_pwd') end +INTEGRATION_DB = ADO_DB unless defined?(INTEGRATION_DB) context "An ADO dataset" do before(:each) do spec/adapters/ado_spec.rb @@ -4,6 +4,7 @@ unless defined?(FIREBIRD_DB) FIREBIRD_URL = 'firebird://sysdba:masterkey@localhost/reality_spec' unless defined? FIREBIRD_URL FIREBIRD_DB = Sequel.connect(ENV['SEQUEL_FB_SPEC_DB']||FIREBIRD_URL) end +INTEGRATION_DB = FIREBIRD_DB unless defined?(INTEGRATION_DB) def FIREBIRD_DB.sqls (@sqls ||= []) spec/adapters/firebird_spec.rb @@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper.rb') unless defined?(INFORMIX_DB) INFORMIX_DB = Sequel.connect('informix://localhost/mydb') end +INTEGRATION_DB = INFORMIX_DB unless defined?(INTEGRATION_DB) if INFORMIX_DB.table_exists?(:test) INFORMIX_DB.drop_table :test spec/adapters/informix_spec.rb @@ -10,6 +10,7 @@ end unless defined?(MYSQL_SOCKET_FILE) MYSQL_SOCKET_FILE = '/tmp/mysql.sock' end +INTEGRATION_DB = MYSQL_DB unless defined?(INTEGRATION_DB) MYSQL_URI = URI.parse(MYSQL_DB.uri) spec/adapters/mysql_spec.rb @@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper.rb') unless defined?(ORACLE_DB) ORACLE_DB = Sequel.connect('oracle://hr:hr@localhost/XE') end +INTEGRATION_DB = ORACLE_DB unless defined?(INTEGRATION_DB) if ORACLE_DB.table_exists?(:items) ORACLE_DB.drop_table :items spec/adapters/oracle_spec.rb @@ -4,6 +4,7 @@ unless defined?(POSTGRES_DB) POSTGRES_URL = 'postgres://postgres:postgres@localhost:5432/reality_spec' unless defined? POSTGRES_URL POSTGRES_DB = Sequel.connect(ENV['SEQUEL_PG_SPEC_DB']||POSTGRES_URL) end +INTEGRATION_DB = POSTGRES_DB unless defined?(INTEGRATION_DB) def POSTGRES_DB.sqls (@sqls ||= []) spec/adapters/postgres_spec.rb @@ -1,10 +1,10 @@ require 'rubygems' unless Object.const_defined?('Sequel') $:.unshift(File.join(File.dirname(__FILE__), "../../lib/")) - require 'sequel/core' + require 'sequel' Sequel.quote_identifiers = false end begin - require File.join(File.dirname(__FILE__), '../spec_config.rb') + require File.join(File.dirname(File.dirname(__FILE__)), 'spec_config.rb') rescue LoadError end spec/adapters/spec_helper.rb @@ -4,6 +4,7 @@ unless defined?(SQLITE_DB) SQLITE_URL = 'sqlite:/' unless defined? SQLITE_URL SQLITE_DB = Sequel.connect(ENV['SEQUEL_SQLITE_SPEC_DB']||SQLITE_URL) end +INTEGRATION_DB = SQLITE_DB unless defined?(INTEGRATION_DB) context "An SQLite database" do before do spec/adapters/sqlite_spec.rb @@ -1,10 +1,11 @@ require 'rubygems' +require 'logger' unless Object.const_defined?('Sequel') $:.unshift(File.join(File.dirname(__FILE__), "../../lib/")) require 'sequel' end begin - require File.join(File.dirname(__FILE__), '../spec_config.rb') + require File.join(File.dirname(File.dirname(__FILE__)), 'spec_config.rb') unless defined?(INTEGRATION_DB) rescue LoadError end @@ -16,12 +17,13 @@ def clear_sqls end class Spec::Example::ExampleGroup - def start_logging - require 'logger' - INTEGRATION_DB.loggers << Logger.new(STDOUT) - end - def stop_logging + def log + begin + INTEGRATION_DB.loggers << Logger.new(STDOUT) + yield + ensure INTEGRATION_DB.loggers.clear + end end end spec/integration/spec_helper.rb 6776f65f82999322ad3d46ac022380ecfe170c18 Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/sequel/commit/9117746178fd084dd4965e817c1b7bf8b6341a49 9117746178fd084dd4965e817c1b7bf8b6341a49 2009-06-04T10:29:24-07:00 2009-06-04T10:29:24-07:00 Have the adapter specs also run the integration tests The integration tests can also be thought of as generic adapter specs. In my testing, I was always running both the adapter specs and the integration tests. Combining them should make my test suite run faster (especially the JRuby tests because of the startup time). Implementation is fairly simple, just assigning the adapter database constant to the integration database constant and including the integration spec files. The integration rake task stays, for backwards compatibility and because some adapters don't have adapter specs (e.g. H2 on JDBC). Combining the two is what helped me find the PostgreSQL Database#indexes problem. Finally, change the start_logging/stop_logging helper methods to a single log method that takes a block. Almost always I use the logging methods when debugging where an exception is raised, and the log method makes that a lot easier. 18e278870324265839df5765fa67a9ca6577adb4 Jeremy Evans code@jeremyevans.net