reorganizing adapter specific tests. [#4974 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
rails · Jun 25, 2010 · 5e2b473 · 5e2b473
1 parent efbd0eb
commit 5e2b473
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 3 deletions.
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
@@ -49,7 +49,10 @@ end
     connection_path = "test/connections/#{adapter =~ /jdbc/ ? 'jdbc' : 'native'}_#{adapter}"
     adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z]+/]
     t.libs << "test" << connection_path
-    t.test_files=Dir.glob( "test/cases/**/*_test{,_#{adapter_short}}.rb" ).sort
+    t.test_files = (Dir.glob( "test/cases/**/*_test.rb" ).reject {
+      |x| x =~ /\/adapters\//
+    } + Dir.glob("test/cases/adapters/#{adapter_short}/**/*_test.rb")).sort
+
     t.verbose = true
     t.warning = true
   }

diff --git a/...rd/test/cases/connection_test_firebird.rb → ...ases/adapters/firebird/connection_test.rb b/...rd/test/cases/connection_test_firebird.rb → ...ases/adapters/firebird/connection_test.rb
diff --git a/...ecord/test/cases/default_test_firebird.rb → ...t/cases/adapters/firebird/default_test.rb b/...ecord/test/cases/default_test_firebird.rb → ...t/cases/adapters/firebird/default_test.rb
diff --git a/...ord/test/cases/migration_test_firebird.rb → ...cases/adapters/firebird/migration_test.rb b/...ord/test/cases/migration_test_firebird.rb → ...cases/adapters/firebird/migration_test.rb
diff --git a/...rd/test/cases/active_schema_test_mysql.rb → ...ases/adapters/mysql/active_schema_test.rb b/...rd/test/cases/active_schema_test_mysql.rb → ...ases/adapters/mysql/active_schema_test.rb
diff --git a/...ecord/test/cases/connection_test_mysql.rb → ...t/cases/adapters/mysql/connection_test.rb b/...ecord/test/cases/connection_test_mysql.rb → ...t/cases/adapters/mysql/connection_test.rb
diff --git a/...rd/test/cases/reserved_word_test_mysql.rb → ...ases/adapters/mysql/reserved_word_test.rb b/...rd/test/cases/reserved_word_test_mysql.rb → ...ases/adapters/mysql/reserved_word_test.rb
diff --git a/...erecord/test/cases/synonym_test_oracle.rb → ...est/cases/adapters/oracle/synonym_test.rb b/...erecord/test/cases/synonym_test_oracle.rb → ...est/cases/adapters/oracle/synonym_test.rb
diff --git a/...st/cases/active_schema_test_postgresql.rb → ...adapters/postgresql/active_schema_test.rb b/...st/cases/active_schema_test_postgresql.rb → ...adapters/postgresql/active_schema_test.rb
diff --git a/...rd/test/cases/datatype_test_postgresql.rb → ...ases/adapters/postgresql/datatype_test.rb b/...rd/test/cases/datatype_test_postgresql.rb → ...ases/adapters/postgresql/datatype_test.rb
@@ -53,7 +53,7 @@ def setup
 
     @connection.execute("INSERT INTO postgresql_oids (obj_id) VALUES (1234)")
     @first_oid = PostgresqlOid.find(1)
-    
+
     @connection.execute("INSERT INTO postgresql_timestamp_with_zones (time) VALUES ('2010-01-01 10:00:00-1')")
   end
 

diff --git a/...s/schema_authorization_test_postgresql.rb → ...s/postgresql/schema_authorization_test.rb b/...s/schema_authorization_test_postgresql.rb → ...s/postgresql/schema_authorization_test.rb
@@ -66,7 +66,7 @@ def test_sequence_schema_caching
       end
     end
   end
-  
+
   def test_tables_in_current_schemas
     assert !@connection.tables.include?(TABLE_NAME)
     USERS.each do |u|

diff --git a/...cord/test/cases/schema_test_postgresql.rb → .../cases/adapters/postgresql/schema_test.rb b/...cord/test/cases/schema_test_postgresql.rb → .../cases/adapters/postgresql/schema_test.rb
diff --git a/...cord/test/cases/copy_table_test_sqlite.rb → .../cases/adapters/sqlite/copy_table_test.rb b/...cord/test/cases/copy_table_test_sqlite.rb → .../cases/adapters/sqlite/copy_table_test.rb