Skip to content

Commit 1d523b2

Browse files
SimonCroppSimonCropp
committed
collapse test namespace
1 parent 4dee207 commit 1d523b2

File tree

7 files changed

+162
-174
lines changed

7 files changed

+162
-174
lines changed

‎GitVersionTask/AssemblyInfoBuilder.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ string GenerateVariableMembers(IEnumerable<KeyValuePair<string, string>> vars)
6161
return members.ToString();
6262
}
6363

64-
6564
}
6665

67-
6866
}

‎Tests/BuildServers/BuildServerBaseTests.cs

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,54 @@
1-
namespace Tests.BuildServers
2-
{
3-
using System;
4-
using System.Collections.Generic;
5-
using GitVersion;
6-
using NUnit.Framework;
7-
using Shouldly;
1+
using System;
2+
using System.Collections.Generic;
3+
using GitVersion;
4+
using NUnit.Framework;
5+
using Shouldly;
86

9-
public class BuildServerBaseTests : BuildServerBase
7+
public class BuildServerBaseTests : BuildServerBase
8+
{
9+
[Test]
10+
public void BuildNumberIsFullSemVer()
1011
{
11-
[Test]
12-
public void BuildNumberIsFullSemVer()
12+
var writes = new List<string>();
13+
var semanticVersion = new SemanticVersion
1314
{
14-
var writes = new List<string>();
15-
var semanticVersion = new SemanticVersion
16-
{
17-
Major = 1,
18-
Minor = 2,
19-
Patch = 3,
20-
PreReleaseTag = "beta1",
21-
BuildMetaData = "5"
22-
};
23-
24-
semanticVersion.BuildMetaData.ReleaseDate = new ReleaseDate
25-
{
26-
OriginalCommitSha = "originalCommitSha",
27-
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
28-
CommitSha = "commitSha",
29-
Date = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
30-
};
31-
32-
base.WriteIntegration(semanticVersion, writes.Add);
33-
34-
writes[1].ShouldBe("1.2.3-beta.1+5");
35-
}
36-
37-
public override bool CanApplyToCurrentContext()
15+
Major = 1,
16+
Minor = 2,
17+
Patch = 3,
18+
PreReleaseTag = "beta1",
19+
BuildMetaData = "5"
20+
};
21+
22+
semanticVersion.BuildMetaData.ReleaseDate = new ReleaseDate
3823
{
39-
throw new NotImplementedException();
40-
}
24+
OriginalCommitSha = "originalCommitSha",
25+
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
26+
CommitSha = "commitSha",
27+
Date = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
28+
};
4129

42-
public override void PerformPreProcessingSteps(string gitDirectory)
43-
{
44-
throw new NotImplementedException();
45-
}
30+
base.WriteIntegration(semanticVersion, writes.Add);
4631

47-
public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
48-
{
49-
return versionToUseForBuildNumber;
50-
}
32+
writes[1].ShouldBe("1.2.3-beta.1+5");
33+
}
5134

52-
public override string[] GenerateSetParameterMessage(string name, string value)
53-
{
54-
return new string[0];
55-
}
35+
public override bool CanApplyToCurrentContext()
36+
{
37+
throw new NotImplementedException();
38+
}
39+
40+
public override void PerformPreProcessingSteps(string gitDirectory)
41+
{
42+
throw new NotImplementedException();
43+
}
44+
45+
public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
46+
{
47+
return versionToUseForBuildNumber;
48+
}
49+
50+
public override string[] GenerateSetParameterMessage(string name, string value)
51+
{
52+
return new string[0];
5653
}
57-
}
54+
}

‎Tests/GetVersionTaskTests.cs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
 using System;
2+
using System.Linq;
3+
using GitVersion;
4+
using GitVersionTask;
5+
using Microsoft.Build.Framework;
6+
using NUnit.Framework;
7+
8+
[TestFixture]
9+
public class GetVersionTaskTests
10+
{
11+
[Test]
12+
public void OutputsShouldMatchVariableProvider()
13+
{
14+
var taskType = typeof(GetVersion);
15+
var properties = taskType.GetProperties()
16+
.Where(p => p.GetCustomAttributes(typeof(OutputAttribute), false).Any())
17+
.Select(p => p.Name);
18+
var variables = VariableProvider.GetVariablesFor(new SemanticVersion
19+
{
20+
Major = 1,
21+
Minor = 2,
22+
Patch = 3,
23+
BuildMetaData = new SemanticVersionBuildMetaData(5, "develop", new ReleaseDate
24+
{
25+
OriginalCommitSha = "originalCommitSha",
26+
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
27+
CommitSha = "commitSha",
28+
Date = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
29+
})
30+
}).Keys;
31+
32+
CollectionAssert.AreEquivalent(properties, variables);
33+
}
34+
}

‎Tests/GitHubFlow/MergedBranchesWithVersionFinderTests.cs

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
1-
namespace Tests.GitHubFlow
2-
{
3-
using GitVersion;
4-
using NUnit.Framework;
5-
using Shouldly;
1+
using GitVersion;
2+
using NUnit.Framework;
3+
using Shouldly;
64

7-
public class MergedBranchesWithVersionFinderTests
5+
public class MergedBranchesWithVersionFinderTests
6+
{
7+
[Test]
8+
public void ShouldFindMergeCommit()
89
{
9-
[Test]
10-
public void ShouldFindMergeCommit()
10+
var currentBranch = new MockBranch("master")
1111
{
12-
var currentBranch = new MockBranch("master")
12+
new MockCommit(),
13+
new MockCommit(),
14+
new MockMergeCommit
1315
{
14-
new MockCommit(),
15-
new MockCommit(),
16-
new MockMergeCommit
17-
{
18-
MessageEx = "Merge branch 'release-2.0.0'"
19-
}
20-
};
21-
var sut = new MergedBranchesWithVersionFinder(new GitVersionContext(null, currentBranch));
16+
MessageEx = "Merge branch 'release-2.0.0'"
17+
}
18+
};
19+
var sut = new MergedBranchesWithVersionFinder(new GitVersionContext(null, currentBranch));
2220

23-
var version = sut.GetVersion();
21+
var version = sut.GetVersion();
2422

25-
version.ToString().ShouldBe("2.0.0");
26-
}
23+
version.ToString().ShouldBe("2.0.0");
2724
}
2825
}

‎Tests/GitVersionTask.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎Tests/Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<Compile Include="LambdaEqualityHelperFixture.cs" />
112112
<Compile Include="GitFlow\GitFlowVersionFinderTests.cs" />
113113
<Compile Include="GitHelperTests.cs" />
114-
<Compile Include="GitVersionTask.cs" />
114+
<Compile Include="GetVersionTaskTests.cs" />
115115
<Compile Include="Helpers\Constants.cs" />
116116
<Compile Include="Helpers\DirectoryHelper.cs" />
117117
<Compile Include="Helpers\FindersHelper.cs" />

‎Tests/VariableProviderTests.cs

Lines changed: 64 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,76 @@
1-
namespace Tests
2-
{
3-
using System;
4-
using GitVersion;
5-
using NUnit.Framework;
6-
using Shouldly;
1+
using System;
2+
using GitVersion;
3+
using NUnit.Framework;
4+
using Shouldly;
75

8-
[TestFixture]
9-
public class VariableProviderTests
6+
[TestFixture]
7+
public class VariableProviderTests
8+
{
9+
[Test]
10+
public void DevelopBranchFormatsSemVerForCiFeed()
1011
{
11-
[Test]
12-
public void DevelopBranchFormatsSemVerForCiFeed()
12+
var semVer = new SemanticVersion
1313
{
14-
var semVer = new SemanticVersion
15-
{
16-
Major = 1,
17-
Minor = 2,
18-
Patch = 3,
19-
PreReleaseTag = "unstable.4",
20-
BuildMetaData = "5.Branch.develop"
21-
};
14+
Major = 1,
15+
Minor = 2,
16+
Patch = 3,
17+
PreReleaseTag = "unstable.4",
18+
BuildMetaData = "5.Branch.develop"
19+
};
2220

23-
semVer.BuildMetaData.ReleaseDate = new ReleaseDate
24-
{
25-
OriginalCommitSha = "originalCommitSha",
26-
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
27-
CommitSha = "commitSha",
28-
Date = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
29-
};
21+
semVer.BuildMetaData.ReleaseDate = new ReleaseDate
22+
{
23+
OriginalCommitSha = "originalCommitSha",
24+
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
25+
CommitSha = "commitSha",
26+
Date = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
27+
};
3028

31-
var vars = VariableProvider.GetVariablesFor(semVer);
29+
var vars = VariableProvider.GetVariablesFor(semVer);
3230

33-
vars[VariableProvider.SemVer].ShouldBe("1.2.3.5-unstable");
34-
}
31+
vars[VariableProvider.SemVer].ShouldBe("1.2.3.5-unstable");
32+
}
3533

36-
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.None, true, "1.0.0.0", "2.3.4.5")]
37-
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.None, false, "1.0.0.0", "2.3.4.0")]
38-
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.Major, true, "2.0.0.0", "2.3.4.5")]
39-
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.Major, false, "2.0.0.0", "2.3.4.0")]
40-
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.MajorMinor, true, "2.3.0.0", "2.3.4.5")]
41-
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.MajorMinor, false, "2.3.0.0", "2.3.4.0")]
42-
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.MajorMinorPatch, true, "2.3.4.0", "2.3.4.5")]
43-
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.MajorMinorPatch, false, "2.3.4.0", "2.3.4.0")]
44-
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.None, true, "1.0.0.0", "2.3.4.0")]
45-
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.None, false, "1.0.0.0", "2.3.4.0")]
46-
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.Major, true, "2.0.0.0", "2.3.4.0")]
47-
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.Major, false, "2.0.0.0", "2.3.4.0")]
48-
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.MajorMinor, true, "2.3.0.0", "2.3.4.0")]
49-
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.MajorMinor, false, "2.3.0.0", "2.3.4.0")]
50-
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.MajorMinorPatch, true, "2.3.4.0", "2.3.4.0")]
51-
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.MajorMinorPatch, false, "2.3.4.0", "2.3.4.0")]
52-
public void AssemblyVersion(
53-
int major, int minor, int patch, string buildMetadata,
54-
AssemblyVersioningScheme versioningScheme, bool addNumberOfCommitsSinceTagOnMasterBranchToFileVersion,
55-
string version, string fileVersion)
34+
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.None, true, "1.0.0.0", "2.3.4.5")]
35+
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.None, false, "1.0.0.0", "2.3.4.0")]
36+
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.Major, true, "2.0.0.0", "2.3.4.5")]
37+
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.Major, false, "2.0.0.0", "2.3.4.0")]
38+
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.MajorMinor, true, "2.3.0.0", "2.3.4.5")]
39+
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.MajorMinor, false, "2.3.0.0", "2.3.4.0")]
40+
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.MajorMinorPatch, true, "2.3.4.0", "2.3.4.5")]
41+
[TestCase(2, 3, 4, "5.Branch.master", AssemblyVersioningScheme.MajorMinorPatch, false, "2.3.4.0", "2.3.4.0")]
42+
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.None, true, "1.0.0.0", "2.3.4.0")]
43+
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.None, false, "1.0.0.0", "2.3.4.0")]
44+
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.Major, true, "2.0.0.0", "2.3.4.0")]
45+
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.Major, false, "2.0.0.0", "2.3.4.0")]
46+
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.MajorMinor, true, "2.3.0.0", "2.3.4.0")]
47+
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.MajorMinor, false, "2.3.0.0", "2.3.4.0")]
48+
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.MajorMinorPatch, true, "2.3.4.0", "2.3.4.0")]
49+
[TestCase(2, 3, 4, "5.Branch.develop", AssemblyVersioningScheme.MajorMinorPatch, false, "2.3.4.0", "2.3.4.0")]
50+
public void AssemblyVersion(
51+
int major, int minor, int patch, string buildMetadata,
52+
AssemblyVersioningScheme versioningScheme, bool addNumberOfCommitsSinceTagOnMasterBranchToFileVersion,
53+
string version, string fileVersion)
54+
{
55+
var semVer = new SemanticVersion
5656
{
57-
var semVer = new SemanticVersion
58-
{
59-
Major = major,
60-
Minor = minor,
61-
Patch = patch,
62-
BuildMetaData = buildMetadata
63-
};
57+
Major = major,
58+
Minor = minor,
59+
Patch = patch,
60+
BuildMetaData = buildMetadata
61+
};
6462

65-
semVer.BuildMetaData.ReleaseDate = new ReleaseDate
66-
{
67-
OriginalCommitSha = "originalCommitSha",
68-
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
69-
CommitSha = "commitSha",
70-
Date = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
71-
};
63+
semVer.BuildMetaData.ReleaseDate = new ReleaseDate
64+
{
65+
OriginalCommitSha = "originalCommitSha",
66+
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
67+
CommitSha = "commitSha",
68+
Date = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
69+
};
7270

73-
var vars = VariableProvider.GetVariablesFor(semVer, versioningScheme, addNumberOfCommitsSinceTagOnMasterBranchToFileVersion);
71+
var vars = VariableProvider.GetVariablesFor(semVer, versioningScheme, addNumberOfCommitsSinceTagOnMasterBranchToFileVersion);
7472

75-
vars[VariableProvider.AssemblyVersion].ShouldBe(version);
76-
vars[VariableProvider.AssemblyFileVersion].ShouldBe(fileVersion);
77-
}
73+
vars[VariableProvider.AssemblyVersion].ShouldBe(version);
74+
vars[VariableProvider.AssemblyFileVersion].ShouldBe(fileVersion);
7875
}
79-
}
76+
}

0 commit comments

Comments
 (0)