diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs index 8fe88761..c48153da 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConversionUtilsTests.cs @@ -31,18 +31,47 @@ namespace Spring.Core.TypeConversion /// This class contains tests for TypeConversionUtils /// /// Mark Pollack + /// Andreas Kluth [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 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( testDelegate ); + } + + [Test] + [SetCulture( "nl-NL" )] + public void ConvertValueWithDutchCultureForDecimalMarkWithPointReturnsValue() + { + object o = TypeConversionUtils.ConvertValueIfNecessary( typeof( Double ), "1.2", "foo" ); + Assert.That( o, Is.EqualTo( 1.2 ) ); + } + + [Test] + [SetCulture( "nl-NL" )] + public void ConvertValueWithDutchCultureForDecimalMarkWithCommaReturnsValue() + { + 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 @@ + 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 @@ +