Convention test tweaks and addition

Jeff Treuting · Jeff Treuting · commit 2ed9251ac5d8 · 2013-05-10T13:16:38.000-07:00
diff --git a/SharpRepository.Tests.Integration/Spikes/ConventionSpikes.cs b/SharpRepository.Tests.Integration/Spikes/ConventionSpikes.cs
@@ -9,6 +9,24 @@ namespace SharpRepository.Tests.Integration.Spikes
     [TestFixture]
     public class ConventionSpikes
     {
+        [Test]
+        public void Changed_Default_Suffix_To_Key_Should_Work()
+        {
+            var origSuffix = DefaultRepositoryConventions.PrimaryKeySuffix;
+
+            DefaultRepositoryConventions.PrimaryKeySuffix = "Key";
+            var repository = new InMemoryRepository<ConventionTestItem1>();
+
+            var item = new ConventionTestItem1() { Name = "Test1" };
+            repository.Add(item);
+
+            // The PK should have been found and updated so it's not zero anymore
+            item.ConventionTestItem1Key.ShouldNotEqual(0);
+
+            // reset convention to the default orig for the rest of the tests
+            DefaultRepositoryConventions.PrimaryKeySuffix = origSuffix;
+        }
+
         [Test]
         public void Changed_Convention_To_Key_Should_Work()
         {
@@ -17,10 +35,11 @@ public void Changed_Convention_To_Key_Should_Work()
             DefaultRepositoryConventions.GetPrimaryKeyName = type => type.Name + "Key";
             var repository = new InMemoryRepository<ConventionTestItem1>();
 
-            var testItem1 = new ConventionTestItem1() { Name = "Test1" };
-            repository.Add(testItem1);
+            var item = new ConventionTestItem1() { Name = "Test1" };
+            repository.Add(item);
 
-            testItem1.ConventionTestItem1Key.ShouldNotEqual(0);
+            // The PK should have been found and updated so it's not zero anymore
+            item.ConventionTestItem1Key.ShouldNotEqual(0);
 
             // reset convention to the default orig for the rest of the tests
             DefaultRepositoryConventions.GetPrimaryKeyName = origConvention;
@@ -32,10 +51,11 @@ public void Changed_Convention_To_Key_Should_Work_Just_Key_Property()
             var repository = new InMemoryRepository<ConventionTestItem2>();
             repository.Conventions.GetPrimaryKeyName = _ => "Key";
 
-            var testItem1 = new ConventionTestItem2() { Name = "Test1" };
-            repository.Add(testItem1);
+            var item = new ConventionTestItem2() { Name = "Test1" };
+            repository.Add(item);
 
-            testItem1.Key.ShouldNotEqual(0);
+            // The PK should have been found and updated so it's not zero anymore
+            item.Key.ShouldNotEqual(0);
         }
 
         [Test]
@@ -44,10 +64,11 @@ public void Changed_Convention_To_SomeRandomPrimaryKeyProperty_Should_Work()
             var repository = new InMemoryRepository<ConventionTestItem3>();
             repository.Conventions.GetPrimaryKeyName = _ =>  "SomeRandomPrimaryKeyProperty" ;
 
-            var testItem1 = new ConventionTestItem3() { Name = "Test1" };
-            repository.Add(testItem1);
+            var item = new ConventionTestItem3() { Name = "Test1" };
+            repository.Add(item);
 
-            testItem1.SomeRandomPrimaryKeyProperty.ShouldNotEqual(0);
+            // The PK should have been found and updated so it's not zero anymore
+            item.SomeRandomPrimaryKeyProperty.ShouldNotEqual(0);
         }
     }
 }
diff --git a/SharpRepository.Tests/Conventions/DefaultConventionTests.cs b/SharpRepository.Tests/Conventions/DefaultConventionTests.cs
@@ -27,9 +27,29 @@ public void RepositoryConventions_Uses_Default_PrimaryKeySuffix()
         }
 
         [Test]
-        public void Default_PrimaryKeyNameChecks()
+        public void Default_PrimaryKeyName()
         {
             DefaultRepositoryConventions.GetPrimaryKeyName(typeof (Contact)).ShouldEqual("ContactId");
         }
+
+        [Test]
+        public void Change_PrimaryKeyName()
+        {
+            var orig = DefaultRepositoryConventions.GetPrimaryKeyName;
+
+            DefaultRepositoryConventions.GetPrimaryKeyName = type => "PK_" + type.Name + "_Id";
+
+            DefaultRepositoryConventions.GetPrimaryKeyName(typeof(TestConventionObject)).ShouldEqual("PK_TestConventionObject_Id");
+
+            DefaultRepositoryConventions.GetPrimaryKeyName = orig;
+        }
+
+        internal class TestConventionObject
+        {
+            public int PK_TestConventionObject_Id { get; set; }
+            public string Name { get; set; }
+        }
     }
+
+    
 }
