clean up sqlserver_helper - Move models to their own directory and don’t require all models for every test

Anna · Anna · commit 97df2b6dfdb0 · 2014-01-07T23:41:32.000-05:00
diff --git a/test/cases/adapter_test_sqlserver.rb b/test/cases/adapter_test_sqlserver.rb
@@ -5,6 +5,14 @@
 require 'models/subscriber'
 require 'models/minimalistic'
 require 'models/post'
+require 'models_sqlserver/fk_test_has_pk'
+require 'models_sqlserver/fk_test_has_fk'
+require 'models_sqlserver/customers_view'
+require 'models_sqlserver/sql_server_chronic'
+require 'models_sqlserver/string_defaults_big_view'
+require 'models_sqlserver/string_defaults_view'
+require 'models_sqlserver/topic'
+require 'models_sqlserver/upper_test_default'
 
 class AdapterTestSqlserver < ActiveRecord::TestCase
   
diff --git a/test/cases/attribute_methods_test_sqlserver.rb b/test/cases/attribute_methods_test_sqlserver.rb
@@ -1,6 +1,7 @@
 require 'cases/sqlserver_helper'
 require 'models/developer'
 require 'models/topic'
+require 'models_sqlserver/topic'
 
 class AttributeMethodsTestSqlserver < ActiveRecord::TestCase
 end
diff --git a/test/cases/column_test_sqlserver.rb b/test/cases/column_test_sqlserver.rb
@@ -1,5 +1,12 @@
 require 'cases/sqlserver_helper'
 require 'models/binary'
+require 'models_sqlserver/float_data'
+require 'models_sqlserver/numeric_data'
+require 'models_sqlserver/sql_server_chronic'
+require 'models_sqlserver/sql_server_string'
+require 'models_sqlserver/sql_server_unicode'
+require 'models_sqlserver/table_with_real_column'
+require 'models_sqlserver/topic'
 
 class ColumnTestSqlserver < ActiveRecord::TestCase
   
diff --git a/test/cases/connection_test_sqlserver.rb b/test/cases/connection_test_sqlserver.rb
@@ -1,5 +1,6 @@
 require 'cases/sqlserver_helper'
 require 'models/reply' 
+require 'models_sqlserver/topic'
 
 class ConnectionTestSqlserver < ActiveRecord::TestCase
   
diff --git a/test/cases/finder_test_sqlserver.rb b/test/cases/finder_test_sqlserver.rb
@@ -1,5 +1,6 @@
 require 'cases/sqlserver_helper'
 require 'models/event'
+require 'models_sqlserver/topic'
 
 class FinderTestSqlserver < ActiveRecord::TestCase
 end
diff --git a/test/cases/migration_test_sqlserver.rb b/test/cases/migration_test_sqlserver.rb
@@ -1,5 +1,6 @@
 require 'cases/sqlserver_helper'
 require 'models/person'
+require 'models_sqlserver/person'
 
 class MigrationTestSqlserver < ActiveRecord::TestCase
   
diff --git a/test/cases/offset_and_limit_test_sqlserver.rb b/test/cases/offset_and_limit_test_sqlserver.rb
@@ -8,6 +8,7 @@
 require 'models/post'
 require 'models/comment'
 require 'models/categorization'
+require 'models_sqlserver/sql_server_order_row_number'
 
 class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
   
diff --git a/test/cases/persistence_test_sqlserver.rb b/test/cases/persistence_test_sqlserver.rb
@@ -13,6 +13,7 @@
 require 'models/parrot'
 require 'models/minivan'
 require 'models/person'
+require 'models_sqlserver/topic'
 require 'rexml/document'
 
 class PersistencesTestSqlserver < ActiveRecord::TestCase
diff --git a/test/cases/pessimistic_locking_test_sqlserver.rb b/test/cases/pessimistic_locking_test_sqlserver.rb
@@ -1,6 +1,7 @@
 require 'cases/sqlserver_helper'
 require 'models/person'
 require 'models/reader'
+require 'models_sqlserver/person'
 
 class PessimisticLockingTestSqlserver < ActiveRecord::TestCase
   
diff --git a/test/cases/schema_test_sqlserver.rb b/test/cases/schema_test_sqlserver.rb
@@ -1,4 +1,6 @@
 require 'cases/sqlserver_helper'
+require 'models_sqlserver/sql_server_natural_pk_data'
+require 'models_sqlserver/sql_server_natural_pk_data_schema'
 
 class SchemaTestSqlserver < ActiveRecord::TestCase
       
diff --git a/test/cases/specific_schema_test_sqlserver.rb b/test/cases/specific_schema_test_sqlserver.rb
@@ -1,5 +1,13 @@
 require 'cases/sqlserver_helper'
-
+require 'models_sqlserver/no_pk_data'
+require 'models_sqlserver/sql_server_dollar_table_name'
+require 'models_sqlserver/sql_server_edge_schema'
+require 'models_sqlserver/sql_server_natural_pk_int_data'
+require 'models_sqlserver/sql_server_quoted_table'
+require 'models_sqlserver/sql_server_quoted_view_1'
+require 'models_sqlserver/sql_server_quoted_view_2'
+require 'models_sqlserver/sql_server_tinyint_pk'
+require 'models_sqlserver/string_default'
 class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
   
   should 'be able to complex count tables with no primary key' do
diff --git a/test/cases/sqlserver_helper.rb b/test/cases/sqlserver_helper.rb
@@ -38,59 +38,6 @@
 ActiveRecord::Base.logger = Logger.new(File.expand_path(File.join(SQLSERVER_TEST_ROOT,'debug.log')))
 ActiveRecord::Base.logger.level = 0
 
-# Defining our classes in one place as well as some core tests that need coercing date/time types.
-
-class UpperTestDefault < ActiveRecord::Base ; self.table_name = 'UPPER_TESTS' ; end
-class UpperTestLowered < ActiveRecord::Base ; self.table_name = 'upper_tests' ; end
-class TableWithRealColumn < ActiveRecord::Base; end
-class FkTestHasFk < ActiveRecord::Base ; end
-class FkTestHasPk < ActiveRecord::Base ; end
-class NumericData < ActiveRecord::Base ; self.table_name = 'numeric_data' ; end
-class FloatData < ActiveRecord::Base ; self.table_name = 'float_data' ; end
-class CustomersView < ActiveRecord::Base ; self.table_name = 'customers_view' ; end
-class StringDefaultsView < ActiveRecord::Base ; self.table_name = 'string_defaults_view' ; end
-class StringDefaultsBigView < ActiveRecord::Base ; self.table_name = 'string_defaults_big_view' ; end
-class SqlServerNaturalPkData < ActiveRecord::Base ; self.table_name = 'natural_pk_data' ; self.primary_key = 'legacy_id' ; end
-class SqlServerTinyintPk < ActiveRecord::Base ; self.table_name = 'tinyint_pk_table' ; end
-class SqlServerNaturalPkIntData < ActiveRecord::Base ; self.table_name = 'natural_pk_int_data' ; end
-class SqlServerOrderRowNumber < ActiveRecord::Base ; self.table_name = 'order_row_number' ; end
-class SqlServerNaturalPkDataSchema < ActiveRecord::Base ; self.table_name = 'test.sql_server_schema_natural_id' ; end
-class SqlServerQuotedTable < ActiveRecord::Base ; self.table_name = 'quoted-table' ; end
-class SqlServerQuotedView1 < ActiveRecord::Base ; self.table_name = 'quoted-view1' ; end
-class SqlServerQuotedView2 < ActiveRecord::Base ; self.table_name = 'quoted-view2' ; end
-class SqlServerUnicode < ActiveRecord::Base ; end
-class SqlServerString < ActiveRecord::Base ; end
-class NoPkData < ActiveRecord::Base ; self.table_name = 'no_pk_data' ; end
-class StringDefault < ActiveRecord::Base; end
-class SqlServerEdgeSchema < ActiveRecord::Base
-  attr_accessor :new_id_setting
-  before_create :set_new_id
-  def with_spaces
-    read_attribute :'with spaces'
-  end
-  def with_spaces=(value)
-    write_attribute :'with spaces', value
-  end
-  protected
-  def set_new_id
-    self[:guid_newid] ||= self.class.connection.newid_function if new_id_setting
-  end
-end
-class SqlServerDollarTableName < ActiveRecord::Base
-  self.table_name = 'my$strange_table'
-end
-class SqlServerChronic < ActiveRecord::Base
-  coerce_sqlserver_date :date
-  coerce_sqlserver_time :time
-  default_timezone = :utc
-end
-class Topic < ActiveRecord::Base
-  coerce_sqlserver_date :last_read
-  coerce_sqlserver_time :bonus_time
-end
-class Person < ActiveRecord::Base
-  coerce_sqlserver_date :favorite_day
-end
 
 # A module that we can include in classes where we want to override an active record test.
 
