From afb5ca67ac014356427e579df99a0774a6378a1f Mon Sep 17 00:00:00 2001 From: Steve Bohlen Date: Tue, 24 Nov 2015 19:30:34 -0500 Subject: [PATCH] fix ResouceSetMessageSourceTests for Windows 10 Build 10586 --- .../Support/ResourceSetMessageSourceTests.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs index e9f1c5fe..7d68f5e0 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs @@ -274,10 +274,22 @@ namespace Spring.Context.Support Assert.AreEqual("Ovo je Spring.NET", msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianLatinCultureName), new object[] { "Spring", ".NET" }), "message not as expected"); - Assert.AreEqual("Ово је Spring.NET", + + if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586) + { + Assert.AreEqual("Ovo je Spring.NET", msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName), new object[] { "Spring", ".NET" }), "message not as expected"); + } + else + { + Assert.AreEqual("Ово је Spring.NET", + msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName), + new object[] { "Spring", ".NET" }), "message not as expected"); + } + + Assert.AreEqual("Visual Studio voli Spring.NET", msgSource.GetMessage("MyNewMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName), new object[] { "Spring", ".NET" }), "message not as expected"); @@ -417,7 +429,7 @@ namespace Spring.Context.Support //Repeat the test for the first resource manager Assert.AreEqual("This is Spring.NET", - messageSource.GetMessage("MyMessage", new CultureInfo("en"), new object[] { "Spring", ".NET" }), "message not as expected"); + messageSource.GetMessage("MyMessage", new CultureInfo("en"), new object[] { "Spring", ".NET" }), "message not as expected"); //Now with the newly added one Assert.AreEqual("Hello Mr. Anderson",