From a1c65f0518fb9fc8d540b661ec6c88d4786d4e28 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 12 Dec 2013 17:52:03 +1100 Subject: [PATCH] Gets that naggy unit test passing --- src/Umbraco.Tests/ObjectExtensionsTests.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Tests/ObjectExtensionsTests.cs b/src/Umbraco.Tests/ObjectExtensionsTests.cs index a130137569..8645a4fd23 100644 --- a/src/Umbraco.Tests/ObjectExtensionsTests.cs +++ b/src/Umbraco.Tests/ObjectExtensionsTests.cs @@ -12,13 +12,13 @@ using Umbraco.Tests.TestHelpers; namespace Umbraco.Tests { [TestFixture] - public class ObjectExtensionsTests : AbstractPartialTrustFixture + public class ObjectExtensionsTests { - protected override void FixtureSetup() - { - base.FixtureSetup(); - TestHelper.SetupLog4NetForTests(); - } + [TestFixtureSetUp] + protected virtual void FixtureSetup() + { + TestHelper.SetupLog4NetForTests(); + } [Test] public void CanParseStringToUnit() @@ -169,7 +169,8 @@ namespace Umbraco.Tests /// /// Run once before each test in derived test fixtures. /// - public override void TestSetup() + [SetUp] + public void TestSetup() { savedCulture = Thread.CurrentThread.CurrentCulture; Thread.CurrentThread.CurrentCulture = new CultureInfo("en-GB"); // make sure the dates parse correctly @@ -179,7 +180,8 @@ namespace Umbraco.Tests /// /// Run once after each test in derived test fixtures. /// - public override void TestTearDown() + [TearDown] + public void TestTearDown() { Thread.CurrentThread.CurrentCulture = savedCulture; return;