Merged master back into v3.4 for VS2010 support.

Merge branch 'master' into v3.4

1 files changed, 6 insertions, 4 deletions

diff --git a/src/DotNetOpenAuth.Test/LocalizationTests.cs b/src/DotNetOpenAuth.Test/LocalizationTests.cs
index 50e9a34..4920deb 100644
--- a/src/DotNetOpenAuth.Test/LocalizationTests.cs
+++ b/src/DotNetOpenAuth.Test/LocalizationTests.cs
@@ -8,19 +8,21 @@ namespace DotNetOpenAuth.Test {
 	using System;
 	using System.Globalization;
 	using System.Threading;
+	using System.Web;
 	using DotNetOpenAuth.Messaging;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
+	using NUnit.Framework;
 
 	/// <summary>
 	/// Tests various localized resources work as expected.
 	/// </summary>
-	[TestClass]
-	public class LocalizationTests {
+	[TestFixture]
+	public class LocalizationTests : TestBase {
 		/// <summary>
 		/// Tests that Serbian localized strings are correctly installed.
 		/// </summary>
-		[TestMethod, ExpectedException(typeof(InvalidOperationException), "Ovaj metod zahteva tekući HttpContext. Kao alternativa, koristite preklopljeni metod koji dozvoljava da se prosledi informacija bez HttpContext-a.")]
+		[TestCase, ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "Ovaj metod zahteva tekući HttpContext. Kao alternativa, koristite preklopljeni metod koji dozvoljava da se prosledi informacija bez HttpContext-a.")]
 		public void Serbian() {
+			HttpContext.Current = null; // our testbase initializes this, but it must be null to throw
 			Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("sr");
 			ErrorUtilities.VerifyHttpContext();
 		}