From: <sv...@ca...> - 2005-10-27 09:20:55
|
User: ayende Date: 2005/10/27 05:15 AM Modified: /trunk/ActiveRecord/Castle.ActiveRecord.Tests/ ActiveRecordGenericsTestCase.cs /trunk/ActiveRecord/Castle.ActiveRecord/ Castle.ActiveRecord-2.0.csproj Log: Updating to make the build pass on .Net 2.0 File Changes: Directory: /trunk/ActiveRecord/Castle.ActiveRecord/ =================================================== File [modified]: Castle.ActiveRecord-2.0.csproj Delta lines: +2 -2 =================================================================== --- trunk/ActiveRecord/Castle.ActiveRecord/Castle.ActiveRecord-2.0.csproj 2005-10-27 02:38:27 UTC (rev 1233) +++ trunk/ActiveRecord/Castle.ActiveRecord/Castle.ActiveRecord-2.0.csproj 2005-10-27 09:15:56 UTC (rev 1234) @@ -217,6 +217,8 @@ <Compile Include="Framework\ActiveRecordException.cs"> <SubType>Code</SubType> </Compile> + <Compile Include="Framework\ActiveRecordMediator.cs" /> + <Compile Include="Framework\ActiveRecordMediator.Generic.cs" /> <Compile Include="Framework\ActiveRecordStarter.cs"> <SubType>Code</SubType> </Compile> @@ -238,8 +240,6 @@ <Compile Include="Framework\DictionaryAdapter.cs"> <SubType>Code</SubType> </Compile> - <Compile Include="Framework\DomainModel.cs" /> - <Compile Include="Framework\DomainModel.Generic.cs" /> <Compile Include="Framework\HookDispatcher.cs"> <SubType>Code</SubType> </Compile> Directory: /trunk/ActiveRecord/Castle.ActiveRecord.Tests/ ========================================================= File [modified]: ActiveRecordGenericsTestCase.cs Delta lines: +24 -24 =================================================================== --- trunk/ActiveRecord/Castle.ActiveRecord.Tests/ActiveRecordGenericsTestCase.cs 2005-10-27 02:38:27 UTC (rev 1233) +++ trunk/ActiveRecord/Castle.ActiveRecord.Tests/ActiveRecordGenericsTestCase.cs 2005-10-27 09:15:56 UTC (rev 1234) @@ -41,17 +41,17 @@ typeof(Person)); Recreate(); - DomainModel<Post>.DeleteAll(); - DomainModel<Blog>.DeleteAll(); - DomainModel<Company>.DeleteAll(); - DomainModel<Award>.DeleteAll(); - DomainModel<Employee>.DeleteAll(); + ActiveRecordMediator<Post>.DeleteAll(); + ActiveRecordMediator<Blog>.DeleteAll(); + ActiveRecordMediator<Company>.DeleteAll(); + ActiveRecordMediator<Award>.DeleteAll(); + ActiveRecordMediator<Employee>.DeleteAll(); } [Test] public void SimpleOperations() { - Blog[] blogs = DomainModel<Blog>.FindAll(); + Blog[] blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(0, blogs.Length); @@ -61,7 +61,7 @@ blog.Author = "hamilton verissimo"; blog.Save(); - blogs = DomainModel<Blog>.FindAll(); + blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(1, blogs.Length); @@ -90,14 +90,14 @@ post3.Published = true; post3.Save(); - Post[] posts = DomainModel<Post>.FindAll(Expression.Eq("Blog", blog), 1, 2); + Post[] posts = ActiveRecordMediator<Post>.FindAll(Expression.Eq("Blog", blog), 1, 2); Assert.AreEqual(2, posts.Length); } [Test] public void SimpleOperations2() { - Blog[] blogs = DomainModel<Blog>.FindAll(); + Blog[] blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(0, blogs.Length); @@ -107,7 +107,7 @@ blog.Author = "hamilton verissimo"; blog.Create(); - blogs = DomainModel<Blog>.FindAll(); + blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.AreEqual(blog.Name, blogs[0].Name); Assert.AreEqual(blog.Author, blogs[0].Author); @@ -118,7 +118,7 @@ blog.Author = "something else2"; blog.Update(); - blogs = DomainModel<Blog>.FindAll(); + blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(1, blogs.Length); @@ -134,7 +134,7 @@ "Embau St., 102", "Sao Paulo", "SP", "040390-060"); company.Save(); - Company[] companies = DomainModel<Company>.FindAll(); + Company[] companies = ActiveRecordMediator<Company>.FindAll(); Assert.IsNotNull(companies); Assert.AreEqual(1, companies.Length); @@ -160,7 +160,7 @@ post1.Save(); post2.Save(); - blog = DomainModel<Blog>.Find(blog.Id); + blog = ActiveRecordMediator<Blog>.Find(blog.Id); Assert.IsNotNull(blog); Assert.IsNotNull(blog.Posts, "posts collection is null"); @@ -191,7 +191,7 @@ post3.Published = true; post3.Save(); - blog = DomainModel<Blog>.Find(blog.Id); + blog = ActiveRecordMediator<Blog>.Find(blog.Id); Assert.IsNotNull(blog); Assert.AreEqual(2, blog.UnPublishedPosts.Count); @@ -211,15 +211,15 @@ emp.LastName = "doe"; emp.Save(); - Assert.AreEqual(1, DomainModel<Employee>.FindAll().Length); + Assert.AreEqual(1, ActiveRecordMediator<Employee>.FindAll().Length); Award award = new Award(emp); award.Description = "Invisible employee"; award.Save(); - Assert.AreEqual(1, DomainModel <Award>.FindAll().Length); + Assert.AreEqual(1, ActiveRecordMediator<Award>.FindAll().Length); - Employee emp2 = DomainModel <Employee>.Find(emp.ID); + Employee emp2 = ActiveRecordMediator<Employee>.Find(emp.ID); Assert.IsNotNull(emp2); Assert.IsNotNull(emp2.Award); Assert.AreEqual(emp.FirstName, emp2.FirstName); @@ -231,13 +231,13 @@ [ExpectedException(typeof(NotFoundException))] public void FindLoad() { - DomainModel<Blog>.Find(1); + ActiveRecordMediator<Blog>.Find(1); } [Test] public void SaveUpdate() { - Blog[] blogs = DomainModel<Blog>.FindAll(); + Blog[] blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(0, blogs.Length); @@ -247,7 +247,7 @@ blog.Author = "hamilton verissimo"; blog.Save(); - blogs = DomainModel<Blog>.FindAll(); + blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(1, blogs.Length); @@ -256,7 +256,7 @@ blog.Author = "changed too"; blog.Save(); - blogs = DomainModel<Blog>.FindAll(); + blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(1, blogs.Length); @@ -268,7 +268,7 @@ [Test] public void Delete() { - Blog[] blogs = DomainModel<Blog>.FindAll(); + Blog[] blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(0, blogs.Length); @@ -278,14 +278,14 @@ blog.Author = "hamilton verissimo"; blog.Save(); - blogs = DomainModel<Blog>.FindAll(); + blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(1, blogs.Length); blog.Delete(); - blogs = DomainModel<Blog>.FindAll(); + blogs = ActiveRecordMediator<Blog>.FindAll(); Assert.IsNotNull(blogs); Assert.AreEqual(0, blogs.Length); |