Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Enabling Globalization tests that currently pass on Unix. #4747

Merged
merged 2 commits into from
Dec 13, 2015
Merged

Enabling Globalization tests that currently pass on Unix. #4747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87c00a7
Enabling Globalization tests that currently pass on Unix.
eerhardt Nov 20, 2015
f92e75a
Fixing and enabling more Globalization tests now that String Comparis…
eerhardt Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/System.Globalization/tests/CompareInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public partial class CompareInfoTests
[InlineData("")]
[InlineData("en")]
[InlineData("en-US")]
[ActiveIssue(846, PlatformID.AnyUnix)]
public static void GetCompareInfo(string localeName)
{
CompareInfo ci = CompareInfo.GetCompareInfo(localeName);
Expand Down Expand Up @@ -361,7 +360,6 @@ public static void IsSuffixArgumentNullException()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public static void EqualsAndHashCode()
{
CompareInfo ciInvariantFromCultureInfo = CultureInfo.InvariantCulture.CompareInfo;
Expand Down
166 changes: 91 additions & 75 deletions src/System.Globalization/tests/CompareInfo/CompareInfoCompare.cs
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 1 addition & 8 deletions src/System.Globalization/tests/CompareInfo/CompareInfoIndexOf.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,12 @@ public class CompareInfoIndexOf
public void Test15() { Test(CultureInfo.InvariantCulture, "foobardzsdzs", "rddzs", -1, CompareOptions.Ordinal); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test16() { Test(s_turkish, "Hi", "I", -1, CompareOptions.IgnoreCase); }

[Fact]
public void Test17() { Test(CultureInfo.InvariantCulture, "Hi", "I", 1, CompareOptions.IgnoreCase); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test18() { Test(s_turkish, "Hi", "\u0130", 1, CompareOptions.IgnoreCase); }

[Fact]
Expand All @@ -85,14 +83,12 @@ public class CompareInfoIndexOf
public void Test23() { Test(CultureInfo.InvariantCulture, "Hi", "\u0130", -1, CompareOptions.None); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test24() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "A\u0300", 8, CompareOptions.None); }

[Fact]
public void Test25() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "A\u0300", -1, CompareOptions.Ordinal); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test26() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "a\u0300", 8, CompareOptions.IgnoreCase); }

[Fact]
Expand Down Expand Up @@ -124,16 +120,13 @@ public void Test32()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test33()
{
char unassignedUnicode = GetNextUnassignedUnicode();
Test(CultureInfo.InvariantCulture, "TestFooBA\u0300R", "Foo" + unassignedUnicode + "B\u00C0R", 4, CompareOptions.IgnoreNonSpace);
Test(CultureInfo.InvariantCulture, "TestFooBA\u0300R", "FooB\u00C0R", 4, CompareOptions.IgnoreNonSpace);
}

// Now IgnoreSymbols will not consider the ' ' as a Symbol
[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test34() { Test(CultureInfo.InvariantCulture, "More Test's", "Tests", 5, CompareOptions.IgnoreSymbols); }

[Fact]
Expand Down
9 changes: 1 addition & 8 deletions src/System.Globalization/tests/CompareInfo/CompareInfoIsPrefix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,12 @@ public class CompareInfoIsPrefix
public void Test15() { Test(CultureInfo.InvariantCulture, "dzsdzsfoobar", "ddzsf", false, CompareOptions.Ordinal); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test16() { Test(s_turkish, "interesting", "I", false, CompareOptions.IgnoreCase); }

[Fact]
public void Test17() { Test(CultureInfo.InvariantCulture, "interesting", "I", true, CompareOptions.IgnoreCase); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test18() { Test(s_turkish, "interesting", "\u0130", true, CompareOptions.IgnoreCase); }

[Fact]
Expand All @@ -85,14 +83,12 @@ public class CompareInfoIsPrefix
public void Test23() { Test(CultureInfo.InvariantCulture, "interesting", "\u0130", false, CompareOptions.None); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test24() { Test(CultureInfo.InvariantCulture, "\u00C0nimal", "A\u0300", true, CompareOptions.None); }

[Fact]
public void Test25() { Test(CultureInfo.InvariantCulture, "\u00C0nimal", "A\u0300", false, CompareOptions.Ordinal); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test26() { Test(CultureInfo.InvariantCulture, "\u00C0nimal", "a\u0300", true, CompareOptions.IgnoreCase); }

[Fact]
Expand Down Expand Up @@ -124,15 +120,12 @@ public void Test32()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test33()
{
char unassignedUnicode = GetNextUnassignedUnicode();
Test(CultureInfo.InvariantCulture, "FooBA\u0300R", "Foo" + unassignedUnicode + "B\u00C0R", true, CompareOptions.IgnoreNonSpace);
Test(CultureInfo.InvariantCulture, "FooBA\u0300R", "FooB\u00C0R", true, CompareOptions.IgnoreNonSpace);
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test34() { Test(CultureInfo.InvariantCulture, "Test's can be interesting", "Tests", true, CompareOptions.IgnoreSymbols); }

[Fact]
Expand Down
9 changes: 1 addition & 8 deletions src/System.Globalization/tests/CompareInfo/CompareInfoIsSuffix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,12 @@ public class CompareInfoIsSuffix
public void Test15() { Test(CultureInfo.InvariantCulture, "foobardzsdzs", "rddzs", false, CompareOptions.Ordinal); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test16() { Test(s_turkish, "Hi", "I", false, CompareOptions.IgnoreCase); }

[Fact]
public void Test17() { Test(CultureInfo.InvariantCulture, "Hi", "I", true, CompareOptions.IgnoreCase); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test18() { Test(s_turkish, "Hi", "\u0130", true, CompareOptions.IgnoreCase); }

[Fact]
Expand All @@ -85,14 +83,12 @@ public class CompareInfoIsSuffix
public void Test23() { Test(CultureInfo.InvariantCulture, "Hi", "\u0130", false, CompareOptions.None); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test24() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "A\u0300", true, CompareOptions.None); }

[Fact]
public void Test25() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "A\u0300", false, CompareOptions.Ordinal); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test26() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "a\u0300", true, CompareOptions.IgnoreCase); }

[Fact]
Expand Down Expand Up @@ -124,15 +120,12 @@ public void Test32()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test33()
{
char unassignedUnicode = GetNextUnassignedUnicode();
Test(CultureInfo.InvariantCulture, "FooBA\u0300R", "Foo" + unassignedUnicode + "B\u00C0R", true, CompareOptions.IgnoreNonSpace);
Test(CultureInfo.InvariantCulture, "FooBA\u0300R", "FooB\u00C0R", true, CompareOptions.IgnoreNonSpace);
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test34() { Test(CultureInfo.InvariantCulture, "More Test's", "Tests", true, CompareOptions.IgnoreSymbols); }

[Fact]
Expand Down
9 changes: 1 addition & 8 deletions src/System.Globalization/tests/CompareInfo/CompareInfoLastIndexOf.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,12 @@ public class CompareInfoLastIndexOf
public void Test15() { Test(CultureInfo.InvariantCulture, "foobardzsdzs", "rddzs", -1, CompareOptions.Ordinal); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test16() { Test(s_turkish, "Hi", "I", -1, CompareOptions.IgnoreCase); }

[Fact]
public void Test17() { Test(CultureInfo.InvariantCulture, "Hi", "I", 1, CompareOptions.IgnoreCase); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test18() { Test(s_turkish, "Hi", "\u0130", 1, CompareOptions.IgnoreCase); }

[Fact]
Expand All @@ -85,14 +83,12 @@ public class CompareInfoLastIndexOf
public void Test23() { Test(CultureInfo.InvariantCulture, "Hi", "\u0130", -1, CompareOptions.None); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test24() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "A\u0300", 8, CompareOptions.None); }

[Fact]
public void Test25() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "A\u0300", -1, CompareOptions.Ordinal); }

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test26() { Test(CultureInfo.InvariantCulture, "Exhibit \u00C0", "a\u0300", 8, CompareOptions.IgnoreCase); }

[Fact]
Expand Down Expand Up @@ -124,15 +120,12 @@ public void Test32()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test33()
{
char unassignedUnicode = GetNextUnassignedUnicode();
Test(CultureInfo.InvariantCulture, "TestFooBA\u0300R", "Foo" + unassignedUnicode + "B\u00C0R", 4, CompareOptions.IgnoreNonSpace);
Test(CultureInfo.InvariantCulture, "TestFooBA\u0300R", "FooB\u00C0R", 4, CompareOptions.IgnoreNonSpace);
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void Test34() { Test(CultureInfo.InvariantCulture, "More Test's", "Tests", 5, CompareOptions.IgnoreSymbols); }

[Fact]
Expand Down
2 changes: 0 additions & 2 deletions src/System.Globalization/tests/CompareInfo/compareinfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace System.Globalization.Tests
public class CompareInfoTest
{
[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void TestCompareInfo()
{
CompareInfo ciENG = CompareInfo.GetCompareInfo("en-US");
Expand Down Expand Up @@ -74,7 +73,6 @@ public void CompareInfoIndexTest1()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void CompareInfoIndexTest2()
{
// Creates CompareInfo for the InvariantCulture.
Expand Down
2 changes: 0 additions & 2 deletions src/System.Globalization/tests/CultureInfo/CultureInfoCompareInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public void TestEsESTraditional()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void TestCompareInfoName()
{
string expectedName = "en-US";
Expand All @@ -39,7 +38,6 @@ public void TestCompareInfoName()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void TestCompareInfoNameWithInvariant()
{
string expectedName = "";
Expand Down
3 changes: 0 additions & 3 deletions src/System.Globalization/tests/CultureInfo/CultureInfoGetHashCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace System.Globalization.Tests
public class CultureInfoGetHashCode
{
[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void PosTest1()
{
CultureInfo myCultureInfo = new CultureInfo("en-US");
Expand All @@ -22,7 +21,6 @@ public void PosTest1()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void PosTest2()
{
CultureInfo myCultureInfo = new CultureInfo("en");
Expand All @@ -34,7 +32,6 @@ public void PosTest2()
}

[Fact]
[ActiveIssue(846, PlatformID.AnyUnix)]
public void PosTest3()
{
CultureInfo myCultureInfo = CultureInfo.InvariantCulture;
Expand Down