From c265d4b014c0c7f30ff6e1ad743da6eb8af619a7 Mon Sep 17 00:00:00 2001
From: Andreas Kluth <mail@andreaskluth.net>
Date: Mon, 8 Oct 2012 23:52:10 +0200
Subject: [PATCH 1/2] SPRNET-1495 - Add unit tests to document existing
 behavior.

---
 .../TypeConversionUtilsTests.cs               | 31 ++++++++++++++++---
 .../Spring.Core.Tests.2008.csproj             |  1 +
 .../Spring.Core.Tests.2010.csproj             |  1 +
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs
index 8fe88761..f6979a34 100644
--- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs
@@ -31,18 +31,39 @@ namespace Spring.Core.TypeConversion
     /// This class contains tests for TypeConversionUtils
     /// </summary>
     /// <author>Mark Pollack</author>
+    /// <author>Andreas Kluth</author>
     [TestFixture]
     public class TypeConversionUtilsTests
     {
-
-#if NET_2_0
         [Test]
         public void NullAbleTest()
         {
             object o = TypeConversionUtils.ConvertValueIfNecessary(typeof(DateTime?), "", "bla");
             Assert.IsNull(o);
-        } 
-#endif
-        
+        }
+
+        [Test]
+        [SetCulture( "en-US" )]
+        public void ConvertValue_ForDecimalMarkWithComma_FailsWithBritishCulture()
+        {
+          TestDelegate testDelegate = () => TypeConversionUtils.ConvertValueIfNecessary( typeof( Double ), "1,2", "foo" );
+          Assert.Throws<TypeMismatchException>( testDelegate );
+        }
+
+        [Test]
+        [SetCulture( "nl-NL" )]
+        public void ConvertValue_ForDecimalMarkWithPoint_ReturnsValueWithDutchCulture()
+        {
+          object o = TypeConversionUtils.ConvertValueIfNecessary( typeof( Double ), "1.2", "foo" );
+          Assert.That( o, Is.EqualTo( 1.2 ) );
+        }
+
+        [Test]
+        [SetCulture( "nl-NL" )]
+        public void ConvertValue_ForDecimalMarkWithComma_ReturnsValueWithDutchCulture()
+        {
+          object o = TypeConversionUtils.ConvertValueIfNecessary( typeof( Double ), "1,2", "foo" );
+          Assert.That( o, Is.EqualTo( 1.2 ) );
+        }
     }
 }
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
index d211800e..58723712 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
@@ -265,6 +265,7 @@
     <Compile Include="Core\TypeConversion\StreamConverterTests.cs" />
     <Compile Include="Core\TypeConversion\StringArrayConverterTests.cs" />
     <Compile Include="Core\TypeConversion\TimeSpanConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\TypeConversionUtilsTests.cs" />
     <Compile Include="Core\TypeConversion\TypeConverterRegistryTests.cs" />
     <Compile Include="Core\TypeConversion\UriConverterTests.cs" />
     <Compile Include="Core\TypeResolution\CachedTypeResolverTests.cs" />
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
index 521fedd1..1abe6791 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
@@ -267,6 +267,7 @@
     <Compile Include="Core\TypeConversion\StreamConverterTests.cs" />
     <Compile Include="Core\TypeConversion\StringArrayConverterTests.cs" />
     <Compile Include="Core\TypeConversion\TimeSpanConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\TypeConversionUtilsTests.cs" />
     <Compile Include="Core\TypeConversion\TypeConverterRegistryTests.cs" />
     <Compile Include="Core\TypeConversion\UriConverterTests.cs" />
     <Compile Include="Core\TypeResolution\CachedTypeResolverTests.cs" />

From 1f69127cc56036372bb72c6470e0bf36bf0fe8ad Mon Sep 17 00:00:00 2001
From: Andreas Kluth <mail@andreaskluth.net>
Date: Tue, 9 Oct 2012 00:14:38 +0200
Subject: [PATCH 2/2] SPRNET-1495 Addition of another test. Housekeeping.

---
 .../TypeConversion/TypeConversionUtilsTests.cs     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs
index f6979a34..c48153da 100644
--- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs
@@ -44,7 +44,15 @@ namespace Spring.Core.TypeConversion
 
         [Test]
         [SetCulture( "en-US" )]
-        public void ConvertValue_ForDecimalMarkWithComma_FailsWithBritishCulture()
+        public void ConvertValueForDecimalMarkWithPointReturnsValue()
+        {
+          object o = TypeConversionUtils.ConvertValueIfNecessary( typeof( Double ), "1.2", "foo" );
+          Assert.That( o, Is.EqualTo( 1.2 ) );
+        }
+
+        [Test]
+        [SetCulture( "en-US" )]
+        public void ConvertValueForDecimalMarkWithCommaFails()
         {
           TestDelegate testDelegate = () => TypeConversionUtils.ConvertValueIfNecessary( typeof( Double ), "1,2", "foo" );
           Assert.Throws<TypeMismatchException>( testDelegate );
@@ -52,7 +60,7 @@ namespace Spring.Core.TypeConversion
 
         [Test]
         [SetCulture( "nl-NL" )]
-        public void ConvertValue_ForDecimalMarkWithPoint_ReturnsValueWithDutchCulture()
+        public void ConvertValueWithDutchCultureForDecimalMarkWithPointReturnsValue()
         {
           object o = TypeConversionUtils.ConvertValueIfNecessary( typeof( Double ), "1.2", "foo" );
           Assert.That( o, Is.EqualTo( 1.2 ) );
@@ -60,7 +68,7 @@ namespace Spring.Core.TypeConversion
 
         [Test]
         [SetCulture( "nl-NL" )]
-        public void ConvertValue_ForDecimalMarkWithComma_ReturnsValueWithDutchCulture()
+        public void ConvertValueWithDutchCultureForDecimalMarkWithCommaReturnsValue()
         {
           object o = TypeConversionUtils.ConvertValueIfNecessary( typeof( Double ), "1,2", "foo" );
           Assert.That( o, Is.EqualTo( 1.2 ) );