Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnirudh Agnihotry <anirudhagnihotry098@gmail.com>2018-04-10 00:15:45 +0300
committerGitHub <noreply@github.com>2018-04-10 00:15:45 +0300
commit753f4c18e8243e177a175bf6f82b158c12925b51 (patch)
tree7f34fa0544738de3e77732d578b79db6b77fa3a0 /src
parent06fb4889ad2d042b96318e765956588fa9199e46 (diff)
Data.Common tests fixed for non english windows (#28872)
Diffstat (limited to 'src')
-rw-r--r--src/System.Data.Common/tests/System/Data/DataColumnTest2.cs4
-rw-r--r--src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs8
-rw-r--r--src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs13
-rw-r--r--src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs8
-rw-r--r--src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs12
-rw-r--r--src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs6
6 files changed, 25 insertions, 26 deletions
diff --git a/src/System.Data.Common/tests/System/Data/DataColumnTest2.cs b/src/System.Data.Common/tests/System/Data/DataColumnTest2.cs
index 15d5d78444..c5494805da 100644
--- a/src/System.Data.Common/tests/System/Data/DataColumnTest2.cs
+++ b/src/System.Data.Common/tests/System/Data/DataColumnTest2.cs
@@ -608,8 +608,8 @@ namespace System.Data.Tests
else
str = dr["expr"].ToString();
- if (str == "7.60")
- str = "7.6";
+ if (str == 7.60m.ToString())
+ str = 7.6.ToString();
Assert.Equal(temp, str);
}
diff --git a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs
index 47f709aac4..a44caa4927 100644
--- a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs
+++ b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDecimalTest.cs
@@ -253,10 +253,10 @@ Assert.False(true);
[Fact]
public void AdjustScale()
{
- Assert.Equal("6464.646400", SqlDecimal.AdjustScale(_test1, 2, false).Value.ToString());
- Assert.Equal("6464.65", SqlDecimal.AdjustScale(_test1, -2, true).Value.ToString());
- Assert.Equal("6464.64", SqlDecimal.AdjustScale(_test1, -2, false).Value.ToString());
- Assert.Equal("10000.000000000000", SqlDecimal.AdjustScale(_test2, 10, false).Value.ToString());
+ Assert.Equal(6464.646400m.ToString(), SqlDecimal.AdjustScale(_test1, 2, false).Value.ToString());
+ Assert.Equal(6464.65.ToString(), SqlDecimal.AdjustScale(_test1, -2, true).Value.ToString());
+ Assert.Equal(6464.64.ToString(), SqlDecimal.AdjustScale(_test1, -2, false).Value.ToString());
+ Assert.Equal(10000.000000000000m.ToString(), SqlDecimal.AdjustScale(_test2, 10, false).Value.ToString());
Assert.Equal("79228162514264337593543950335.00", SqlDecimal.AdjustScale(_test5, 2, false).ToString());
try
{
diff --git a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs
index 074e1ec9a5..478b6766b3 100644
--- a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs
+++ b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlDoubleTest.cs
@@ -30,7 +30,6 @@ using System.Globalization;
using System.IO;
using System.Xml;
using System.Xml.Serialization;
-
using Xunit;
namespace System.Data.Tests.SqlTypes
@@ -403,14 +402,14 @@ namespace System.Data.Tests.SqlTypes
}
// ToSqlString ()
- Assert.Equal("250", Test1.ToSqlString().Value);
- Assert.Equal("0", Test0.ToSqlString().Value);
- Assert.Equal("6.4E+65", Test2.ToSqlString().Value);
+ Assert.Equal(250.ToString(), Test1.ToSqlString().Value);
+ Assert.Equal(0.ToString(), Test0.ToSqlString().Value);
+ Assert.Equal(6.4E+65.ToString(), Test2.ToSqlString().Value);
// ToString ()
- Assert.Equal("250", Test1.ToString());
- Assert.Equal("0", Test0.ToString());
- Assert.Equal("6.4E+65", Test2.ToString());
+ Assert.Equal(250.ToString(), Test1.ToString());
+ Assert.Equal(0.ToString(), Test0.ToString());
+ Assert.Equal(6.4E+65.ToString(), Test2.ToString());
}
// OPERATORS
diff --git a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs
index 2b40b21a90..a703fb180c 100644
--- a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs
+++ b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlMoneyTest.cs
@@ -354,12 +354,12 @@ namespace System.Data.Tests.SqlTypes
Assert.Equal((float)6464.6464, _test1.ToSqlSingle().Value);
// ToSqlString ()
- Assert.Equal("6464.6464", _test1.ToSqlString().Value);
- Assert.Equal("90000.00", _test2.ToSqlString().Value);
+ Assert.Equal(6464.6464.ToString(), _test1.ToSqlString().Value);
+ Assert.Equal(90000.00m.ToString(), _test2.ToSqlString().Value);
// ToString ()
- Assert.Equal("6464.6464", _test1.ToString());
- Assert.Equal("90000.00", _test2.ToString());
+ Assert.Equal(6464.6464.ToString(), _test1.ToString());
+ Assert.Equal(90000.00m.ToString(), _test2.ToString());
}
// OPERATORS
diff --git a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs
index c2ec520b03..d235759383 100644
--- a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs
+++ b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlSingleTest.cs
@@ -390,14 +390,14 @@ namespace System.Data.Tests.SqlTypes
// ToSqlString ()
- Assert.Equal("250", Test1.ToSqlString().Value);
- Assert.Equal("0", Test0.ToSqlString().Value);
- Assert.Equal("6.4E+17", Test2.ToSqlString().Value);
+ Assert.Equal(250.ToString(), Test1.ToSqlString().Value);
+ Assert.Equal(0.ToString(), Test0.ToSqlString().Value);
+ Assert.Equal(6.4E+17.ToString(), Test2.ToSqlString().Value);
// ToString ()
- Assert.Equal("250", Test1.ToString());
- Assert.Equal("0", Test0.ToString());
- Assert.Equal("6.4E+17", Test2.ToString());
+ Assert.Equal(250.ToString(), Test1.ToString());
+ Assert.Equal(0.ToString(), Test0.ToString());
+ Assert.Equal(6.4E+17.ToString(), Test2.ToString());
}
// OPERATORS
diff --git a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs
index 9cd1709372..7be8cf7327 100644
--- a/src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs
+++ b/src/System.Data.Common/tests/System/Data/SqlTypes/SqlStringTest.cs
@@ -662,7 +662,7 @@ namespace System.Data.Tests.SqlTypes
public void SqlDoubleToSqlString()
{
SqlDouble TestDouble = new SqlDouble(64E+64);
- Assert.Equal("6.4E+65", ((SqlString)TestDouble).Value);
+ Assert.Equal(6.4E+65.ToString(), ((SqlString)TestDouble).Value);
}
[Fact]
@@ -728,14 +728,14 @@ namespace System.Data.Tests.SqlTypes
public void SqlMoneyToSqlString()
{
SqlMoney TestMoney = new SqlMoney(646464.6464);
- Assert.Equal("646464.6464", ((SqlString)TestMoney).Value);
+ Assert.Equal(646464.6464.ToString(), ((SqlString)TestMoney).Value);
}
[Fact]
public void SqlSingleToSqlString()
{
SqlSingle TestSingle = new SqlSingle(3E+20);
- Assert.Equal("3E+20", ((SqlString)TestSingle).Value);
+ Assert.Equal(3E+20.ToString(), ((SqlString)TestSingle).Value);
}
[Fact]