From 94cc49e67ee8eb5f3c8790650e18643c598cfe8b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 15 Nov 2013 17:15:59 +1100
Subject: [PATCH] Fixed the model mapping tests

---
 .../UmbracoSettings/SecurityElement.cs            |  2 +-
 .../UmbracoSettings/SecurityElementTests.cs       |  2 +-
 .../Models/Mapping/ContentWebModelMappingTests.cs | 12 ++++++------
 .../TestHelpers/BaseDatabaseFactoryTest.cs        | 15 +++------------
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs
index d3160a216b..33a8a8584b 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
                 return new OptionalInnerTextConfigurationElement<bool>(
                     (InnerTextConfigurationElement<bool>)this["keepUserLoggedIn"],
                     //set the default
-                    false);   
+                    true);   
             }
         }
 
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
index 222f598011..219721c767 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public void KeepUserLoggedIn()
         {
-            Assert.IsTrue(SettingsSection.Security.KeepUserLoggedIn == false);
+            Assert.IsTrue(SettingsSection.Security.KeepUserLoggedIn == true);
         }
         [Test]
         public void HideDisabledUsersInBackoffice()
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
index 02849050bb..4d62dcf809 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
@@ -30,13 +30,13 @@ namespace Umbraco.Tests.Models.Mapping
             get { return DatabaseBehavior.NewSchemaPerFixture; }
         }
 
-        protected override void FreezeResolution()
-        {
-            //PropertyEditorResolver.Current = new PropertyEditorResolver(
-            //    () => new List<Type> {typeof (TestPropertyEditor)});
+        //protected override void FreezeResolution()
+        //{
+        //    PropertyEditorResolver.Current = new PropertyEditorResolver(
+        //        () => PluginManager.Current.ResolvePropertyEditors());
 
-            base.FreezeResolution();
-        }
+        //    base.FreezeResolution();
+        //}
 
         [Test]
         public void To_Media_Item_Simple()
diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index 7c918008c3..46caba40c5 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -80,18 +80,9 @@ namespace Umbraco.Tests.TestHelpers
 
             using (DisposableTimer.TraceDuration<BaseDatabaseFactoryTest>("init"))
             {
-                using (DisposableTimer.TraceDuration<BaseDatabaseFactoryTest>("DatabaseContext.Initialize"))
-                {
-                    DatabaseContext.Initialize(dbFactory.ProviderName, dbFactory.ConnectionString);
-                }
-                using (DisposableTimer.TraceDuration<BaseDatabaseFactoryTest>("CreateSqlCeDatabase"))
-                {
-                    CreateSqlCeDatabase();
-                }
-                using (DisposableTimer.TraceDuration<BaseDatabaseFactoryTest>("InitializeDatabase"))
-                {
-                    InitializeDatabase();
-                }
+                DatabaseContext.Initialize(dbFactory.ProviderName, dbFactory.ConnectionString);
+                CreateSqlCeDatabase();
+                InitializeDatabase();
 
                 //ensure the configuration matches the current version for tests
                 SettingsForTests.ConfigurationStatus = UmbracoVersion.Current.ToString(3);