activerecord 2.0.5 → 2.1.0

data/test/{binary_test.rb → cases/binary_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 # Without using prepared statements, it makes no sense to test
 # BLOB data with SQL Server, because the length of a statement is
@@ -8,16 +8,18 @@ require 'abstract_unit'
 # BLOB data with DB2 or Firebird, because the length of a statement
 # is limited to 32KB.
 unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
-  require 'fixtures/binary'
+  require 'models/binary'
 
-  class BinaryTest < Test::Unit::TestCase
+  class BinaryTest < ActiveRecord::TestCase
     FIXTURES = %w(flowers.jpg example.log)
 
     def test_load_save
       Binary.delete_all
 
       FIXTURES.each do |filename|
-        data = File.read("#{File.dirname(__FILE__)}/fixtures/#{filename}").freeze
+        data = File.read(ASSETS_ROOT + "/#{filename}")
+        data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
+        data.freeze
 
         bin = Binary.new(:data => data)
         assert_equal data, bin.data, 'Newly assigned data differs from original'

data/test/{calculations_test.rb → cases/calculations_test.rb}

@@ -1,6 +1,6 @@
-require 'abstract_unit'
-require 'fixtures/company'
-require 'fixtures/topic'
+require "cases/helper"
+require 'models/company'
+require 'models/topic'
 
 Company.has_many :accounts
 
@@ -8,7 +8,7 @@ class NumericData < ActiveRecord::Base
   self.table_name = 'numeric_data'
 end
 
-class CalculationsTest < Test::Unit::TestCase
+class CalculationsTest < ActiveRecord::TestCase
   fixtures :companies, :accounts, :topics
 
   def test_should_sum_field
@@ -79,7 +79,7 @@ class CalculationsTest < Test::Unit::TestCase
   end
 
   def test_should_group_by_summed_field_having_condition
-    c = Account.sum(:credit_limit, :group => :firm_id, 
+    c = Account.sum(:credit_limit, :group => :firm_id,
                                    :having => 'sum(credit_limit) > 50')
     assert_nil        c[1]
     assert_equal 105, c[6]
@@ -92,22 +92,26 @@ class CalculationsTest < Test::Unit::TestCase
     assert_equal 105,  c[companies(:rails_core)]
     assert_equal 60,   c[companies(:first_client)]
   end
-  
+
   def test_should_sum_field_with_conditions
     assert_equal 105, Account.sum(:credit_limit, :conditions => 'firm_id = 6')
   end
 
+  def test_should_return_zero_if_sum_conditions_return_nothing
+    assert_equal 0, Account.sum(:credit_limit, :conditions => '1 = 2')
+  end
+
   def test_should_group_by_summed_field_with_conditions
-    c = Account.sum(:credit_limit, :conditions => 'firm_id > 1', 
+    c = Account.sum(:credit_limit, :conditions => 'firm_id > 1',
                                    :group => :firm_id)
     assert_nil        c[1]
     assert_equal 105, c[6]
     assert_equal 60,  c[2]
   end
-  
+
   def test_should_group_by_summed_field_with_conditions_and_having
-    c = Account.sum(:credit_limit, :conditions => 'firm_id > 1', 
-                                   :group => :firm_id, 
+    c = Account.sum(:credit_limit, :conditions => 'firm_id > 1',
+                                   :group => :firm_id,
                                    :having => 'sum(credit_limit) > 60')
     assert_nil        c[1]
     assert_equal 105, c[6]
@@ -120,19 +124,19 @@ class CalculationsTest < Test::Unit::TestCase
     assert_equal 105, c[6]
     assert_equal 60,  c[2]
   end
-  
+
   def test_should_calculate_with_invalid_field
     assert_equal 6, Account.calculate(:count, '*')
     assert_equal 6, Account.calculate(:count, :all)
   end
-  
+
   def test_should_calculate_grouped_with_invalid_field
     c = Account.count(:all, :group => 'accounts.firm_id')
     assert_equal 1, c[1]
     assert_equal 2, c[6]
     assert_equal 1, c[2]
   end
-  
+
   def test_should_calculate_grouped_association_with_invalid_field
     c = Account.count(:all, :group => :firm)
     assert_equal 1, c[companies(:first_firm)]
@@ -171,7 +175,7 @@ class CalculationsTest < Test::Unit::TestCase
   def test_should_not_modify_options_when_using_includes
     options = {:conditions => 'companies.id > 1', :include => :firm}
     options_copy = options.dup
-    
+
     Account.count(:all, options)
     assert_equal options_copy, options
   end
@@ -183,7 +187,7 @@ class CalculationsTest < Test::Unit::TestCase
     assert_equal 3, c['CLIENT']
     assert_equal 2, c['FIRM']
   end
-  
+
   def test_should_calculate_grouped_by_function_with_table_alias
     c = Company.count(:all, :group => "UPPER(companies.#{QUOTED_TYPE})")
     assert_equal 2, c[nil]
@@ -191,7 +195,7 @@ class CalculationsTest < Test::Unit::TestCase
     assert_equal 3, c['CLIENT']
     assert_equal 2, c['FIRM']
   end
-  
+
   def test_should_not_overshadow_enumerable_sum
     assert_equal 6, [1, 2, 3].sum(&:abs)
   end
@@ -223,32 +227,36 @@ class CalculationsTest < Test::Unit::TestCase
         # empty options are valid
         Company.send(:validate_calculation_options, func)
         # these options are valid for all calculations
-        [:select, :conditions, :joins, :order, :group, :having, :distinct].each do |opt| 
+        [:select, :conditions, :joins, :order, :group, :having, :distinct].each do |opt|
           Company.send(:validate_calculation_options, func, opt => true)
         end
       end
-      
+
       # :include is only valid on :count
       Company.send(:validate_calculation_options, :count, :include => true)
     end
-    
+
     assert_raises(ArgumentError) { Company.send(:validate_calculation_options, :sum,   :foo => :bar) }
     assert_raises(ArgumentError) { Company.send(:validate_calculation_options, :count, :foo => :bar) }
   end
-  
+
   def test_should_count_selected_field_with_include
     assert_equal 6, Account.count(:distinct => true, :include => :firm)
     assert_equal 4, Account.count(:distinct => true, :include => :firm, :select => :credit_limit)
   end
-  
+
+  def test_should_count_manual_select_with_include
+    assert_equal 6, Account.count(:select => "DISTINCT accounts.id", :include => :firm)
+  end
+
   def test_count_with_column_parameter
     assert_equal 5, Account.count(:firm_id)
   end
-  
+
   def test_count_with_column_and_options_parameter
     assert_equal 2, Account.count(:firm_id, :conditions => "credit_limit = 50")
   end
-  
+
   def test_count_with_no_parameters_isnt_deprecated
     assert_not_deprecated { Account.count }
   end
@@ -256,4 +264,8 @@ class CalculationsTest < Test::Unit::TestCase
   def test_count_with_too_many_parameters_raises
     assert_raise(ArgumentError) { Account.count(1, 2, 3) }
   end
+
+  def test_should_sum_expression
+    assert_equal "636", Account.sum("2 * credit_limit")
+  end
 end

data/test/{callbacks_test.rb → cases/callbacks_test.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class CallbackDeveloper < ActiveRecord::Base
   set_table_name 'developers'
@@ -56,7 +56,7 @@ class ParentDeveloper < ActiveRecord::Base
 end
 
 class ChildDeveloper < ParentDeveloper
-  
+
 end
 
 class RecursiveCallbackDeveloper < ActiveRecord::Base
@@ -126,7 +126,7 @@ class CallbackCancellationDeveloper < ActiveRecord::Base
   end
 end
 
-class CallbacksTest < Test::Unit::TestCase
+class CallbacksTest < ActiveRecord::TestCase
   fixtures :developers
 
   def test_initialize
@@ -361,7 +361,7 @@ class CallbacksTest < Test::Unit::TestCase
     david = ImmutableDeveloper.find(1)
     assert !david.destroy
     assert_not_nil ImmutableDeveloper.find_by_id(1)
-  end  
+  end
 
   def test_zzz_callback_returning_false # must be run last since we modify CallbackDeveloper
     david = CallbackDeveloper.find(1)
@@ -384,17 +384,17 @@ class CallbacksTest < Test::Unit::TestCase
       [ :before_validation, :returning_false  ]
     ], david.history
   end
-  
+
   def test_inheritence_of_callbacks
     parent = ParentDeveloper.new
     assert !parent.after_save_called
     parent.save
     assert parent.after_save_called
-    
+
     child = ChildDeveloper.new
     assert !child.after_save_called
     child.save
     assert child.after_save_called
   end
-  
+
 end

data/test/{class_inheritable_attributes_test.rb → cases/class_inheritable_attributes_test.rb}

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'abstract_unit'
+require "cases/helper"
 require 'active_support/core_ext/class/inheritable_attributes'
 
 class A
@@ -19,12 +19,12 @@ class D < B
 end
 
 
-class ClassInheritableAttributesTest < Test::Unit::TestCase
+class ClassInheritableAttributesTest < ActiveRecord::TestCase
   def test_first_level
     assert_equal [ :one, :two ], B.read_inheritable_attribute("first")
     assert_equal [ :three ], C.read_inheritable_attribute("first")
   end
-  
+
   def test_second_level
     assert_equal [ :one, :two, :four ], D.read_inheritable_attribute("first")
     assert_equal [ :one, :two ], B.read_inheritable_attribute("first")

data/test/{column_alias_test.rb → cases/column_alias_test.rb}

@@ -1,7 +1,7 @@
-require 'abstract_unit'
-require 'fixtures/topic'
+require "cases/helper"
+require 'models/topic'
 
-class TestColumnAlias < Test::Unit::TestCase
+class TestColumnAlias < ActiveRecord::TestCase
   fixtures :topics
 
   QUERY = if 'Oracle' == ActiveRecord::Base.connection.adapter_name

data/test/{connection_test_firebird.rb → cases/connection_test_firebird.rb}

@@ -1,6 +1,6 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require "cases/helper"
 
-class FirebirdConnectionTest < Test::Unit::TestCase
+class FirebirdConnectionTest < ActiveRecord::TestCase
   def test_charset_properly_set
     fb_conn = ActiveRecord::Base.connection.instance_variable_get(:@connection)
     assert_equal 'UTF8', fb_conn.database.character_set

data/test/{connection_test_mysql.rb → cases/connection_test_mysql.rb}

@@ -1,6 +1,6 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require "cases/helper"
 
-class MysqlConnectionTest < Test::Unit::TestCase
+class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     @connection = ActiveRecord::Base.connection
   end

data/test/{copy_table_test_sqlite.rb → cases/copy_table_test_sqlite.rb}

@@ -1,37 +1,37 @@
-require 'abstract_unit'
+require "cases/helper"
 
-class CopyTableTest < Test::Unit::TestCase
+class CopyTableTest < ActiveRecord::TestCase
   fixtures :companies, :comments
-  
+
   def setup
     @connection = ActiveRecord::Base.connection
     class << @connection
       public :copy_table, :table_structure, :indexes
     end
   end
-  
+
   def test_copy_table(from = 'companies', to = 'companies2', options = {})
     assert_nothing_raised {copy_table(from, to, options)}
     assert_equal row_count(from), row_count(to)
-      
+
     if block_given?
       yield from, to, options
     else
       assert_equal column_names(from), column_names(to)
     end
-    
+
     @connection.drop_table(to) rescue nil
   end
-  
+
   def test_copy_table_renaming_column
-    test_copy_table('companies', 'companies2', 
+    test_copy_table('companies', 'companies2',
         :rename => {'client_of' => 'fan_of'}) do |from, to, options|
       expected = column_values(from, 'client_of')
       assert expected.any?, 'only nils in resultset; real values are needed'
       assert_equal expected, column_values(to, 'fan_of')
     end
   end
-  
+
   def test_copy_table_with_index
     test_copy_table('comments', 'comments_with_index') do
       @connection.add_index('comments_with_index', ['post_id', 'type'])
@@ -41,11 +41,11 @@ class CopyTableTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_copy_table_without_primary_key
     test_copy_table('developers_projects', 'programmers_projects')
   end
-  
+
 protected
   def copy_table(from, to, options = {})
     @connection.copy_table(from, to, {:temporary => true}.merge(options))
@@ -54,7 +54,7 @@ protected
   def column_names(table)
     @connection.table_structure(table).map {|column| column['name']}
   end
-  
+
   def column_values(table, column)
     @connection.select_all("SELECT #{column} FROM #{table} ORDER BY id").map {|row| row[column]}
   end
@@ -62,7 +62,7 @@ protected
   def table_indexes_without_name(table)
     @connection.indexes('comments_with_index').delete(:name)
   end
-  
+
   def row_count(table)
     @connection.select_one("SELECT COUNT(*) AS count FROM #{table}")['count']
   end

data/test/{datatype_test_postgresql.rb → cases/datatype_test_postgresql.rb}

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class PostgresqlArray < ActiveRecord::Base
 end
@@ -21,7 +21,7 @@ end
 class PostgresqlOid < ActiveRecord::Base
 end
 
-class PostgresqlDataTypeTest < Test::Unit::TestCase
+class PostgresqlDataTypeTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
@@ -30,8 +30,8 @@ class PostgresqlDataTypeTest < Test::Unit::TestCase
     @connection.execute("INSERT INTO postgresql_arrays (commission_by_quarter, nicknames) VALUES ( '{35000,21000,18000,17000}', '{foo,bar,baz}' )")
     @first_array = PostgresqlArray.find(1)
 
-    @connection.execute("INSERT INTO postgresql_moneys (wealth) VALUES ('$567.89')")
-    @connection.execute("INSERT INTO postgresql_moneys (wealth) VALUES ('-$567.89')")
+    @connection.execute("INSERT INTO postgresql_moneys (wealth) VALUES ('567.89'::money)")
+    @connection.execute("INSERT INTO postgresql_moneys (wealth) VALUES ('-567.89'::money)")
     @first_money = PostgresqlMoney.find(1)
     @second_money = PostgresqlMoney.find(2)
 
@@ -43,10 +43,10 @@ class PostgresqlDataTypeTest < Test::Unit::TestCase
 
     @connection.execute("INSERT INTO postgresql_network_addresses (cidr_address, inet_address, mac_address) VALUES('192.168.0/24', '172.16.1.254/32', '01:23:45:67:89:0a')")
     @first_network_address = PostgresqlNetworkAddress.find(1)
-    
+
     @connection.execute("INSERT INTO postgresql_bit_strings (bit_string, bit_string_varying) VALUES (B'00010101', X'15')")
     @first_bit_string = PostgresqlBitString.find(1)
-    
+
     @connection.execute("INSERT INTO postgresql_oids (obj_id) VALUES (1234)")
     @first_oid = PostgresqlOid.find(1)
   end
@@ -143,11 +143,11 @@ class PostgresqlDataTypeTest < Test::Unit::TestCase
   end
 
   def test_update_money
-    new_value = 123.45
+    new_value = BigDecimal.new('123.45')
     assert @first_money.wealth = new_value
     assert @first_money.save
     assert @first_money.reload
-    assert_equal @first_money.wealth, new_value
+    assert_equal new_value, @first_money.wealth
   end
 
   def test_update_number

data/test/{date_time_test.rb → cases/date_time_test.rb}

@@ -1,8 +1,8 @@
-require 'abstract_unit'
-require 'fixtures/topic'
-require 'fixtures/task'
+require "cases/helper"
+require 'models/topic'
+require 'models/task'
 
-class DateTimeTest < Test::Unit::TestCase
+class DateTimeTest < ActiveRecord::TestCase
   def test_saves_both_date_and_time
     time_values = [1807, 2, 10, 15, 30, 45]
     now = DateTime.civil(*time_values)
@@ -10,7 +10,7 @@ class DateTimeTest < Test::Unit::TestCase
     task = Task.new
     task.starting = now
     task.save!
-    
+
     # check against Time.local_time, since some platforms will return a Time instead of a DateTime
     assert_equal Time.local_time(*time_values), Task.find(task.id).starting
   end

data/test/{default_test_firebird.rb → cases/default_test_firebird.rb}

@@ -1,7 +1,7 @@
-require 'abstract_unit'
-require 'fixtures/default'
+require "cases/helper"
+require 'models/default'
 
-class DefaultTest < Test::Unit::TestCase
+class DefaultTest < ActiveRecord::TestCase
   def test_default_timestamp
     default = Default.new
     assert_instance_of(Time, default.default_timestamp)