Skip to content

Commit f353dd8

Browse files
KierantiesKieranties
committed
CR: Whitespace correction
1 parent b82c297 commit f353dd8

File tree

1 file changed

+65
-65
lines changed

1 file changed

+65
-65
lines changed

‎src/GitVersionCore.Tests/MergeMessageTests.cs

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ public void EmptyTagPrefix(string prefix)
5555

5656
private static readonly object[] MergeMessages =
5757
{
58-
new object[] { "Merge branch 'feature/one'", "feature/one", null, null },
59-
new object[] { "Merge branch 'origin/feature/one'", "origin/feature/one", null, null },
60-
new object[] { "Merge tag 'v4.0.0' into master", "v4.0.0", "master", new SemanticVersion(4) },
61-
new object[] { "Merge tag 'V4.0.0' into master", "V4.0.0", "master", new SemanticVersion(4) },
62-
new object[] { "Merge branch 'feature/4.1/one'", "feature/4.1/one", null, new SemanticVersion(4, 1) },
63-
new object[] { "Merge branch 'origin/4.1/feature/one'", "origin/4.1/feature/one", null, new SemanticVersion(4, 1) },
64-
new object[] { "Merge tag 'v://10.10.10.10' into master", "v://10.10.10.10", "master", null }
58+
new object[] { "Merge branch 'feature/one'", "feature/one", null, null },
59+
new object[] { "Merge branch 'origin/feature/one'", "origin/feature/one", null, null },
60+
new object[] { "Merge tag 'v4.0.0' into master", "v4.0.0", "master", new SemanticVersion(4) },
61+
new object[] { "Merge tag 'V4.0.0' into master", "V4.0.0", "master", new SemanticVersion(4) },
62+
new object[] { "Merge branch 'feature/4.1/one'", "feature/4.1/one", null, new SemanticVersion(4, 1) },
63+
new object[] { "Merge branch 'origin/4.1/feature/one'", "origin/4.1/feature/one", null, new SemanticVersion(4, 1) },
64+
new object[] { "Merge tag 'v://10.10.10.10' into master", "v://10.10.10.10", "master", null }
6565
};
6666

6767
[TestCaseSource(nameof(MergeMessages))]
@@ -85,13 +85,13 @@ public void ParsesMergeMessage(
8585

8686
private static readonly object[] GitHubPullPullMergeMessages =
8787
{
88-
new object[] { "Merge pull request #1234 from feature/one", "feature/one", null, null, 1234 },
89-
new object[] { "Merge pull request #1234 in feature/one", "feature/one", null, null, 1234 },
90-
new object[] { "Merge pull request #1234 in v4.0.0", "v4.0.0", null, new SemanticVersion(4), 1234 },
91-
new object[] { "Merge pull request #1234 from origin/feature/one", "origin/feature/one", null, null, 1234 },
92-
new object[] { "Merge pull request #1234 in feature/4.1/one", "feature/4.1/one", null, new SemanticVersion(4,1), 1234 },
93-
new object[] { "Merge pull request #1234 in V://10.10.10.10", "V://10.10.10.10", null, null, 1234 },
94-
new object[] { "Merge pull request #1234 from feature/one into dev", "feature/one", "dev", null, 1234 }
88+
new object[] { "Merge pull request #1234 from feature/one", "feature/one", null, null, 1234 },
89+
new object[] { "Merge pull request #1234 in feature/one", "feature/one", null, null, 1234 },
90+
new object[] { "Merge pull request #1234 in v4.0.0", "v4.0.0", null, new SemanticVersion(4), 1234 },
91+
new object[] { "Merge pull request #1234 from origin/feature/one", "origin/feature/one", null, null, 1234 },
92+
new object[] { "Merge pull request #1234 in feature/4.1/one", "feature/4.1/one", null, new SemanticVersion(4,1), 1234 },
93+
new object[] { "Merge pull request #1234 in V://10.10.10.10", "V://10.10.10.10", null, null, 1234 },
94+
new object[] { "Merge pull request #1234 from feature/one into dev", "feature/one", "dev", null, 1234 }
9595
};
9696

9797
[TestCaseSource(nameof(GitHubPullPullMergeMessages))]
@@ -116,16 +116,16 @@ public void ParsesGitHubPullMergeMessage(
116116

117117
private static readonly object[] BitBucketPullMergeMessages =
118118
{
119-
new object[] { "Merge pull request #1234 from feature/one from feature/two to dev", "feature/two", "dev", null, 1234 },
120-
new object[] { "Merge pull request #1234 in feature/one from feature/two to dev", "feature/two", "dev", null, 1234 },
121-
new object[] { "Merge pull request #1234 in v4.0.0 from v4.1.0 to dev", "v4.1.0", "dev", new SemanticVersion(4,1), 1234 },
122-
new object[] { "Merge pull request #1234 from origin/feature/one from origin/feature/4.2/two to dev", "origin/feature/4.2/two", "dev", new SemanticVersion(4,2), 1234 },
123-
new object[] { "Merge pull request #1234 in feature/4.1/one from feature/4.2/two to dev", "feature/4.2/two", "dev", new SemanticVersion(4,2), 1234 },
124-
new object[] { "Merge pull request #1234 from feature/one from feature/two to master" , "feature/two", "master", null, 1234 },
125-
new object[] { "Merge pull request #1234 in V4.1.0 from V://10.10.10.10 to dev", "V://10.10.10.10", "dev", null, 1234 },
126-
//TODO: Investigate successful bitbucket merge messages that may be invalid
127-
// Regex has double 'from/in from' section. Is that correct?
128-
new object[] { "Merge pull request #1234 from feature/one from v4.0.0 to master", "v4.0.0", "master", new SemanticVersion(4), 1234 }
119+
new object[] { "Merge pull request #1234 from feature/one from feature/two to dev", "feature/two", "dev", null, 1234 },
120+
new object[] { "Merge pull request #1234 in feature/one from feature/two to dev", "feature/two", "dev", null, 1234 },
121+
new object[] { "Merge pull request #1234 in v4.0.0 from v4.1.0 to dev", "v4.1.0", "dev", new SemanticVersion(4,1), 1234 },
122+
new object[] { "Merge pull request #1234 from origin/feature/one from origin/feature/4.2/two to dev", "origin/feature/4.2/two", "dev", new SemanticVersion(4,2), 1234 },
123+
new object[] { "Merge pull request #1234 in feature/4.1/one from feature/4.2/two to dev", "feature/4.2/two", "dev", new SemanticVersion(4,2), 1234 },
124+
new object[] { "Merge pull request #1234 from feature/one from feature/two to master" , "feature/two", "master", null, 1234 },
125+
new object[] { "Merge pull request #1234 in V4.1.0 from V://10.10.10.10 to dev", "V://10.10.10.10", "dev", null, 1234 },
126+
//TODO: Investigate successful bitbucket merge messages that may be invalid
127+
// Regex has double 'from/in from' section. Is that correct?
128+
new object[] { "Merge pull request #1234 from feature/one from v4.0.0 to master", "v4.0.0", "master", new SemanticVersion(4), 1234 }
129129
};
130130

131131
[TestCaseSource(nameof(BitBucketPullMergeMessages))]
@@ -151,21 +151,21 @@ public void ParsesBitBucketPullMergeMessage(
151151

152152
private static readonly object[] SmartGitMergeMessages =
153153
{
154-
new object[] { "Finish feature/one", "feature/one", null, null },
155-
new object[] { "Finish origin/feature/one", "origin/feature/one", null, null },
156-
new object[] { "Finish v4.0.0", "v4.0.0", null, new SemanticVersion(4) },
157-
new object[] { "Finish feature/4.1/one", "feature/4.1/one", null, new SemanticVersion(4, 1) },
158-
new object[] { "Finish origin/4.1/feature/one", "origin/4.1/feature/one", null, new SemanticVersion(4, 1) },
159-
new object[] { "Finish V://10.10.10.10", "V://10.10.10.10", null, null },
160-
new object[] { "Finish V4.0.0 into master", "V4.0.0", "master", new SemanticVersion(4) }
154+
new object[] { "Finish feature/one", "feature/one", null, null },
155+
new object[] { "Finish origin/feature/one", "origin/feature/one", null, null },
156+
new object[] { "Finish v4.0.0", "v4.0.0", null, new SemanticVersion(4) },
157+
new object[] { "Finish feature/4.1/one", "feature/4.1/one", null, new SemanticVersion(4, 1) },
158+
new object[] { "Finish origin/4.1/feature/one", "origin/4.1/feature/one", null, new SemanticVersion(4, 1) },
159+
new object[] { "Finish V://10.10.10.10", "V://10.10.10.10", null, null },
160+
new object[] { "Finish V4.0.0 into master", "V4.0.0", "master", new SemanticVersion(4) }
161161
};
162162

163163
[TestCaseSource(nameof(SmartGitMergeMessages))]
164164
public void ParsesSmartGitMergeMessage(
165-
string message,
166-
string expectedMergedBranch,
167-
string expectedTargetBranch,
168-
SemanticVersion expectedVersion)
165+
string message,
166+
string expectedMergedBranch,
167+
string expectedTargetBranch,
168+
SemanticVersion expectedVersion)
169169
{
170170
// Act
171171
var sut = new MergeMessage(message, _config);
@@ -181,21 +181,21 @@ public void ParsesSmartGitMergeMessage(
181181

182182
private static readonly object[] RemoteTrackingMergeMessages =
183183
{
184-
new object[] { "Merge remote-tracking branch 'feature/one' into master", "feature/one", "master", null },
185-
new object[] { "Merge remote-tracking branch 'origin/feature/one' into dev", "origin/feature/one", "dev", null },
186-
new object[] { "Merge remote-tracking branch 'v4.0.0' into master", "v4.0.0", "master", new SemanticVersion(4) },
187-
new object[] { "Merge remote-tracking branch 'V4.0.0' into master", "V4.0.0", "master", new SemanticVersion(4) },
188-
new object[] { "Merge remote-tracking branch 'feature/4.1/one' into dev", "feature/4.1/one", "dev", new SemanticVersion(4, 1) },
189-
new object[] { "Merge remote-tracking branch 'origin/4.1/feature/one' into master", "origin/4.1/feature/one", "master", new SemanticVersion(4, 1) },
190-
new object[] { "Merge remote-tracking branch 'v://10.10.10.10' into master", "v://10.10.10.10", "master", null }
184+
new object[] { "Merge remote-tracking branch 'feature/one' into master", "feature/one", "master", null },
185+
new object[] { "Merge remote-tracking branch 'origin/feature/one' into dev", "origin/feature/one", "dev", null },
186+
new object[] { "Merge remote-tracking branch 'v4.0.0' into master", "v4.0.0", "master", new SemanticVersion(4) },
187+
new object[] { "Merge remote-tracking branch 'V4.0.0' into master", "V4.0.0", "master", new SemanticVersion(4) },
188+
new object[] { "Merge remote-tracking branch 'feature/4.1/one' into dev", "feature/4.1/one", "dev", new SemanticVersion(4, 1) },
189+
new object[] { "Merge remote-tracking branch 'origin/4.1/feature/one' into master", "origin/4.1/feature/one", "master", new SemanticVersion(4, 1) },
190+
new object[] { "Merge remote-tracking branch 'v://10.10.10.10' into master", "v://10.10.10.10", "master", null }
191191
};
192192

193193
[TestCaseSource(nameof(RemoteTrackingMergeMessages))]
194194
public void ParsesRemoteTrackingMergeMessage(
195-
string message,
196-
string expectedMergedBranch,
197-
string expectedTargetBranch,
198-
SemanticVersion expectedVersion)
195+
string message,
196+
string expectedMergedBranch,
197+
string expectedTargetBranch,
198+
SemanticVersion expectedVersion)
199199
{
200200
// Act
201201
var sut = new MergeMessage(message, _config);
@@ -211,33 +211,33 @@ public void ParsesRemoteTrackingMergeMessage(
211211

212212
private static readonly object[] ParsesTfsEnglishUSMergeMessages =
213213
{
214-
new object[] { "Merge feature/one to master", "feature/one", "master", null },
215-
new object[] { "Merge v://10.10.10.10 to master", "v://10.10.10.10", "master", null },
216-
new object[] { "Merge feature/one to v://10.10.10.10", "feature/one", "v://10.10.10.10", null },
217-
new object[] { "Merge V4.0.0 to master", "V4.0.0", "master", new SemanticVersion(4) },
218-
new object[] { "Merge feature/4.1/one to master", "feature/4.1/one", "master", new SemanticVersion(4, 1) }
214+
new object[] { "Merge feature/one to master", "feature/one", "master", null },
215+
new object[] { "Merge v://10.10.10.10 to master", "v://10.10.10.10", "master", null },
216+
new object[] { "Merge feature/one to v://10.10.10.10", "feature/one", "v://10.10.10.10", null },
217+
new object[] { "Merge V4.0.0 to master", "V4.0.0", "master", new SemanticVersion(4) },
218+
new object[] { "Merge feature/4.1/one to master", "feature/4.1/one", "master", new SemanticVersion(4, 1) }
219219
};
220220

221221
[TestCaseSource(nameof(ParsesTfsEnglishUSMergeMessages))]
222222
public void ParsesTfsEnglishUSMessage(
223-
string message,
224-
string expectedMergedBranch,
225-
string expectedTargetBranch,
226-
SemanticVersion expectedVersion)
223+
string message,
224+
string expectedMergedBranch,
225+
string expectedTargetBranch,
226+
SemanticVersion expectedVersion)
227227
{
228228
// Act
229229
var sut = new MergeMessage(message, _config);
230230

231231
// Assert
232-
sut.MatchDefinition.ShouldBe("TfsMergeMessageEnglishUS");
232+
sut.MatchDefinition.ShouldBe("TfsMergeMessageEnglishUS");
233233
sut.TargetBranch.ShouldBe(expectedTargetBranch);
234234
sut.MergedBranch.ShouldBe(expectedMergedBranch);
235235
sut.IsMergedPullRequest.ShouldBeFalse();
236236
sut.PullRequestNumber.ShouldBeNull();
237237
sut.Version.ShouldBe(expectedVersion);
238238
}
239239

240-
private static readonly object[] ParsesTfsGermanDEMergeMessages =
240+
private static readonly object[] ParsesTfsGermanDEMergeMessages =
241241
{
242242
new object[] { "Zusammengeführter PR \"1234\": feature/one mit master mergen", "feature/one", "master", null, 1234 },
243243
new object[] { "Zusammengeführter PR \"1234\": v://10.10.10.10 mit master mergen", "v://10.10.10.10", "master", null, 1234 },
@@ -248,11 +248,11 @@ public void ParsesTfsEnglishUSMessage(
248248

249249
[TestCaseSource(nameof(ParsesTfsGermanDEMergeMessages))]
250250
public void ParseTfsGermanDEMessage(
251-
string message,
252-
string expectedMergedBranch,
253-
string expectedTargetBranch,
254-
SemanticVersion expectedVersion,
255-
int? expectedPullRequestNumber)
251+
string message,
252+
string expectedMergedBranch,
253+
string expectedTargetBranch,
254+
SemanticVersion expectedVersion,
255+
int? expectedPullRequestNumber)
256256
{
257257
// Act
258258
var sut = new MergeMessage(message, _config);
@@ -268,9 +268,9 @@ public void ParseTfsGermanDEMessage(
268268

269269
private static readonly object[] InvalidMergeMessages =
270270
{
271-
new object[] { "Merge pull request # from feature/one", "", null, null, null },
272-
new object[] { "Merge pull request # in feature/one from feature/two to master" , "", null, null, null },
273-
new object[] { "Zusammengeführter PR : feature/one mit master mergen", "", null, null, null }
271+
new object[] { "Merge pull request # from feature/one", "", null, null, null },
272+
new object[] { "Merge pull request # in feature/one from feature/two to master" , "", null, null, null },
273+
new object[] { "Zusammengeführter PR : feature/one mit master mergen", "", null, null, null }
274274
};
275275

276276
[TestCaseSource(nameof(InvalidMergeMessages))]

0 commit comments

Comments
 (0)