composite_primary_keys 3.0.9 → 3.1.0

data/test/test_create.rb

@@ -1,8 +1,4 @@
 require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
-require 'fixtures/street'
-require 'fixtures/suburb'
 
 class TestCreate < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :streets, :suburbs

data/test/test_delete.rb

@@ -1,96 +1,92 @@
-require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
-require 'fixtures/department'
-require 'fixtures/employee'
-
-class TestDelete < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :departments, :employees
-  
-  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_destroy_one
-    testing_with do
-      assert @first.destroy
-    end
-  end
-
-  def test_destroy_one_alone_via_class
-    testing_with do
-      assert @klass.destroy(@first.id)
-    end
-  end
-
-  def test_delete_one_alone
-    testing_with do
-      assert @klass.delete(@first.id)
-    end
-  end
-
-  def test_delete_many
-    testing_with do
-      to_delete = @klass.find(:all)[0..1]
-      assert_equal 2, to_delete.length
-    end
-  end
-
-  def test_delete_all
-    testing_with do
-      @klass.delete_all
-    end
-  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_delete_cpk_all_association
-    # 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)
-
-    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_records(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
+require 'abstract_unit'
+
+class TestDelete < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :departments, :employees
+  
+  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_destroy_one
+    testing_with do
+      assert @first.destroy
+    end
+  end
+
+  def test_destroy_one_alone_via_class
+    testing_with do
+      assert @klass.destroy(@first.id)
+    end
+  end
+
+  def test_delete_one_alone
+    testing_with do
+      assert @klass.delete(@first.id)
+    end
+  end
+
+  def test_delete_many
+    testing_with do
+      to_delete = @klass.find(:all)[0..1]
+      assert_equal 2, to_delete.length
+    end
+  end
+
+  def test_delete_all
+    testing_with do
+      @klass.delete_all
+    end
+  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_delete_cpk_all_association
+    # 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)
+
+    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_records(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_equal.rb

@@ -0,0 +1,21 @@
+require 'abstract_unit'
+
+class TestEqual < ActiveSupport::TestCase
+  fixtures :capitols
+
+  def test_new
+    assert_not_equal(Capitol.new, Capitol.new)
+  end
+
+  def test_same
+    first = Capitol.find('Canada', 'Ottawa')
+    second = Capitol.find('Canada', 'Ottawa')
+    assert_equal(first, second)
+  end
+
+  def test_different
+    first = Capitol.find('Mexico', 'Mexico City')
+    second = Capitol.find('Canada', 'Ottawa')
+    assert_not_equal(first, second)
+  end
+end

data/test/test_exists.rb

@@ -1,6 +1,4 @@
 require 'abstract_unit'
-require 'fixtures/article'
-require 'fixtures/department'
 
 class TestExists < ActiveSupport::TestCase
   fixtures :articles, :departments

data/test/test_find.rb

@@ -1,76 +1,79 @@
-require 'abstract_unit'
-
-# Testing the find action on composite ActiveRecords with two primary keys
-class TestFind < 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],
-    },
-    :dual_strs   => {
-      :class => ReferenceCode,
-      :primary_keys => ['reference_type_id', 'reference_code'],
-    },
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_find_first
-    testing_with do
-      obj = @klass.find(:first)
-      assert obj
-      assert_equal @klass, obj.class
-    end
-  end
-
-  def test_find
-    testing_with do
-      found = @klass.find(*first_id) # e.g. find(1,1) or find 1,1
-      assert found
-      assert_equal @klass, found.class
-      assert_equal found, @klass.find(found.id)
-      assert_equal found, @klass.find(found.to_param)
-    end
-  end
-
-  def test_find_composite_ids
-    testing_with do
-      found = @klass.find(first_id) # e.g. find([1,1].to_composite_ids)
-      assert found
-      assert_equal @klass, found.class
-      assert_equal found, @klass.find(found.id)
-      assert_equal found, @klass.find(found.to_param)
-    end
-  end
-
-  def things_to_look_at
-    testing_with do
-      assert_equal found, @klass.find(found.id.to_s) # fails for 2+ keys
-    end
-  end
-
-  def test_not_found
-    assert_raise(::ActiveRecord::RecordNotFound) do
-      ReferenceCode.send :find, '999,999'
-    end
-  end
-
-  def test_find_last_suburb
-    suburb = Suburb.find(:last)
-    assert_equal([2,1], suburb.id)
-  end
-
-  def test_find_last_suburb_with_order
-    # Rails actually changes city_id DESC to city_id ASC
-    suburb = Suburb.find(:last, :order => 'suburbs.city_id DESC')
-    assert_equal([1,1], suburb.id)
-  end
-end
+require 'abstract_unit'
+
+# Testing the find action on composite ActiveRecords with two primary keys
+class TestFind < ActiveSupport::TestCase
+  fixtures :capitols, :reference_types, :reference_codes, :suburbs
+
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => [:reference_type_id],
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+    :dual_strs   => {
+      :class => ReferenceCode,
+      :primary_keys => ['reference_type_id', 'reference_code'],
+    },
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_find_first
+    testing_with do
+      obj = @klass.find(:first)
+      assert obj
+      assert_equal @klass, obj.class
+    end
+  end
+
+  def test_find
+    testing_with do
+      found = @klass.find(*first_id) # e.g. find(1,1) or find 1,1
+      assert found
+      assert_equal @klass, found.class
+      assert_equal found, @klass.find(found.id)
+    end
+  end
+
+  def test_find_composite_ids
+    testing_with do
+      found = @klass.find(first_id) # e.g. find([1,1].to_composite_ids)
+      assert found
+      assert_equal @klass, found.class
+      assert_equal found, @klass.find(found.id)
+    end
+  end
+
+  def things_to_look_at
+    testing_with do
+      assert_equal found, @klass.find(found.id.to_s) # fails for 2+ keys
+    end
+  end
+
+  def test_find_with_strings_as_composite_keys
+    found = Capitol.find('The Netherlands', 'Amsterdam')
+    assert found
+  end
+
+  def test_not_found
+    assert_raise(::ActiveRecord::RecordNotFound) do
+      ReferenceCode.find(['999', '999'])
+    end
+  end
+
+  def test_find_last_suburb
+    suburb = Suburb.find(:last)
+    assert_equal([2,1], suburb.id)
+  end
+
+  def test_find_last_suburb_with_order
+    # Rails actually changes city_id DESC to city_id ASC
+    suburb = Suburb.find(:last, :order => 'suburbs.city_id DESC')
+    assert_equal([1,1], suburb.id)
+  end
+end

data/test/test_ids.rb

@@ -1,84 +1,82 @@
-require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
-
-class TestIds < 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],
-    },
-    :dual_strs   => { 
-      :class => ReferenceCode,
-      :primary_keys => ['reference_type_id', 'reference_code'],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-  
-  def test_id
-    testing_with do
-      assert_equal @first.id, @first.ids if composite?
-      assert_kind_of(CompositePrimaryKeys::CompositeKeys, @first.id) if composite?
-    end
-  end
-  
-  def test_ids_to_s
-    testing_with do
-      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
-      to_test = @klass.find(:all, :order => order)[0..1].map(&:id)
-      assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual
-      assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
-    end
-  end
-  
-  def test_set_ids_string
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected.to_s
-      assert_equal expected, @first.id
-    end
-  end
-  
-  def test_set_ids_array
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected
-      assert_equal expected, @first.id
-    end
-  end
-  
-  def test_set_ids_comp
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected
-      assert_equal expected, @first.id
-    end
-  end
-  
-  def test_primary_keys
-    testing_with do
-      if composite?
-        assert_not_nil @klass.primary_keys
-        assert_equal @primary_keys.map {|key| key.to_sym}, @klass.primary_keys
-        assert_equal @klass.primary_keys, @klass.primary_key
-        assert_equal @primary_keys.map {|key| key.to_sym}.to_s, @klass.primary_key.to_s
-      else
-        assert_not_nil @klass.primary_key
-        assert_equal @primary_keys.first, @klass.primary_key.to_sym
-        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
-      end
-    end
-  end
+require 'abstract_unit'
+
+class TestIds < 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],
+    },
+    :dual_strs   => { 
+      :class => ReferenceCode,
+      :primary_keys => ['reference_type_id', 'reference_code'],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+  
+  def test_id
+    testing_with do
+      assert_equal @first.id, @first.ids if composite?
+      assert_kind_of(CompositePrimaryKeys::CompositeKeys, @first.id) if composite?
+    end
+  end
+  
+  def test_ids_to_s
+    testing_with do
+      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
+      to_test = @klass.find(:all, :order => order)[0..1].map(&:id)
+      assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual
+      assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
+    end
+  end
+  
+  def test_set_ids_string
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected.to_s
+      assert_equal expected, @first.id
+    end
+  end
+  
+  def test_set_ids_array
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+  
+  def test_set_ids_comp
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+  
+  def test_primary_keys
+    testing_with do
+      if composite?
+        assert_not_nil @klass.primary_keys
+        assert_equal @primary_keys.map {|key| key.to_sym}, @klass.primary_keys
+        assert_equal @klass.primary_keys, @klass.primary_key
+        assert_equal @primary_keys.map {|key| key.to_sym}.to_s, @klass.primary_key.to_s
+      else
+        assert_not_nil @klass.primary_key
+        assert_equal @primary_keys.first, @klass.primary_key.to_sym
+        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
+      end
+    end
+  end
 end