Skip to content

Commit

Permalink
Fix errors with new CSC due to missing comma between attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ericstj
ericstj committed Aug 25, 2017
1 parent 84c6a81 commit 535828b
Show file tree
Hide file tree
Showing 22 changed files with 242 additions and 244 deletions.
86 changes: 42 additions & 44 deletions src/Common/tests/Tests/System/IO/PathInternal.Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,57 +40,55 @@ public void StartsWithOrdinal_PositiveCases(string source, string value, bool ex
}

[Theory,
InlineData("", "", true, 0)
InlineData("", "", false, 0)
InlineData("a", "", true, 0)
InlineData("a", "", false, 0)
InlineData("", "b", true, 0)
InlineData("", "b", false, 0)
InlineData("\0", "\0", true, 1)
InlineData("\0", "\0", false, 1)
InlineData("ABcd", "ABCD", true, 4)
InlineData("ABCD", "ABcd", true, 4)
InlineData("ABcd", "ABCD", false, 2)
InlineData("ABCD", "ABcd", false, 2)
InlineData("AB\0cd", "AB\0CD", true, 5)
InlineData("AB\0CD", "AB\0cd", true, 5)
InlineData("AB\0cd", "AB\0CD", false, 3)
InlineData("AB\0CD", "AB\0cd", false, 3)
InlineData("ABc\0", "ABC\0", true, 4)
InlineData("ABC\0", "ABc\0", true, 4)
InlineData("ABc\0", "ABC\0", false, 2)
InlineData("ABC\0", "ABc\0", false, 2)
InlineData("ABcdxyzl", "ABCDpdq", true, 4)
InlineData("ABCDxyz", "ABcdpdql", true, 4)
InlineData("ABcdxyz", "ABCDpdq", false, 2)
InlineData("ABCDxyzoo", "ABcdpdq", false, 2)
]
InlineData("", "", true, 0),
InlineData("", "", false, 0),
InlineData("a", "", true, 0),
InlineData("a", "", false, 0),
InlineData("", "b", true, 0),
InlineData("", "b", false, 0),
InlineData("\0", "\0", true, 1),
InlineData("\0", "\0", false, 1),
InlineData("ABcd", "ABCD", true, 4),
InlineData("ABCD", "ABcd", true, 4),
InlineData("ABcd", "ABCD", false, 2),
InlineData("ABCD", "ABcd", false, 2),
InlineData("AB\0cd", "AB\0CD", true, 5),
InlineData("AB\0CD", "AB\0cd", true, 5),
InlineData("AB\0cd", "AB\0CD", false, 3),
InlineData("AB\0CD", "AB\0cd", false, 3),
InlineData("ABc\0", "ABC\0", true, 4),
InlineData("ABC\0", "ABc\0", true, 4),
InlineData("ABc\0", "ABC\0", false, 2),
InlineData("ABC\0", "ABc\0", false, 2),
InlineData("ABcdxyzl", "ABCDpdq", true, 4),
InlineData("ABCDxyz", "ABcdpdql", true, 4),
InlineData("ABcdxyz", "ABCDpdq", false, 2),
InlineData("ABCDxyzoo", "ABcdpdq", false, 2)]
public void EqualStartingCharacterCount(string first, string second, bool ignoreCase, int expected)
{
Assert.Equal(expected, PathInternal.EqualStartingCharacterCount(first, second, ignoreCase));
}


[Theory,
InlineData(@"", @"", true, 0)
InlineData(@"", @"", false, 0)
InlineData(@"a", @"A", true, 1)
InlineData(@"A", @"a", true, 1)
InlineData(@"a", @"A", false, 0)
InlineData(@"A", @"a", false, 0)
InlineData(@"foo", @"foobar", true, 0)
InlineData(@"foo", @"foobar", false, 0)
InlineData(@"foo", @"foo/bar", true, 3)
InlineData(@"foo", @"foo/bar", false, 3)
InlineData(@"foo/", @"foo/bar", true, 4)
InlineData(@"foo/", @"foo/bar", false, 4)
InlineData(@"foo/bar", @"foo/bar", true, 7)
InlineData(@"foo/bar", @"foo/bar", false, 7)
InlineData(@"foo/bar", @"foo/BAR", true, 7)
InlineData(@"foo/bar", @"foo/BAR", false, 4)
InlineData(@"foo/bar", @"foo/barb", true, 4)
InlineData(@"foo/bar", @"foo/barb", false, 4)
]
InlineData(@"", @"", true, 0),
InlineData(@"", @"", false, 0),
InlineData(@"a", @"A", true, 1),
InlineData(@"A", @"a", true, 1),
InlineData(@"a", @"A", false, 0),
InlineData(@"A", @"a", false, 0),
InlineData(@"foo", @"foobar", true, 0),
InlineData(@"foo", @"foobar", false, 0),
InlineData(@"foo", @"foo/bar", true, 3),
InlineData(@"foo", @"foo/bar", false, 3),
InlineData(@"foo/", @"foo/bar", true, 4),
InlineData(@"foo/", @"foo/bar", false, 4),
InlineData(@"foo/bar", @"foo/bar", true, 7),
InlineData(@"foo/bar", @"foo/bar", false, 7),
InlineData(@"foo/bar", @"foo/BAR", true, 7),
InlineData(@"foo/bar", @"foo/BAR", false, 4),
InlineData(@"foo/bar", @"foo/barb", true, 4),
InlineData(@"foo/bar", @"foo/barb", false, 4)]
public void GetCommonPathLength(string first, string second, bool ignoreCase, int expected)
{
Assert.Equal(expected, PathInternal.GetCommonPathLength(first, second, ignoreCase));
Expand Down
118 changes: 59 additions & 59 deletions src/Common/tests/Tests/System/IO/PathInternal.Windows.Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

public class PathInternal_Windows_Tests
{
[Theory
InlineData(@"\\?\", false)
InlineData(@"\\?\?", true)
InlineData(@"//?/", false)
InlineData(@"//?/*", true)
InlineData(@"\\.\>", true)
InlineData(@"C:\", false)
InlineData(@"C:\<", true)
[Theory,
InlineData(@"\\?\", false),
InlineData(@"\\?\?", true),
InlineData(@"//?/", false),
InlineData(@"//?/*", true),
InlineData(@"\\.\>", true),
InlineData(@"C:\", false),
InlineData(@"C:\<", true),
InlineData("\"MyFile\"", true)
]
[PlatformSpecific(TestPlatforms.Windows)]
Expand All @@ -25,14 +25,14 @@ public void HasWildcardCharacters(string path, bool expected)
Assert.Equal(expected, PathInternal.HasWildCardCharacters(path));
}

[Theory
InlineData(PathInternal.ExtendedPathPrefix, PathInternal.ExtendedPathPrefix)
InlineData(@"Foo", @"Foo")
InlineData(@"C:\Foo", @"\\?\C:\Foo")
InlineData(@"\\.\Foo", @"\\.\Foo")
InlineData(@"\\?\Foo", @"\\?\Foo")
InlineData(@"\??\Foo", @"\??\Foo")
InlineData(@"//?/Foo", @"//?/Foo")
[Theory,
InlineData(PathInternal.ExtendedPathPrefix, PathInternal.ExtendedPathPrefix),
InlineData(@"Foo", @"Foo"),
InlineData(@"C:\Foo", @"\\?\C:\Foo"),
InlineData(@"\\.\Foo", @"\\.\Foo"),
InlineData(@"\\?\Foo", @"\\?\Foo"),
InlineData(@"\??\Foo", @"\??\Foo"),
InlineData(@"//?/Foo", @"//?/Foo"),
InlineData(@"\\Server\Share", PathInternal.UncExtendedPathPrefix + @"Server\Share")
]
[PlatformSpecific(TestPlatforms.Windows)]
Expand All @@ -41,14 +41,14 @@ public void EnsureExtendedPrefixTest(string path, string expected)
Assert.Equal(expected, PathInternal.EnsureExtendedPrefix(path));
}

[Theory
InlineData(@"", false)
InlineData(@"\\?\", true)
InlineData(@"\??\", true)
InlineData(@"\\.\", false)
InlineData(@"\\?", false)
InlineData(@"\??", false)
InlineData(@"//?/", false)
[Theory,
InlineData(@"", false),
InlineData(@"\\?\", true),
InlineData(@"\??\", true),
InlineData(@"\\.\", false),
InlineData(@"\\?", false),
InlineData(@"\??", false),
InlineData(@"//?/", false),
InlineData(@"/??/", false)
]
[PlatformSpecific(TestPlatforms.Windows)]
Expand All @@ -57,14 +57,14 @@ public void IsExtendedTest(string path, bool expected)
Assert.Equal(expected, PathInternal.IsExtended(path));
}

[Theory
InlineData(@"", false)
InlineData(@"\\?\", true)
InlineData(@"\??\", true)
InlineData(@"\\.\", true)
InlineData(@"\\?", false)
InlineData(@"\??", false)
InlineData(@"//?/", true)
[Theory,
InlineData(@"", false),
InlineData(@"\\?\", true),
InlineData(@"\??\", true),
InlineData(@"\\.\", true),
InlineData(@"\\?", false),
InlineData(@"\??", false),
InlineData(@"//?/", true),
InlineData(@"/??/", false)
]
[PlatformSpecific(TestPlatforms.Windows)]
Expand All @@ -73,26 +73,26 @@ public void IsDeviceTest(string path, bool expected)
Assert.Equal(expected, PathInternal.IsDevice(path));
}

[Theory
InlineData("", true)
InlineData("C:", true)
InlineData("**", true)
InlineData(@"\\.\path", false)
InlineData(@"\\?\path", false)
InlineData(@"\\.", false)
InlineData(@"\\?", false)
InlineData(@"\?", false)
InlineData(@"/?", false)
InlineData(@"\\", false)
InlineData(@"//", false)
InlineData(@"\a", true)
InlineData(@"/a", true)
InlineData(@"\", true)
InlineData(@"/", true)
InlineData(@"C:Path", true)
InlineData(@"C:\Path", false)
InlineData(@"\\?\C:\Path", false)
InlineData(@"Path", true)
[Theory,
InlineData("", true),
InlineData("C:", true),
InlineData("**", true),
InlineData(@"\\.\path", false),
InlineData(@"\\?\path", false),
InlineData(@"\\.", false),
InlineData(@"\\?", false),
InlineData(@"\?", false),
InlineData(@"/?", false),
InlineData(@"\\", false),
InlineData(@"//", false),
InlineData(@"\a", true),
InlineData(@"/a", true),
InlineData(@"\", true),
InlineData(@"/", true),
InlineData(@"C:Path", true),
InlineData(@"C:\Path", false),
InlineData(@"\\?\C:\Path", false),
InlineData(@"Path", true),
InlineData(@"X", true)
]
[PlatformSpecific(TestPlatforms.Windows)]
Expand All @@ -111,7 +111,7 @@ public void IsPartiallyQualifiedTest(string path, bool expected)
InlineData(@" \", 2),
InlineData(@" 8:", 0),
InlineData(@" \\", 4),
InlineData(@"\\", 0),
InlineData(@"\\", 0)
]
[PlatformSpecific(TestPlatforms.Windows)]
public void PathStartSkipTest(string path, int expected)
Expand Down Expand Up @@ -154,7 +154,7 @@ public void PathStartSkipTest(string path, int expected)
InlineData(@" /", @"\"),
InlineData(@" 8:", @" 8:"),
InlineData(@" \\", @"\\"),
InlineData(@" //", @"\\"),
InlineData(@" //", @"\\")
]
[PlatformSpecific(TestPlatforms.Windows)]
public void NormalizeDirectorySeparatorTests(string path, string expected)
Expand All @@ -181,11 +181,11 @@ public void FindFileNameIndexTests(string path, int expected)
}

[Theory,
InlineData(@"", @"", StringComparison.OrdinalIgnoreCase, true)
InlineData(@"", @"", StringComparison.Ordinal, true)
InlineData(@"A", @"a", StringComparison.OrdinalIgnoreCase, true)
InlineData(@"A", @"a", StringComparison.Ordinal, true)
InlineData(@"C:\", @"c:\", StringComparison.OrdinalIgnoreCase, true)
InlineData(@"", @"", StringComparison.OrdinalIgnoreCase, true),
InlineData(@"", @"", StringComparison.Ordinal, true),
InlineData(@"A", @"a", StringComparison.OrdinalIgnoreCase, true),
InlineData(@"A", @"a", StringComparison.Ordinal, true),
InlineData(@"C:\", @"c:\", StringComparison.OrdinalIgnoreCase, true),
InlineData(@"C:\", @"c:\", StringComparison.Ordinal, false)
]
[PlatformSpecific(TestPlatforms.Windows)]
Expand Down
10 changes: 5 additions & 5 deletions src/Common/tests/Tests/System/Security/IdentityHelperTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ namespace Tests.System.Security
{
public class IdentityHelperTests
{
[Theory
InlineData(new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00 }, @"aaaaaaaa")
InlineData(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, @"55555555")
InlineData(new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, @"aaaaaaaaaaaaaaaa")
InlineData(new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }, @"abcdeaaafghijaaa")
[Theory,
InlineData(new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00 }, @"aaaaaaaa"),
InlineData(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, @"55555555"),
InlineData(new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, @"aaaaaaaaaaaaaaaa"),
InlineData(new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }, @"abcdeaaafghijaaa"),
InlineData(
new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
@"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
Expand Down
52 changes: 26 additions & 26 deletions ...m.Configuration.ConfigurationManager/tests/System/Configuration/ConfigPathUtilityTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,53 +9,53 @@ namespace System.ConfigurationTests
{
public class ConfigPathUtilityTests
{
[Theory
InlineData(null, false)
InlineData(@"", false)
InlineData(@"\", false)
InlineData(@"/", false)
InlineData(@".", false)
InlineData(@"..", false)
InlineData(@"a", true)
InlineData(@"a\", false)
InlineData(@"\a", false)
InlineData(@"/a", false)
InlineData(@"a/", false)
InlineData(@"a/b", true)
InlineData(@"a//c", false)
InlineData(@"a\b", false)
InlineData(@"a/b/c", true)
InlineData(@"a/b./c", true)
InlineData(@"a/b../c", true)
InlineData(@"a/../c", false)
[Theory,
InlineData(null, false),
InlineData(@"", false),
InlineData(@"\", false),
InlineData(@"/", false),
InlineData(@".", false),
InlineData(@"..", false),
InlineData(@"a", true),
InlineData(@"a\", false),
InlineData(@"\a", false),
InlineData(@"/a", false),
InlineData(@"a/", false),
InlineData(@"a/b", true),
InlineData(@"a//c", false),
InlineData(@"a\b", false),
InlineData(@"a/b/c", true),
InlineData(@"a/b./c", true),
InlineData(@"a/b../c", true),
InlineData(@"a/../c", false),
InlineData(@"a/./c", false)
]
public void IsValid(string configPath, bool expected)
{
Assert.Equal(expected, ConfigPathUtility.IsValid(configPath));
}

[Theory
[Theory,
InlineData(@"a", @"b", @"a/b")
]
public void Combine(string parentConfigPath, string childConfigPath, string expected)
{
Assert.Equal(expected, ConfigPathUtility.Combine(parentConfigPath, childConfigPath));
}

[Theory
InlineData(@"a", new string[] { "a" })
[Theory,
InlineData(@"a", new string[] { "a" }),
InlineData(@"a/b", new string[] { "a", "b" })
]
public void GetParts(string configPath, string[] expected)
{
Assert.Equal(expected, ConfigPathUtility.GetParts(configPath));
}

[Theory
InlineData(@"a", @"a")
InlineData(@"ab", @"ab")
InlineData(@"a/b", @"b")
[Theory,
InlineData(@"a", @"a"),
InlineData(@"ab", @"ab"),
InlineData(@"a/b", @"b"),
InlineData(@"a/b/c", @"c")
]
public void GetName(string configPath, string expected)
Expand Down
Loading

0 comments on commit 535828b

Please sign in to comment.