composite_primary_keys 10.0.5 → 11.0.0.beta1

data/test/test_composite_arrays.rb

@@ -1,24 +1,24 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class CompositeArraysTest < ActiveSupport::TestCase
-
-  def test_new_primary_keys
-    keys = CompositePrimaryKeys::CompositeKeys.new
-    assert_not_nil keys
-    assert_equal '', keys.to_s
-    assert_equal '', "#{keys}"
-  end
-
-  def test_initialize_primary_keys
-    keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
-    assert_not_nil keys
-    assert_equal '1,2,3', keys.to_s
-    assert_equal '1,2,3', "#{keys}"
-  end
-
-  def test_to_composite_keys
-    keys = [1,2,3].to_composite_keys
-    assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
-    assert_equal '1,2,3', keys.to_s
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class CompositeArraysTest < ActiveSupport::TestCase
+
+  def test_new_primary_keys
+    keys = CompositePrimaryKeys::CompositeKeys.new
+    assert_not_nil keys
+    assert_equal '', keys.to_s
+    assert_equal '', "#{keys}"
+  end
+
+  def test_initialize_primary_keys
+    keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
+    assert_not_nil keys
+    assert_equal '1,2,3', keys.to_s
+    assert_equal '1,2,3', "#{keys}"
+  end
+
+  def test_to_composite_keys
+    keys = [1,2,3].to_composite_keys
+    assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
+    assert_equal '1,2,3', keys.to_s
+  end
+end

data/test/test_counter_cache.rb

@@ -1,31 +1,31 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCalculations < ActiveSupport::TestCase
-  fixtures :tariffs
-
-  def test_update_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.update_counters(tariff.id, :amount => 1)
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_increment_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.increment_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_decrement_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.decrement_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(49, tariff.amount)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCalculations < ActiveSupport::TestCase
+  fixtures :tariffs
+
+  def test_update_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.update_counters(tariff.id, :amount => 1)
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_increment_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.increment_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_decrement_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.decrement_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(49, tariff.amount)
+  end
 end

data/test/test_delete.rb

@@ -4,29 +4,29 @@ class TestDelete < ActiveSupport::TestCase
   fixtures :articles, :departments, :employees, :products, :tariffs, :product_tariffs,
            :reference_types, :reference_codes
 
-  def test_delete_one
-    assert_equal(5, ReferenceCode.count)
-    ReferenceCode.first.delete
-    assert_equal(4, ReferenceCode.count)
-  end
-
-  def test_delete_one_with_id
-    assert_equal(5, ReferenceCode.count)
-    ReferenceCode.delete(ReferenceCode.first.id)
-    assert_equal(4, ReferenceCode.count)
-  end
-
-  def test_destroy_one
-    assert_equal(5, ReferenceCode.count)
-    ReferenceCode.first.destroy
-    assert_equal(4, ReferenceCode.count)
-  end
-
-  def test_delete_all
-    refute_empty(ReferenceCode.all)
-    ReferenceCode.delete_all
-    assert_empty(ReferenceCode.all)
-  end
+  # def test_delete_one
+  #   assert_equal(5, ReferenceCode.count)
+  #   ReferenceCode.first.delete
+  #   assert_equal(4, ReferenceCode.count)
+  # end
+  #
+  # def test_delete_one_with_id
+  #   assert_equal(5, ReferenceCode.count)
+  #   ReferenceCode.delete(ReferenceCode.first.id)
+  #   assert_equal(4, ReferenceCode.count)
+  # end
+  #
+  # def test_destroy_one
+  #   assert_equal(5, ReferenceCode.count)
+  #   ReferenceCode.first.destroy
+  #   assert_equal(4, ReferenceCode.count)
+  # end
+  #
+  # def test_delete_all
+  #   refute_empty(ReferenceCode.all)
+  #   ReferenceCode.delete_all
+  #   assert_empty(ReferenceCode.all)
+  # end
 
   def test_delete_all_with_join
     department = departments(:accounting)
@@ -41,127 +41,127 @@ class TestDelete < ActiveSupport::TestCase
     assert_equal(3, Department.count)
   end
 
-  def test_clear_association
-    department = Department.find([1,1])
-    assert_equal(2, department.employees.size, "Before clear employee count should be 2.")
-
-    department.employees.clear
-    assert_equal(0, department.employees.size, "After clear employee count should be 0.")
-
-    department.reload
-    assert_equal(0, department.employees.size, "After clear and a reload from DB employee count should be 0.")
-  end
-
-  def test_delete_association
-    department = Department.find([1,1])
-    assert_equal 2, department.employees.size , "Before delete employee count should be 2."
-    first_employee = department.employees[0]
-    department.employees.delete(first_employee)
-    assert_equal 1, department.employees.size, "After delete employee count should be 1."
-    department.reload
-    assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."
-  end
-
-  def test_has_many_replace
-    tariff = tariffs(:flat)
-    assert_equal(1, tariff.product_tariffs.length)
-
-    tariff.product_tariffs = [product_tariffs(:first_free), product_tariffs(:second_free)]
-    tariff.reload
-
-    assert_equal(2, tariff.product_tariffs.length)
-    refute(tariff.product_tariffs.include?(tariff))
-  end
-
-  def test_destroy_has_one
-    # In this case the association is a has_one with
-    # dependent set to :destroy
-    department = departments(:engineering)
-    assert_not_nil(department.head)
-
-    # Get head employee id
-    head_id = department.head.id
-
-    # Delete department - should delete the head
-    department.destroy
-
-    # Verify the head is also
-    assert_raise(ActiveRecord::RecordNotFound) do
-      Employee.find(head_id)
-    end
-  end
-
-  def test_destroy_has_and_belongs_to_many_on_non_cpk
-    steve = employees(:steve)
-    records_before = ActiveRecord::Base.connection.execute('select * from employees_groups')
-    steve.destroy
-    records_after = ActiveRecord::Base.connection.execute('select * from employees_groups')
-    if records_before.respond_to?(:count)
-      assert_equal records_after.count, records_before.count - steve.groups.count
-    elsif records_before.respond_to?(:row_count) # OCI8:Cursor for oracle adapter
-      assert_equal records_after.row_count, records_before.row_count - steve.groups.count
-    end
-  end
-
-  def test_create_destroy_has_and_belongs_to_many_on_non_cpk
-    records_before = ActiveRecord::Base.connection.execute('select * from employees_groups')
-    employee = Employee.create
-    employee.groups << Group.create(name: 'test')
-    employee.destroy!
-    records_after = ActiveRecord::Base.connection.execute('select * from employees_groups')
-    if records_before.respond_to?(:count)
-      assert_equal records_before.count, records_after.count
-    elsif records_before.respond_to?(:row_count) # OCI8:Cursor for oracle adapter
-      assert_equal records_before.row_count, records_after.row_count
-    end
-  end
-
-  def test_delete_not_destroy_on_cpk
-    tariff = Tariff.where(tariff_id: 2).first
-    tariff.delete
-    assert !tariff.persisted?
-  end
-
-  def test_delete_not_destroy_on_non_cpk
-    article = Article.first
-    article.delete
-    assert !article.persisted?
-  end
-
-  def test_destroy_has_many_delete_all
-    # In this case the association is a has_many composite key with
-    # dependent set to :delete_all
-    product = Product.find(1)
-    assert_equal(2, product.product_tariffs.length)
-
-    # Get product_tariff length
-    product_tariff_size = ProductTariff.count
-
-    # Delete product - should delete 2 product tariffs
-    product.destroy
-
-    # Verify product_tariff are deleted
-    assert_equal(product_tariff_size - 2, ProductTariff.count)
-  end
-
-  def test_delete_cpk_association
-    product = Product.find(1)
-    assert_equal(2, product.product_tariffs.length)
-
-    product_tariff = product.product_tariffs.first
-    product.product_tariffs.delete(product_tariff)
-
-    product.reload
-    assert_equal(1, product.product_tariffs.length)
-  end
-
-  def test_delete_records_for_has_many_association_with_composite_primary_key
-    reference_type  = ReferenceType.find(1)
-    codes_to_delete = reference_type.reference_codes[0..1]
-    assert_equal(3, reference_type.reference_codes.size, "Before deleting records reference_code count should be 3.")
-
-    reference_type.reference_codes.delete(codes_to_delete)
-    reference_type.reload
-    assert_equal(1, reference_type.reference_codes.size, "After deleting 2 records and a reload from DB reference_code count should be 1.")
-  end
+  # def test_clear_association
+  #   department = Department.find([1,1])
+  #   assert_equal(2, department.employees.size, "Before clear employee count should be 2.")
+  #
+  #   department.employees.clear
+  #   assert_equal(0, department.employees.size, "After clear employee count should be 0.")
+  #
+  #   department.reload
+  #   assert_equal(0, department.employees.size, "After clear and a reload from DB employee count should be 0.")
+  # end
+  #
+  # def test_delete_association
+  #   department = Department.find([1,1])
+  #   assert_equal 2, department.employees.size , "Before delete employee count should be 2."
+  #   first_employee = department.employees[0]
+  #   department.employees.delete(first_employee)
+  #   assert_equal 1, department.employees.size, "After delete employee count should be 1."
+  #   department.reload
+  #   assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."
+  # end
+  #
+  # def test_has_many_replace
+  #   tariff = tariffs(:flat)
+  #   assert_equal(1, tariff.product_tariffs.length)
+  #
+  #   tariff.product_tariffs = [product_tariffs(:first_free), product_tariffs(:second_free)]
+  #   tariff.reload
+  #
+  #   assert_equal(2, tariff.product_tariffs.length)
+  #   refute(tariff.product_tariffs.include?(tariff))
+  # end
+  #
+  # def test_destroy_has_one
+  #   # In this case the association is a has_one with
+  #   # dependent set to :destroy
+  #   department = departments(:engineering)
+  #   assert_not_nil(department.head)
+  #
+  #   # Get head employee id
+  #   head_id = department.head.id
+  #
+  #   # Delete department - should delete the head
+  #   department.destroy
+  #
+  #   # Verify the head is also
+  #   assert_raise(ActiveRecord::RecordNotFound) do
+  #     Employee.find(head_id)
+  #   end
+  # end
+  #
+  # def test_destroy_has_and_belongs_to_many_on_non_cpk
+  #   steve = employees(:steve)
+  #   records_before = ActiveRecord::Base.connection.execute('select * from employees_groups')
+  #   steve.destroy
+  #   records_after = ActiveRecord::Base.connection.execute('select * from employees_groups')
+  #   if records_before.respond_to?(:count)
+  #     assert_equal records_after.count, records_before.count - steve.groups.count
+  #   elsif records_before.respond_to?(:row_count) # OCI8:Cursor for oracle adapter
+  #     assert_equal records_after.row_count, records_before.row_count - steve.groups.count
+  #   end
+  # end
+  #
+  # def test_create_destroy_has_and_belongs_to_many_on_non_cpk
+  #   records_before = ActiveRecord::Base.connection.execute('select * from employees_groups')
+  #   employee = Employee.create
+  #   employee.groups << Group.create(name: 'test')
+  #   employee.destroy!
+  #   records_after = ActiveRecord::Base.connection.execute('select * from employees_groups')
+  #   if records_before.respond_to?(:count)
+  #     assert_equal records_before.count, records_after.count
+  #   elsif records_before.respond_to?(:row_count) # OCI8:Cursor for oracle adapter
+  #     assert_equal records_before.row_count, records_after.row_count
+  #   end
+  # end
+  #
+  # def test_delete_not_destroy_on_cpk
+  #   tariff = Tariff.where(tariff_id: 2).first
+  #   tariff.delete
+  #   assert !tariff.persisted?
+  # end
+  #
+  # def test_delete_not_destroy_on_non_cpk
+  #   article = Article.first
+  #   article.delete
+  #   assert !article.persisted?
+  # end
+  #
+  # def test_destroy_has_many_delete_all
+  #   # In this case the association is a has_many composite key with
+  #   # dependent set to :delete_all
+  #   product = Product.find(1)
+  #   assert_equal(2, product.product_tariffs.length)
+  #
+  #   # Get product_tariff length
+  #   product_tariff_size = ProductTariff.count
+  #
+  #   # Delete product - should delete 2 product tariffs
+  #   product.destroy
+  #
+  #   # Verify product_tariff are deleted
+  #   assert_equal(product_tariff_size - 2, ProductTariff.count)
+  # end
+  #
+  # def test_delete_cpk_association
+  #   product = Product.find(1)
+  #   assert_equal(2, product.product_tariffs.length)
+  #
+  #   product_tariff = product.product_tariffs.first
+  #   product.product_tariffs.delete(product_tariff)
+  #
+  #   product.reload
+  #   assert_equal(1, product.product_tariffs.length)
+  # end
+  #
+  # def test_delete_records_for_has_many_association_with_composite_primary_key
+  #   reference_type  = ReferenceType.find(1)
+  #   codes_to_delete = reference_type.reference_codes[0..1]
+  #   assert_equal(3, reference_type.reference_codes.size, "Before deleting records reference_code count should be 3.")
+  #
+  #   reference_type.reference_codes.delete(codes_to_delete)
+  #   reference_type.reload
+  #   assert_equal(1, reference_type.reference_codes.size, "After deleting 2 records and a reload from DB reference_code count should be 1.")
+  # end
 end

data/test/test_dup.rb

@@ -1,38 +1,38 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestClone < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-  
-  def test_dup
-    testing_with do
-      clone = @first.dup
-      
-      remove_keys = Array(@klass.primary_key).map(&:to_s)
-      remove_keys << Array(@klass.primary_key) # Rails 4 adds the PK to the attributes, so we want to remove it as well
-      assert_equal(@first.attributes.except(*remove_keys), clone.attributes.except(*remove_keys))
-
-      if composite?
-        @klass.primary_key.each do |key|
-          assert_nil(clone[key], "Primary key '#{key}' should be nil")
-        end
-      else
-        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
-      end
-    end
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestClone < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+  
+  def test_dup
+    testing_with do
+      clone = @first.dup
+      
+      remove_keys = Array(@klass.primary_key).map(&:to_s)
+      remove_keys << Array(@klass.primary_key) # Rails 4 adds the PK to the attributes, so we want to remove it as well
+      assert_equal(@first.attributes.except(*remove_keys), clone.attributes.except(*remove_keys))
+
+      if composite?
+        @klass.primary_key.each do |key|
+          assert_nil(clone[key], "Primary key '#{key}' should be nil")
+        end
+      else
+        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
+      end
+    end
+  end
 end