Skip to content

Commit a1ff7df

Browse files
bordingbording
committed
Clean up AssemblyInfoFileUpdater and simplify tests
1 parent 8185eea commit a1ff7df

File tree

2 files changed

+81
-106
lines changed

2 files changed

+81
-106
lines changed

‎src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 39 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@ public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(strin
2727
{
2828
var fileSystem = new TestFileSystem();
2929
var workingDir = Path.GetTempPath();
30-
var assemblyInfoFile = new HashSet<string>
31-
{
32-
"VersionAssemblyInfo." + fileExtension
33-
};
34-
var fullPath = Path.Combine(workingDir, assemblyInfoFile.First());
30+
var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
31+
var fullPath = Path.Combine(workingDir, assemblyInfoFile);
3532
var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
3633

3734
using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))
@@ -51,11 +48,8 @@ public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo
5148
{
5249
var fileSystem = new TestFileSystem();
5350
var workingDir = Path.GetTempPath();
54-
var assemblyInfoFile = new HashSet<string>
55-
{
56-
Path.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension)
57-
};
58-
var fullPath = Path.Combine(workingDir, assemblyInfoFile.First());
51+
var assemblyInfoFile = Path.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension);
52+
var fullPath = Path.Combine(workingDir, assemblyInfoFile);
5953
var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
6054

6155
using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))
@@ -75,18 +69,18 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf
7569
{
7670
var fileSystem = new TestFileSystem();
7771
var workingDir = Path.GetTempPath();
78-
var assemblyInfoFile = new HashSet<string>
72+
var assemblyInfoFiles = new HashSet<string>
7973
{
8074
"AssemblyInfo." + fileExtension,
8175
Path.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension)
8276
};
8377
var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
8478

85-
using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))
79+
using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, true))
8680
{
8781
assemblyInfoFileUpdater.Update();
8882

89-
foreach (var item in assemblyInfoFile)
83+
foreach (var item in assemblyInfoFiles)
9084
{
9185
var fullPath = Path.Combine(workingDir, item);
9286
fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
@@ -101,11 +95,8 @@ public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo
10195
{
10296
var fileSystem = new TestFileSystem();
10397
var workingDir = Path.GetTempPath();
104-
var assemblyInfoFile = new HashSet<string>
105-
{
106-
"VersionAssemblyInfo." + fileExtension
107-
};
108-
var fullPath = Path.Combine(workingDir, assemblyInfoFile.First());
98+
var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
99+
var fullPath = Path.Combine(workingDir, assemblyInfoFile);
109100
var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
110101

111102
using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
@@ -121,11 +112,8 @@ public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssembly
121112
{
122113
var fileSystem = Substitute.For<IFileSystem>();
123114
var workingDir = Path.GetTempPath();
124-
var assemblyInfoFile = new HashSet<string>
125-
{
126-
"VersionAssemblyInfo.js"
127-
};
128-
var fullPath = Path.Combine(workingDir, assemblyInfoFile.First());
115+
var assemblyInfoFile = "VersionAssemblyInfo.js";
116+
var fullPath = Path.Combine(workingDir, assemblyInfoFile);
129117
var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
130118

131119
using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))
@@ -141,10 +129,10 @@ public void ShouldStartSearchFromWorkingDirectory()
141129
{
142130
var fileSystem = Substitute.For<IFileSystem>();
143131
var workingDir = Path.GetTempPath();
144-
var assemblyInfoFile = new HashSet<string>();
132+
var assemblyInfoFiles = new HashSet<string>();
145133
var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
146134

147-
using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
135+
using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, false))
148136
{
149137
assemblyInfoFileUpdater.Update();
150138

@@ -160,11 +148,8 @@ public void ShouldStartSearchFromWorkingDirectory()
160148
public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFileContent)
161149
{
162150
var workingDir = Path.GetTempPath();
163-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
164-
var assemblyInfoFile = new HashSet<string>
165-
{
166-
"AssemblyInfo." + fileExtension
167-
};
151+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
152+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
168153

169154
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
170155
{
@@ -188,11 +173,8 @@ public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFi
188173
public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
189174
{
190175
var workingDir = Path.GetTempPath();
191-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
192-
var assemblyInfoFile = new HashSet<string>
193-
{
194-
"AssemblyInfo." + fileExtension
195-
};
176+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
177+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
196178

197179
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>
198180
{
@@ -214,11 +196,8 @@ public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileEx
214196
public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, string assemblyFileContent)
215197
{
216198
var workingDir = Path.GetTempPath();
217-
var fileName = Path.Combine(workingDir, "Project", "src", "Properties", "AssemblyInfo." + fileExtension);
218-
var assemblyInfoFile = new HashSet<string>
219-
{
220-
Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension)
221-
};
199+
var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
200+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
222201

223202
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
224203
{
@@ -240,11 +219,8 @@ public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, str
240219
public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string fileExtension, string assemblyFileContent)
241220
{
242221
var workingDir = Path.GetTempPath();
243-
var fileName = Path.Combine(workingDir, "Project", "src", "Properties", "AssemblyInfo." + fileExtension);
244-
var assemblyInfoFile = new HashSet<string>
245-
{
246-
Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension)
247-
};
222+
var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
223+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
248224

249225
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
250226
{
@@ -268,11 +244,8 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string file
268244
public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string assemblyFileContent)
269245
{
270246
var workingDir = Path.GetTempPath();
271-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
272-
var assemblyInfoFile = new HashSet<string>
273-
{
274-
"AssemblyInfo." + fileExtension
275-
};
247+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
248+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
276249

277250
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
278251
{
@@ -296,11 +269,8 @@ public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string as
296269
public void ShouldReplaceAssemblyVersionWithAtttributeSuffix(string fileExtension, string assemblyFileContent)
297270
{
298271
var workingDir = Path.GetTempPath();
299-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
300-
var assemblyInfoFile = new HashSet<string>
301-
{
302-
"AssemblyInfo." + fileExtension
303-
};
272+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
273+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
304274

305275
VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
306276
{
@@ -325,11 +295,8 @@ public void ShouldReplaceAssemblyVersionWithAtttributeSuffix(string fileExtensio
325295
public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension)
326296
{
327297
var workingDir = Path.GetTempPath();
328-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
329-
var assemblyInfoFile = new HashSet<string>
330-
{
331-
"AssemblyInfo." + fileExtension
332-
};
298+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
299+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
333300

334301
VerifyAssemblyInfoFile("", fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
335302
{
@@ -353,11 +320,8 @@ public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension)
353320
public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string assemblyFileContent)
354321
{
355322
var workingDir = Path.GetTempPath();
356-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
357-
var assemblyInfoFile = new HashSet<string>
358-
{
359-
"AssemblyInfo." + fileExtension
360-
};
323+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
324+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
361325

362326
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
363327
{
@@ -381,11 +345,8 @@ public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string a
381345
public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsureAssemblyInfo(string fileExtension, string assemblyFileContent)
382346
{
383347
var workingDir = Path.GetTempPath();
384-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
385-
var assemblyInfoFile = new HashSet<string>
386-
{
387-
"AssemblyInfo." + fileExtension
388-
};
348+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
349+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
389350

390351
VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
391352
{
@@ -407,11 +368,8 @@ public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsure
407368
public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileExtension, string assemblyFileContent)
408369
{
409370
var workingDir = Path.GetTempPath();
410-
var fileName = Path.Combine(workingDir, "Project", "src", "Properties", "AssemblyInfo." + fileExtension);
411-
var assemblyInfoFile = new HashSet<string>
412-
{
413-
Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension)
414-
};
371+
var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
372+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
415373

416374
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
417375
{
@@ -433,11 +391,8 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileE
433391
public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace(string fileExtension, string assemblyFileContent)
434392
{
435393
var workingDir = Path.GetTempPath();
436-
var fileName = Path.Combine(workingDir, "Project", "src", "Properties", "AssemblyInfo." + fileExtension);
437-
var assemblyInfoFile = new HashSet<string>
438-
{
439-
Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension)
440-
};
394+
var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
395+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
441396

442397
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
443398
{
@@ -461,11 +416,8 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace
461416
public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile(string fileExtension, string assemblyFileContent)
462417
{
463418
var workingDir = Path.GetTempPath();
464-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
465-
var assemblyInfoFile = new HashSet<string>
466-
{
467-
"AssemblyInfo." + fileExtension
468-
};
419+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
420+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
469421

470422
VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
471423
{
@@ -487,11 +439,8 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
487439
public void ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
488440
{
489441
var workingDir = Path.GetTempPath();
490-
var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
491-
var assemblyInfoFile = new HashSet<string>
492-
{
493-
"AssemblyInfo." + fileExtension
494-
};
442+
var assemblyInfoFile = "AssemblyInfo." + fileExtension;
443+
var fileName = Path.Combine(workingDir, assemblyInfoFile);
495444

496445
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>
497446
{

0 commit comments

Comments
 (0)