diff options
Diffstat (limited to 'activerecord/test')
-rwxr-xr-x | activerecord/test/associations_test.rb | 24 | ||||
-rwxr-xr-x | activerecord/test/deprecated_finder_test.rb (renamed from activerecord/test/finder_test.rb) | 145 | ||||
-rw-r--r-- | activerecord/test/fixtures/author.rb | 3 | ||||
-rw-r--r-- | activerecord/test/fixtures/authors.yml | 9 | ||||
-rw-r--r-- | activerecord/test/fixtures/comment.rb | 3 | ||||
-rw-r--r-- | activerecord/test/fixtures/comments.yml | 14 | ||||
-rw-r--r-- | activerecord/test/fixtures/courses.yml | 8 | ||||
-rw-r--r-- | activerecord/test/fixtures/db_definitions/sqlite.drop.sql | 4 | ||||
-rw-r--r-- | activerecord/test/fixtures/db_definitions/sqlite.sql | 18 | ||||
-rw-r--r-- | activerecord/test/fixtures/post.rb | 4 | ||||
-rw-r--r-- | activerecord/test/fixtures/posts.yml | 9 |
11 files changed, 90 insertions, 151 deletions
diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index c4f1022076..68245379ed 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -5,6 +5,9 @@ require 'fixtures/company' require 'fixtures/topic' require 'fixtures/reply' require 'fixtures/computer' +require 'fixtures/post' +require 'fixtures/comment' +require 'fixtures/author' # Can't declare new classes in test case methods, so tests before that bad_collection_keys = false @@ -203,8 +206,9 @@ end class HasManyAssociationsTest < Test::Unit::TestCase + fixtures :accounts, :companies, :developers, :projects, :developers_projects, :topics, :posts, :comments + def setup - create_fixtures "accounts", "companies", "developers", "projects", "developers_projects", "topics" @signals37 = Firm.find(1) end @@ -530,6 +534,24 @@ class HasManyAssociationsTest < Test::Unit::TestCase def test_adding_array_and_collection assert_nothing_raised { Firm.find_first.clients + Firm.find_all.last.clients } end + + def test_eager_association_loading_with_one_association + posts = Post.find(:all, :include => :comments) + assert_equal 2, posts.first.comments.size + assert_equal @greetings.body, posts.first.comments.first.body + end + + def test_eager_association_loading_with_multiple_associations + posts = Post.find(:all, :include => [ :comments, :author ]) + assert_equal 2, posts.first.comments.size + assert_equal @greetings.body, posts.first.comments.first.body + end + + def xtest_eager_association_loading_with_belongs_to + comments = Comment.find(:all, :include => :post) + assert_equal @welcome.title, comments.first.post.title + assert_equal @thinking.title, comments.last.post.title + end end class BelongsToAssociationsTest < Test::Unit::TestCase diff --git a/activerecord/test/finder_test.rb b/activerecord/test/deprecated_finder_test.rb index 6b6b58a9c8..c9bf7c7f43 100755 --- a/activerecord/test/finder_test.rb +++ b/activerecord/test/deprecated_finder_test.rb @@ -7,33 +7,6 @@ require 'fixtures/developer' class FinderTest < Test::Unit::TestCase fixtures :companies, :topics, :entrants, :developers - def test_find - assert_equal(@topics["first"]["title"], Topic.find(1).title) - end - - def test_exists - assert (Topic.exists?(1)) - assert !(Topic.exists?(45)) - assert !(Topic.exists?("foo")) - assert !(Topic.exists?([1,2])) - end - - def test_find_by_array_of_one_id - assert_kind_of(Array, Topic.find([ 1 ])) - assert_equal(1, Topic.find([ 1 ]).length) - end - - def test_find_by_ids - assert_equal(2, Topic.find(1, 2).length) - assert_equal(@topics["second"]["title"], Topic.find([ 2 ]).first.title) - end - - def test_find_by_ids_missing_one - assert_raises(ActiveRecord::RecordNotFound) { - Topic.find(1, 2, 45) - } - end - def test_find_all_with_limit entrants = Entrant.find_all nil, "id ASC", 2 @@ -54,20 +27,6 @@ class FinderTest < Test::Unit::TestCase end end - def test_find_with_entire_select_statement - topics = Topic.find_by_sql "SELECT * FROM topics WHERE author_name = 'Mary'" - - assert_equal(1, topics.size) - assert_equal(@topics["second"]["title"], topics.first.title) - end - - def test_find_with_prepared_select_statement - topics = Topic.find_by_sql ["SELECT * FROM topics WHERE author_name = ?", "Mary"] - - assert_equal(1, topics.size) - assert_equal(@topics["second"]["title"], topics.first.title) - end - def test_find_first first = Topic.find_first "title = 'The First Topic'" assert_equal(@topics["first"]["title"], first.title) @@ -77,19 +36,6 @@ class FinderTest < Test::Unit::TestCase first = Topic.find_first "title = 'The First Topic!'" assert_nil(first) end - - def test_unexisting_record_exception_handling - assert_raises(ActiveRecord::RecordNotFound) { - Topic.find(1).parent - } - - Topic.find(2).parent - end - - def test_find_on_conditions - assert Topic.find(1, :conditions => "approved = 0") - assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => "approved = 1") } - end def test_deprecated_find_on_conditions assert Topic.find_on_conditions(1, "approved = 0") @@ -126,15 +72,6 @@ class FinderTest < Test::Unit::TestCase assert Company.find_first(["name = :name", {:name => "37signals' go'es agains"}]) end - def test_bind_arity - assert_nothing_raised { bind '' } - assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '', 1 } - - assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '?' } - assert_nothing_raised { bind '?', 1 } - assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '?', 1, 1 } - end - def test_named_bind_variables assert_equal '1', bind(':a', :a => 1) # ' ruby-mode assert_equal '1 1', bind(':a :a', :a => 1) # ' ruby-mode @@ -151,29 +88,6 @@ class FinderTest < Test::Unit::TestCase } end - def test_named_bind_arity - assert_nothing_raised { bind '', {} } - assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '', :a => 1 } - assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a', {} } # ' ruby-mode - assert_nothing_raised { bind ':a', :a => 1 } # ' ruby-mode - assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a', :a => 1, :b => 2 } # ' ruby-mode - assert_nothing_raised { bind ':a :a', :a => 1 } # ' ruby-mode - assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a :a', :a => 1, :b => 2 } # ' ruby-mode - end - - def test_bind_array - assert_equal '1,2,3', bind('?', [1, 2, 3]) - assert_equal %('a','b','c'), bind('?', %w(a b c)) - - assert_equal '1,2,3', bind(':a', :a => [1, 2, 3]) - assert_equal %('a','b','c'), bind(':a', :a => %w(a b c)) - end - - def test_string_sanitation - assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1") - assert_equal "'something; select table'", ActiveRecord::Base.sanitize("something; select table") - end - def test_count assert_equal(0, Entrant.count("id > 3")) assert_equal(1, Entrant.count(["id > ?", 2])) @@ -186,65 +100,6 @@ class FinderTest < Test::Unit::TestCase assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1])) end - def test_find_by_one_attribute - assert_equal @topics["first"].find, Topic.find_by_title("The First Topic") - assert_nil Topic.find_by_title("The First Topic!") - end - - def test_find_by_one_missing_attribute - assert_raises(NoMethodError) { Topic.find_by_undertitle("The First Topic!") } - end - - def test_find_by_two_attributes - assert_equal @topics["first"].find, Topic.find_by_title_and_author_name("The First Topic", "David") - assert_nil Topic.find_by_title_and_author_name("The First Topic", "Mary") - end - - def test_find_all_by_one_attribute - topics = Topic.find_all_by_content("Have a nice day") - assert_equal 2, topics.size - assert topics.include?(@topics["first"].find) - - assert_equal [], Topic.find_all_by_title("The First Topic!!") - end - - def test_find_all_by_boolean_attribute - topics = Topic.find_all_by_approved(false) - assert_equal 1, topics.size - assert topics.include?(@topics["first"].find) - - topics = Topic.find_all_by_approved(true) - assert_equal 1, topics.size - assert topics.include?(@topics["second"].find) - end - - def test_find_by_nil_attribute - topic = Topic.find_by_last_read nil - assert_not_nil topic - assert_nil topic.last_read - end - - def test_find_all_by_nil_attribute - topics = Topic.find_all_by_last_read nil - assert_equal 1, topics.size - assert_nil topics[0].last_read - end - - def test_find_by_nil_and_not_nil_attributes - topic = Topic.find_by_last_read_and_author_name nil, "Mary" - assert_equal "Mary", topic.author_name - end - - def test_find_all_by_nil_and_not_nil_attributes - topics = Topic.find_all_by_last_read_and_author_name nil, "Mary" - assert_equal 1, topics.size - assert_equal "Mary", topics[0].author_name - end - - def test_find_with_bad_sql - assert_raises(ActiveRecord::StatementInvalid) { Topic.find_by_sql "select 1 from badtable" } - end - def test_find_all_with_limit first_five_developers = Developer.find_all nil, 'id ASC', 5 assert_equal 5, first_five_developers.length diff --git a/activerecord/test/fixtures/author.rb b/activerecord/test/fixtures/author.rb new file mode 100644 index 0000000000..8d12190086 --- /dev/null +++ b/activerecord/test/fixtures/author.rb @@ -0,0 +1,3 @@ +class Author < ActiveRecord::Base + belongs_to :post +end
\ No newline at end of file diff --git a/activerecord/test/fixtures/authors.yml b/activerecord/test/fixtures/authors.yml new file mode 100644 index 0000000000..718c317c37 --- /dev/null +++ b/activerecord/test/fixtures/authors.yml @@ -0,0 +1,9 @@ +david: + id: 1 + post_id: 1 + name: David + +mary: + id: 2 + post_id: 2 + name: Mary diff --git a/activerecord/test/fixtures/comment.rb b/activerecord/test/fixtures/comment.rb new file mode 100644 index 0000000000..662b7db66b --- /dev/null +++ b/activerecord/test/fixtures/comment.rb @@ -0,0 +1,3 @@ +class Comment < ActiveRecord::Base + belongs_to :post +end
\ No newline at end of file diff --git a/activerecord/test/fixtures/comments.yml b/activerecord/test/fixtures/comments.yml new file mode 100644 index 0000000000..f970806b0b --- /dev/null +++ b/activerecord/test/fixtures/comments.yml @@ -0,0 +1,14 @@ +greetings: + id: 1 + post_id: 1 + body: Thank you for the welcome + +more_greetings: + id: 2 + post_id: 1 + body: Thank you again for the welcome + +does_it_hurt: + id: 3 + post_id: 2 + body: Don't think too hard
\ No newline at end of file diff --git a/activerecord/test/fixtures/courses.yml b/activerecord/test/fixtures/courses.yml index d4c0e3cfb9..5ee1916003 100644 --- a/activerecord/test/fixtures/courses.yml +++ b/activerecord/test/fixtures/courses.yml @@ -1,7 +1,7 @@ -java: - id: 2 - name: Java Development - ruby: id: 1 name: Ruby Development + +java: + id: 2 + name: Java Development diff --git a/activerecord/test/fixtures/db_definitions/sqlite.drop.sql b/activerecord/test/fixtures/db_definitions/sqlite.drop.sql index 1f611c8d5a..3fd60de17b 100644 --- a/activerecord/test/fixtures/db_definitions/sqlite.drop.sql +++ b/activerecord/test/fixtures/db_definitions/sqlite.drop.sql @@ -15,4 +15,6 @@ DROP TABLE mixins; DROP TABLE people; DROP TABLE binaries; DROP TABLE computers; - +DROP TABLE posts; +DROP TABLE comments; +DROP TABLE authors; diff --git a/activerecord/test/fixtures/db_definitions/sqlite.sql b/activerecord/test/fixtures/db_definitions/sqlite.sql index d57c3889e0..a6f2efcbfe 100644 --- a/activerecord/test/fixtures/db_definitions/sqlite.sql +++ b/activerecord/test/fixtures/db_definitions/sqlite.sql @@ -116,3 +116,21 @@ CREATE TABLE 'computers' ( 'developer' INTEGER NOT NULL ); +CREATE TABLE 'posts' ( + 'id' INTEGER NOT NULL PRIMARY KEY, + 'title' VARCHAR(255) NOT NULL, + 'body' TEXT NOT NULL +); + +CREATE TABLE 'comments' ( + 'id' INTEGER NOT NULL PRIMARY KEY, + 'post_id' INTEGER NOT NULL, + 'body' TEXT NOT NULL +); + +CREATE TABLE 'authors' ( + 'id' INTEGER NOT NULL PRIMARY KEY, + 'post_id' INTEGER NOT NULL, + 'name' VARCHAR(255) NOT NULL +); + diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/fixtures/post.rb new file mode 100644 index 0000000000..1fd78b8343 --- /dev/null +++ b/activerecord/test/fixtures/post.rb @@ -0,0 +1,4 @@ +class Post < ActiveRecord::Base + has_many :comments + has_one :author +end
\ No newline at end of file diff --git a/activerecord/test/fixtures/posts.yml b/activerecord/test/fixtures/posts.yml new file mode 100644 index 0000000000..21a110ef91 --- /dev/null +++ b/activerecord/test/fixtures/posts.yml @@ -0,0 +1,9 @@ +welcome: + id: 1 + title: Welcome to the weblog + body: Such a lovely day + +thinking: + id: 2 + title: So I was thinking + body: Like I hopefully always am |