Skip to content

Commit 2937076

Browse files
committed
Use Shouldly instead of NUnit assert, for #313
1 parent 2e39da0 commit 2937076

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/GitVersionCore.Tests/BuildServers/EnvironmentVariableJenkinsTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using GitVersion;
33
using NUnit.Framework;
4+
using Shouldly;
45

56
[TestFixture]
67
public class EnvironmentVariableJenkinsTests
@@ -22,14 +23,14 @@ public void CanApplyCurrentContextWhenEnvironmentVariableIsSet()
2223
{
2324
SetEnvironmentVariableForDetection();
2425
var j = new Jenkins();
25-
Assert.True(j.CanApplyToCurrentContext());
26+
j.CanApplyToCurrentContext().ShouldBe(true);
2627
}
2728

2829
[Test]
2930
public void CanNotApplyCurrentContextWhenEnvironmentVariableIsNotSet()
3031
{
3132
ClearEnvironmentVariableForDetection();
3233
var j = new Jenkins();
33-
Assert.False(j.CanApplyToCurrentContext());
34+
j.CanApplyToCurrentContext().ShouldBe(false);
3435
}
3536
}

src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ public class JenkinsMessageGenerationTests
1212
public void GenerateSetVersionMessageReturnsVersionAsIs_AlthoughThisIsNotUsedByJenkins()
1313
{
1414
var j = new Jenkins();
15-
var v = j.GenerateSetVersionMessage("0.0.0-Beta4.7");
16-
Assert.AreEqual ("0.0.0-Beta4.7", v);
15+
j.GenerateSetVersionMessage("0.0.0-Beta4.7").ShouldBe("0.0.0-Beta4.7");
1716
}
1817

1918
[Test]
2019
public void GenerateMessageTest()
2120
{
2221
var j = new Jenkins();
23-
var actual = j.GenerateSetParameterMessage("name", "value");
24-
Assert.AreEqual(1, actual.Length);
25-
Assert.AreEqual("GitVersion_name=value", actual[0]);
22+
var generatedParameterMessages = j.GenerateSetParameterMessage("name", "value");
23+
generatedParameterMessages.Length.ShouldBe(1);
24+
generatedParameterMessages[0].ShouldBe("GitVersion_name=value");
2625
}
2726

2827
[Test, Explicit]
@@ -63,11 +62,11 @@ static void AssertVariablesAreWrittenToFile(string f)
6362

6463
writes[1].ShouldBe("1.2.3-beta.1+5");
6564

66-
Assert.True(File.Exists(f));
65+
File.Exists(f).ShouldBe(true);
6766

6867
var props = File.ReadAllText(f);
6968

70-
StringAssert.Contains("GitVersion_Major=1", props);
71-
StringAssert.Contains("GitVersion_Minor=2", props);
69+
props.ShouldContain("GitVersion_Major=1");
70+
props.ShouldContain("GitVersion_Minor=2");
7271
}
7372
}

0 commit comments

Comments
 (0)