Skip to content

Commit 2f97a32

Browse files
Corrected Negation tests to correctly confirm outputs
1 parent 600d6c0 commit 2f97a32

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

src/TestDataGenerator.Core.Tests/TextTests.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,40 +1279,40 @@ public void Profile_Large_NonRandom_Repeat()
12791279
[TestCategory("Negation")]
12801280
public void Can_Generate_Correct_Output_from_Negated_Set()
12811281
{
1282-
var pattern = @"[^0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ]";
1283-
var text = AlphaNumericGenerator.GenerateFromPattern(pattern);
1282+
var pattern = @"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
1283+
var text = AlphaNumericGenerator.GenerateFromPattern("[^"+pattern+"]");
12841284
Console.WriteLine(@"'{0}' produced '{1}'", pattern, text);
1285-
Assert.IsTrue(Regex.IsMatch(text, "^"+pattern+"$"));
1285+
Assert.IsTrue(pattern.IndexOf(text, StringComparison.InvariantCultureIgnoreCase) == -1);
12861286
}
12871287

12881288
[TestMethod]
12891289
[TestCategory("Negation")]
12901290
public void Can_Generate_Correct_Output_from_Negated_Set_Range()
12911291
{
1292-
var pattern = @"[^A-Z]";
1293-
var text = AlphaNumericGenerator.GenerateFromPattern(pattern);
1292+
var pattern = @"A-Z";
1293+
var text = AlphaNumericGenerator.GenerateFromPattern("[^" + pattern + "]");
12941294
Console.WriteLine(@"'{0}' produced '{1}'", pattern, text);
1295-
Assert.IsTrue(Regex.IsMatch(text, "^" + pattern + "$"));
1295+
Assert.IsTrue(pattern.IndexOf(text, StringComparison.InvariantCultureIgnoreCase) == -1);
12961296
}
12971297

12981298
[TestMethod]
12991299
[TestCategory("Negation")]
13001300
public void Can_Generate_Correct_Output_from_Negated_Set_Range2()
13011301
{
1302-
var pattern = @"[^3-6]";
1303-
var text = AlphaNumericGenerator.GenerateFromPattern(pattern);
1302+
var pattern = @"3-6";
1303+
var text = AlphaNumericGenerator.GenerateFromPattern("[^" + pattern + "]");
13041304
Console.WriteLine(@"'{0}' produced '{1}'", pattern, text);
1305-
Assert.IsTrue(Regex.IsMatch(text, "^" + pattern + "$"));
1305+
Assert.IsTrue("3456".IndexOf(text, StringComparison.InvariantCultureIgnoreCase) == -1);
13061306
}
13071307

13081308
[TestMethod]
13091309
[TestCategory("Negation")]
13101310
public void Can_Generate_Correct_Output_from_Negated_Set_Range_Multiple()
13111311
{
1312-
var pattern = @"[^A-Za-z]";
1313-
var text = AlphaNumericGenerator.GenerateFromPattern(pattern);
1312+
var pattern = @"A-Za-z";
1313+
var text = AlphaNumericGenerator.GenerateFromPattern("[^" + pattern + "]");
13141314
Console.WriteLine(@"'{0}' produced '{1}'", pattern, text);
1315-
Assert.IsTrue(Regex.IsMatch(text, "^" + pattern + "$"));
1315+
Assert.IsTrue("ABCDEFGHIJKLMNOPQRSTUVWXYZ".IndexOf(text, StringComparison.InvariantCultureIgnoreCase) == -1);
13161316
}
13171317

13181318
[TestMethod]
@@ -1322,7 +1322,7 @@ public void Can_Generate_Correct_Output_from_Negated_Set_Range_Repeated()
13221322
var pattern = @"[^3-6]{10}";
13231323
var text = AlphaNumericGenerator.GenerateFromPattern(pattern);
13241324
Console.WriteLine(@"'{0}' produced '{1}'", pattern, text);
1325-
Assert.IsTrue(Regex.IsMatch(text, "^" + pattern + "$"));
1325+
Assert.IsTrue("3456".IndexOf(text, StringComparison.InvariantCultureIgnoreCase) == -1);
13261326
}
13271327

13281328
[TestMethod]
@@ -1332,7 +1332,7 @@ public void Can_Generate_Correct_Output_from_Negated_Set_Range_Multiple_Repeated
13321332
var pattern = @"[^A-Za-z]{10}";
13331333
var text = AlphaNumericGenerator.GenerateFromPattern(pattern);
13341334
Console.WriteLine(@"'{0}' produced '{1}'", pattern, text);
1335-
Assert.IsTrue(Regex.IsMatch(text, "^" + pattern + "$"));
1335+
Assert.IsTrue("ABCDEFGHIJKLMNOPQRSTUVWXYZ".IndexOf(text, StringComparison.InvariantCultureIgnoreCase) == -1);
13361336
}
13371337

13381338
#endregion

src/TestDataGenerator.Core.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
77
ProjectSection(SolutionItems) = preProject
88
DataGenerator.vsmdi = DataGenerator.vsmdi
99
LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
10-
..\..\VERSION = ..\..\VERSION
1110
EndProjectSection
1211
EndProject
1312
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3A492DFF-FDA0-4AC7-BD29-745203BDC70E}"

0 commit comments

Comments
 (0)