Fix dirty tests

mythz · mythz · commit fe37d51e01f8 · 2019-06-19T23:11:52.000-04:00
diff --git a/src/ServiceStack.Text/AutoMappingUtils.cs b/src/ServiceStack.Text/AutoMappingUtils.cs
@@ -66,6 +66,7 @@ internal static readonly ConcurrentDictionary<Tuple<Type, Type>,bool> ignoreMapp
         public static void Reset()
         {
             converters.Clear();
+            populators.Clear();
             ignoreMappings.Clear();
             AssignmentDefinitionCache.Clear();
         }
diff --git a/tests/ServiceStack.Text.Tests/AutoMappingPopulatorTests.cs b/tests/ServiceStack.Text.Tests/AutoMappingPopulatorTests.cs
@@ -4,28 +4,24 @@ namespace ServiceStack.Text.Tests
 {
     public class AutoMappingPopulatorTests
     {
-        private static User CreateUser() =>
-            new User {
+        public class UserData
+        {
+            public string FirstName { get; set; }
+            public string LastName { get; set; }
+            public Car Car { get; set; }
+        }
+        
+        private static UserData CreateUser() =>
+            new UserData {
                 FirstName = "John",
                 LastName = "Doe",
                 Car = new Car {Name = "BMW X6", Age = 3}
             };
 
-        private static UsersData CreateUserData()
-        {
-            var user = CreateUser();
-            return new UsersData {
-                Id = 1,
-                User = user,
-                UsersList = {user},
-                UsersMap = {{1, user}}
-            };
-        }
-
         [Test]
         public void Does_call_populator_for_PopulateWith()
         {
-            AutoMapping.RegisterPopulator((UserDto target, User source) => 
+            AutoMapping.RegisterPopulator((UserDto target, UserData source) => 
                 target.LastName += "?!");
 
             var user = CreateUser();
@@ -38,7 +34,7 @@ public void Does_call_populator_for_PopulateWith()
         [Test]
         public void Does_call_populator_for_PopulateWithNonDefaultValues()
         {
-            AutoMapping.RegisterPopulator((UserDto target, User source) => 
+            AutoMapping.RegisterPopulator((UserDto target, UserData source) => 
                 target.LastName += "?!");
 
             var user = CreateUser();
@@ -51,7 +47,7 @@ public void Does_call_populator_for_PopulateWithNonDefaultValues()
         [Test]
         public void Does_call_populator_for_PopulateFromPropertiesWithoutAttribute()
         {
-            AutoMapping.RegisterPopulator((UserDto target, User source) => 
+            AutoMapping.RegisterPopulator((UserDto target, UserData source) => 
                 target.LastName += "?!");
 
             var user = CreateUser();
@@ -64,7 +60,7 @@ public void Does_call_populator_for_PopulateFromPropertiesWithoutAttribute()
         [Test]
         public void Does_call_populator_for_ConvertTo()
         {
-            AutoMapping.RegisterPopulator((UserDto target, User source) => 
+            AutoMapping.RegisterPopulator((UserDto target, UserData source) => 
                 target.LastName += "?!");
 
             var user = CreateUser();

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ internal static readonly ConcurrentDictionary<Tuple<Type, Type>,bool> ignoreMapp`
`66`	`66`	`public static void Reset()`
`67`	`67`	`{`
`68`	`68`	`converters.Clear();`
	`69`	`+ populators.Clear();`
`69`	`70`	`ignoreMappings.Clear();`
`70`	`71`	`AssignmentDefinitionCache.Clear();`
`71`	`72`	`}`