Skip to content

Commit 0cc1dc2

Browse files
psoholtpsoholt
committed
Merge pull request VerbalExpressions#45 from psoholt/SignpostMarv-nunit-update
Nunit 3.01 update, merged SignpostMarv nunit update with latest commits on master
2 parents 2216d4a + bf23fc7 commit 0cc1dc2

13 files changed

+229
-224
lines changed

Diff for: ‎VerbalExpressionsUnitTests/AddModifierTests.cs

+30-24
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,63 @@
22
using CSharpVerbalExpressions;
33
using NUnit.Framework;
44

5-
namespace VerbalExpressionsUnitTests {
5+
namespace VerbalExpressionsUnitTests
6+
{
67

7-
[ TestFixture ]
8-
public class AddModifierTests {
9-
[ Test ]
10-
public void AddModifier_AddModifierI_RemovesCase() {
8+
[TestFixture]
9+
public class AddModifierTests
10+
{
11+
[Test]
12+
public void AddModifier_AddModifierI_RemovesCase()
13+
{
1114
VerbalExpressions verbEx = VerbalExpressions.DefaultExpression;
12-
verbEx.Add( "teststring" ).AddModifier( 'i' );
15+
verbEx.Add("teststring").AddModifier('i');
1316

14-
Assert.IsTrue( verbEx.IsMatch( "TESTSTRING" ) );
17+
Assert.IsTrue(verbEx.IsMatch("TESTSTRING"));
1518
}
1619

17-
[ Test ]
18-
public void AddModifier_AddModifierM_Multiline() {
20+
[Test]
21+
public void AddModifier_AddModifierM_Multiline()
22+
{
1923
//Arrange
2024
VerbalExpressions verbEx = VerbalExpressions.DefaultExpression;
21-
string text = string.Format( "testin with {0} line break", Environment.NewLine );
25+
string text = string.Format("testin with {0} line break", Environment.NewLine);
2226

2327
//Act
24-
verbEx.AddModifier( 'm' );
28+
verbEx.AddModifier('m');
2529

2630
//Assert
27-
Assert.IsTrue( verbEx.Test( text ) );
31+
Assert.IsTrue(verbEx.Test(text));
2832
}
2933

30-
[ Test ]
31-
public void AddModifier_AddModifierS_SingleLine() {
34+
[Test]
35+
public void AddModifier_AddModifierS_SingleLine()
36+
{
3237
//Arrange
3338
VerbalExpressions verbEx = VerbalExpressions.DefaultExpression;
3439
string testString = "First string" + Environment.NewLine + "Second string";
3540

3641
//Act
37-
verbEx.Add( "First string" ).Anything().Then( "Second string" );
42+
verbEx.Add("First string").Anything().Then("Second string");
3843

3944
//Assert
4045
Assert.IsFalse(
41-
verbEx.IsMatch( testString ),
42-
"The dot matches a single character, except line break characters." );
46+
verbEx.IsMatch(testString),
47+
"The dot matches a single character, except line break characters.");
4348

44-
verbEx.AddModifier( 's' );
49+
verbEx.AddModifier('s');
4550
Assert.IsTrue(
46-
verbEx.IsMatch( testString ),
47-
"The dot matches a single character and line break characters." );
51+
verbEx.IsMatch(testString),
52+
"The dot matches a single character and line break characters.");
4853
}
4954

50-
[ Test ]
51-
public void AddModifier_AddModifierX_IgnoreWhitspace() {
55+
[Test]
56+
public void AddModifier_AddModifierX_IgnoreWhitspace()
57+
{
5258
VerbalExpressions verbEx = VerbalExpressions.DefaultExpression;
53-
verbEx.Add( "test string" ).AddModifier( 'x' );
59+
verbEx.Add("test string").AddModifier('x');
5460

55-
Assert.IsTrue( verbEx.IsMatch( "test string #comment" ) );
61+
Assert.IsTrue(verbEx.IsMatch("test string #comment"));
5662
}
5763
}
5864

Diff for: ‎VerbalExpressionsUnitTests/AddTests.cs

+23-24
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,29 @@
44

55
namespace VerbalExpressionsUnitTests
66
{
7-
[TestFixture]
8-
public class AddTests
9-
{
10-
[Test]
11-
[ExpectedException(typeof(ArgumentNullException))]
12-
public void Add_WhenNullStringPassedAsParameter_ShouldThrowNullArgumentException()
13-
{
14-
//Arrange
15-
var verbEx = VerbalExpressions.DefaultExpression;
16-
string value = null;
7+
[TestFixture]
8+
public class AddTests
9+
{
10+
[Test]
11+
public void Add_WhenNullStringPassedAsParameter_ShouldThrowNullArgumentException()
12+
{
13+
//Arrange
14+
var verbEx = VerbalExpressions.DefaultExpression;
15+
string value = null;
1716

18-
//Act
19-
//Assert
20-
verbEx.Add(value);
21-
}
17+
//Act
18+
//Assert
19+
Assert.Throws<ArgumentNullException>(() => verbEx.Add(value));
20+
}
2221

23-
[Test]
24-
public void Add_AddDotCom_DoesNotMatchGoogleComWithoutDot()
25-
{
26-
var verbEx = VerbalExpressions.DefaultExpression;
27-
verbEx.Add(".com");
22+
[Test]
23+
public void Add_AddDotCom_DoesNotMatchGoogleComWithoutDot()
24+
{
25+
var verbEx = VerbalExpressions.DefaultExpression;
26+
verbEx.Add(".com");
2827

29-
var isMatch = verbEx.IsMatch("http://www.googlecom/");
30-
Assert.IsFalse(isMatch, "Should not match 'ecom'");
31-
}
32-
}
33-
}
28+
var isMatch = verbEx.IsMatch("http://www.googlecom/");
29+
Assert.IsFalse(isMatch, "Should not match 'ecom'");
30+
}
31+
}
32+
}

Diff for: ‎VerbalExpressionsUnitTests/CaptureTests.cs

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
using CSharpVerbalExpressions;
22
using NUnit.Framework;
33

4-
namespace VerbalExpressionsUnitTests {
4+
namespace VerbalExpressionsUnitTests
5+
{
56

6-
[ TestFixture ]
7-
public class CaptureTests {
8-
[ Test ]
9-
public void BeginCaptureAndEndCapture_AddComOrOrg_RegexIsAsExpected() {
7+
[TestFixture]
8+
public class CaptureTests
9+
{
10+
[Test]
11+
public void BeginCaptureAndEndCapture_AddComOrOrg_RegexIsAsExpected()
12+
{
1013
// Arrange
1114
VerbalExpressions verbEx = VerbalExpressions.DefaultExpression;
1215

1316
// Act
1417
verbEx.BeginCapture()
15-
.Add( "com" )
16-
.Or( "org" )
18+
.Add("com")
19+
.Or("org")
1720
.EndCapture();
1821

1922
// Assert
20-
Assert.AreEqual( "((com)|(org))", verbEx.ToString() );
23+
Assert.AreEqual("((com)|(org))", verbEx.ToString());
2124
}
2225

23-
[ Test ]
24-
public void BeginCaptureAndEndCapture_DuplicatesIdentifier_DoesMatch() {
26+
[Test]
27+
public void BeginCaptureAndEndCapture_DuplicatesIdentifier_DoesMatch()
28+
{
2529
// Arrange
2630
VerbalExpressions verbEx = VerbalExpressions.DefaultExpression;
2731
const string TEST_STRING = "He said that that was the the correct answer.";
@@ -30,14 +34,14 @@ public void BeginCaptureAndEndCapture_DuplicatesIdentifier_DoesMatch() {
3034
verbEx.BeginCapture()
3135
.Word()
3236
.EndCapture()
33-
.Add( @"\s", false )
37+
.Add(@"\s", false)
3438
.BeginCapture()
35-
.Add( @"\1", false )
39+
.Add(@"\1", false)
3640
.EndCapture();
3741

3842
// Assert
39-
Assert.AreEqual( @"(\w+)\s(\1)", verbEx.ToString() );
40-
Assert.IsTrue( verbEx.Test( TEST_STRING ), "There is no duplicates in the textString." );
43+
Assert.AreEqual(@"(\w+)\s(\1)", verbEx.ToString());
44+
Assert.IsTrue(verbEx.Test(TEST_STRING), "There is no duplicates in the textString.");
4145
}
4246

4347
[Test]
@@ -55,8 +59,8 @@ public void BeginCaptureWithName_CreateRegexGroupNameAsExpected()
5559
.Add("END");
5660

5761
// Assert
58-
Assert.AreEqual( @"COD(?<GroupNumber>[0-9]{3})END",verbEx.ToString());
59-
Assert.AreEqual( "123", verbEx.Capture("COD123END","GroupNumber"));
62+
Assert.AreEqual(@"COD(?<GroupNumber>[0-9]{3})END", verbEx.ToString());
63+
Assert.AreEqual("123", verbEx.Capture("COD123END", "GroupNumber"));
6064
}
6165
}
6266

Diff for: ‎VerbalExpressionsUnitTests/EndOfLineTests.cs

+20-20
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33

44
namespace VerbalExpressionsUnitTests
55
{
6-
[TestFixture]
7-
public class EndOfLineTests
8-
{
9-
[Test]
10-
public void EndOfLine_AddDotComtEndOfLine_DoesMatchDotComInEnd()
11-
{
12-
var verbEx = VerbalExpressions.DefaultExpression;
13-
verbEx.Add(".com").EndOfLine();
6+
[TestFixture]
7+
public class EndOfLineTests
8+
{
9+
[Test]
10+
public void EndOfLine_AddDotComtEndOfLine_DoesMatchDotComInEnd()
11+
{
12+
var verbEx = VerbalExpressions.DefaultExpression;
13+
verbEx.Add(".com").EndOfLine();
1414

15-
var isMatch = verbEx.IsMatch("www.google.com");
16-
Assert.IsTrue(isMatch, "Should match '.com' in end");
17-
}
15+
var isMatch = verbEx.IsMatch("www.google.com");
16+
Assert.IsTrue(isMatch, "Should match '.com' in end");
17+
}
1818

19-
[Test]
20-
public void EndOfLine_AddDotComEndOfLine_DoesNotMatchSlashInEnd()
21-
{
22-
var verbEx = VerbalExpressions.DefaultExpression;
23-
verbEx.Add(".com").EndOfLine();
19+
[Test]
20+
public void EndOfLine_AddDotComEndOfLine_DoesNotMatchSlashInEnd()
21+
{
22+
var verbEx = VerbalExpressions.DefaultExpression;
23+
verbEx.Add(".com").EndOfLine();
2424

25-
var isMatch = verbEx.IsMatch("http://www.google.com/");
26-
Assert.IsFalse(isMatch, "Should not match '/' in end");
27-
}
28-
}
25+
var isMatch = verbEx.IsMatch("http://www.google.com/");
26+
Assert.IsFalse(isMatch, "Should not match '/' in end");
27+
}
28+
}
2929
}

Diff for: ‎VerbalExpressionsUnitTests/MultipleTests.cs

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ namespace VerbalExpressionsUnitTests
88
public class MultipleTests
99
{
1010
[Test]
11-
[ExpectedException(typeof(ArgumentNullException))]
1211
public void Multiple_WhenNullOrEmptyValueParameterIsPassed_ShouldThrowArgumentException()
1312
{
1413
//Arrange
1514
var verbEx = VerbalExpressions.DefaultExpression;
1615
string value = null;
1716

1817
//Act
19-
//Assert
20-
verbEx.Multiple(value);
18+
//Assert
19+
Assert.Throws<ArgumentNullException>(() => verbEx.Multiple(value));
2120
}
2221

2322
[Test]
@@ -38,16 +37,15 @@ public void Multiple_WhenParamIsGiven_ShouldMatchOneOrMultipleValuesGiven()
3837
}
3938

4039
[Test]
41-
[ExpectedException(typeof(ArgumentNullException))]
4240
public void Multiple_WhenNullArgumentPassed_ThrowsArgumentNullException()
4341
{
4442
//Arrange
4543
var verbEx = VerbalExpressions.DefaultExpression;
4644
string argument = string.Empty;
4745

4846
//Act
49-
//Assert
50-
verbEx.Multiple(argument);
47+
//Assert
48+
Assert.Throws<ArgumentNullException>(() => verbEx.Multiple(argument));
5149
}
5250
}
5351
}

Diff for: ‎VerbalExpressionsUnitTests/RangeTests.cs

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ namespace VerbalExpressionsUnitTests
88
public class RangeTests
99
{
1010
[Test]
11-
[ExpectedException(typeof(ArgumentOutOfRangeException))]
1211
public void Range_WhenTooManyItemsInArray_ShouldThrowArgumentOutOfRangeException()
1312
{
1413
var verbEx = VerbalExpressions.DefaultExpression;
1514
object[] range = new object[4] { 1, 6, 7, 12 };
1615

17-
verbEx.Range(range);
16+
//Act
17+
//Assert
18+
Assert.Throws<ArgumentOutOfRangeException>(() => verbEx.Range(range));
1819
}
1920

2021
[Test]
@@ -47,7 +48,6 @@ public void Range_WhenOddNumberOfItemsInArray_ShouldAppendWithPipe()
4748
}
4849

4950
[Test]
50-
[ExpectedException(typeof(ArgumentNullException))]
5151
public void Range_WhenNullParameterPassed_ShouldThrowArgumentNullException()
5252
{
5353
//Arrange
@@ -56,11 +56,10 @@ public void Range_WhenNullParameterPassed_ShouldThrowArgumentNullException()
5656

5757
//Act
5858
//Assert
59-
verbEx.Range(value);
59+
Assert.Throws<ArgumentNullException>(() => verbEx.Range(value));
6060
}
6161

6262
[Test]
63-
[ExpectedException(typeof(ArgumentOutOfRangeException))]
6463
public void Range_WhenArrayParameterHasOnlyOneValue_ShouldThrowArgumentOutOfRangeException()
6564
{
6665
//Arrange
@@ -69,7 +68,7 @@ public void Range_WhenArrayParameterHasOnlyOneValue_ShouldThrowArgumentOutOfRang
6968

7069
//Act
7170
//Assert
72-
verbEx.Range(value);
71+
Assert.Throws<ArgumentOutOfRangeException>(() => verbEx.Range(value));
7372
}
7473

7574
[Test]

Diff for: ‎VerbalExpressionsUnitTests/RepeatPreviousTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void RepeatPrevious_WhenBetweenTwoAndFourA_RegesIsAsExpected()
3333
// Act
3434
verbEx.BeginCapture()
3535
.Add("A")
36-
.RepeatPrevious(2,4)
36+
.RepeatPrevious(2, 4)
3737
.EndCapture();
3838

3939
// Assert

Diff for: ‎VerbalExpressionsUnitTests/SanatizeTests.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ namespace VerbalExpressionsUnitTests
88
public class SanatizeTests
99
{
1010
[Test]
11-
[ExpectedException(typeof(ArgumentNullException))]
1211
public void Sanitize_Handles_Null_String()
1312
{
1413
//Arrange
1514
var verbEx = VerbalExpressions.DefaultExpression;
1615
string value = null;
1716

1817
//Act
19-
//Assert
20-
value = verbEx.Sanitize(value);
18+
//Assert
19+
Assert.Throws<ArgumentNullException>(() => verbEx.Sanitize(value));
2120
}
2221

2322
[Test]

0 commit comments

Comments
 (0)