From 7fe5ae8d237c8f821bc5e984f98d9d7eb7c35266 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Mon, 25 Mar 2013 16:00:24 +0100
Subject: move AR length validation tests into separate test-case.

Conflicts:
	activerecord/test/cases/validations/association_validation_test.rb
---
 .../validations/association_validation_test.rb     | 43 +-------------------
 .../cases/validations/length_validation_test.rb    | 47 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 42 deletions(-)
 create mode 100644 activerecord/test/cases/validations/length_validation_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations/association_validation_test.rb b/activerecord/test/cases/validations/association_validation_test.rb
index 602f633c45..e4edc437e6 100644
--- a/activerecord/test/cases/validations/association_validation_test.rb
+++ b/activerecord/test/cases/validations/association_validation_test.rb
@@ -1,44 +1,14 @@
-# encoding: utf-8
 require "cases/helper"
 require 'models/topic'
 require 'models/reply'
-require 'models/owner'
-require 'models/pet'
 require 'models/man'
 require 'models/interest'
 
 class AssociationValidationTest < ActiveRecord::TestCase
-  fixtures :topics, :owners
+  fixtures :topics
 
   repair_validations(Topic, Reply)
 
-  def test_validates_size_of_association
-    repair_validations Owner do
-      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
-      o = Owner.new('name' => 'nopets')
-      assert !o.save
-      assert o.errors[:pets].any?
-      o.pets.build('name' => 'apet')
-      assert o.valid?
-    end
-  end
-
-  def test_validates_size_of_association_using_within
-    repair_validations Owner do
-      assert_nothing_raised { Owner.validates_size_of :pets, :within => 1..2 }
-      o = Owner.new('name' => 'nopets')
-      assert !o.save
-      assert o.errors[:pets].any?
-
-      o.pets.build('name' => 'apet')
-      assert o.valid?
-
-      2.times { o.pets.build('name' => 'apet') }
-      assert !o.save
-      assert o.errors[:pets].any?
-    end
-  end
-
   def test_validates_associated_many
     Topic.validates_associated(:replies)
     Reply.validates_presence_of(:content)
@@ -94,17 +64,6 @@ class AssociationValidationTest < ActiveRecord::TestCase
     assert r.valid?
   end
 
-  def test_validates_size_of_association_utf8
-    repair_validations Owner do
-      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
-      o = Owner.new('name' => 'あいうえおかきくけこ')
-      assert !o.save
-      assert o.errors[:pets].any?
-      o.pets.build('name' => 'あいうえおかきくけこ')
-      assert o.valid?
-    end
-  end
-
   def test_validates_presence_of_belongs_to_association__parent_is_new_record
     repair_validations(Interest) do
       # Note that Interest and Man have the :inverse_of option set
diff --git a/activerecord/test/cases/validations/length_validation_test.rb b/activerecord/test/cases/validations/length_validation_test.rb
new file mode 100644
index 0000000000..4a92da38ce
--- /dev/null
+++ b/activerecord/test/cases/validations/length_validation_test.rb
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+require "cases/helper"
+require 'models/owner'
+require 'models/pet'
+
+class LengthValidationTest < ActiveRecord::TestCase
+  fixtures :owners
+  repair_validations(Owner)
+
+  def test_validates_size_of_association
+    repair_validations Owner do
+      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
+      o = Owner.new('name' => 'nopets')
+      assert !o.save
+      assert o.errors[:pets].any?
+      o.pets.build('name' => 'apet')
+      assert o.valid?
+    end
+  end
+
+  def test_validates_size_of_association_using_within
+    repair_validations Owner do
+      assert_nothing_raised { Owner.validates_size_of :pets, :within => 1..2 }
+      o = Owner.new('name' => 'nopets')
+      assert !o.save
+      assert o.errors[:pets].any?
+
+      o.pets.build('name' => 'apet')
+      assert o.valid?
+
+      2.times { o.pets.build('name' => 'apet') }
+      assert !o.save
+      assert o.errors[:pets].any?
+    end
+  end
+
+  def test_validates_size_of_association_utf8
+    repair_validations Owner do
+      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
+      o = Owner.new('name' => 'あいうえおかきくけこ')
+      assert !o.save
+      assert o.errors[:pets].any?
+      o.pets.build('name' => 'あいうえおかきくけこ')
+      assert o.valid?
+    end
+  end
+end
-- 
cgit v1.2.3