Skip to content

Commit 79f4192

Browse files
authored
Added build failure checks to tests to prevent continuing tests with a filed build (#36)
Co-authored-by: smaillet <25911635+smaillet@users.noreply.github.com>
1 parent c3586cc commit 79f4192

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

src/Ubiquity.Versioning.Build.Tasks.UT/AssemblyValidationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public void ValidateRepoAssemblyVersion( string targetFramework)
8383
using var collection = new ProjectCollection(globalProperties);
8484

8585
var (buildResults, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
86-
8786
LogBuildMessages(buildResults.Output);
87+
Assert.IsTrue(buildResults.Success);
8888

8989
string? taskAssembly = buildResults.Creator.ProjectInstance.GetOptionalProperty("_Ubiquity_NET_Versioning_Build_Tasks");
9090
Assert.IsNotNull( taskAssembly, "Task assembly property should contain full path to the task DLL (Not NULL)" );

src/Ubiquity.Versioning.Build.Tasks.UT/BuildTaskTests.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public void GoldenPathTest( string targetFramework )
4343
};
4444

4545
using var collection = new ProjectCollection(globalProperties);
46-
var (_, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
46+
var (buildResults, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
47+
Assert.IsTrue(buildResults.Success);
4748

4849
// v20.1.4-alpha => 5.44854.3875.59946 [see: https://csemver.org/playground/site/#/]
4950
// NOTE: CI build is +1 (FileVersionRevision)!
@@ -116,7 +117,8 @@ public void BuildVersionXmlIsUsed( string targetFramework )
116117

117118
using var collection = new ProjectCollection(globalProperties);
118119

119-
var (_, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
120+
var (buildResults, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
121+
Assert.IsTrue(buildResults.Success);
120122

121123
// v20.1.5 => 5.44854.3880.52268 [see: https://csemver.org/playground/site/#/]
122124
// NOTE: CI build is +1 (FileVersionRevision)!
@@ -193,7 +195,8 @@ public void CiBuildInfoIsProcessedCorrectly( string targetFramework )
193195
string expectedIndex = parsedBuildTime.ToBuildIndex();
194196

195197
using var collection = new ProjectCollection(globalProperties);
196-
var (_, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
198+
var (buildResults, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
199+
Assert.IsTrue(buildResults.Success);
197200

198201
// v20.1.5-delta.0.1 => 5.44854.3878.63342 [see: https://csemver.org/playground/site/#/]
199202
// NOTE: CI build is +1 (FileVersionRevision)!
@@ -275,7 +278,8 @@ public void PreReleaseFixOfZeroNotShownIfNumber( string targetFramework )
275278
string expectedIndex = parsedBuildTime.ToBuildIndex();
276279

277280
using var collection = new ProjectCollection(globalProperties);
278-
var (_, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
281+
var (buildResults, props) = Context.CreateTestProjectAndInvokeTestedPackage(targetFramework, collection);
282+
Assert.IsTrue(buildResults.Success);
279283

280284
// v20.1.5-delta.1 => 5.44854.3878.63540 [see: https://csemver.org/playground/site/#/]
281285
// NOTE: CI build is +1 (FileVersionRevision)!
@@ -384,7 +388,8 @@ public void ValidateVersionFormatting( bool isPreRelease, bool isCiBuild, bool i
384388
}
385389

386390
using var collection = new ProjectCollection(globalProperties);
387-
var (_, props) = Context.CreateTestProjectAndInvokeTestedPackage("net8.0", collection);
391+
var (buildResults, props) = Context.CreateTestProjectAndInvokeTestedPackage("net8.0", collection);
392+
Assert.IsTrue(buildResults.Success);
388393

389394
FileVersionQuad expectedFileVersion = ExpectedFileVersion(isPreRelease, isCiBuild);
390395

src/Ubiquity.Versioning.Build.Tasks.UT/TestContextExtensions.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,18 @@ internal static VersioningProjectBuildResults CreateTestProjectAndInvokeTestedPa
6060
var resolveResults = ctx.CreateAndResolveTestProject( targetFramework, action, projectCollection );
6161
if (!resolveResults.Success)
6262
{
63+
LogBuildErrors(ctx, resolveResults.Output);
6364
return new(resolveResults, default);
6465
}
6566

6667
// Since this project uses an imported target, it won't even exist until AFTER ResolvePackageDependencies[DesignTime|ForBuild] comes along.
6768
var (result, output) = resolveResults.Creator.ProjectInstance.Build("PrepareVersioningForBuild");
6869
Assert.IsNotNull( result );
6970
Assert.IsNotNull( result.ProjectStateAfterBuild );
71+
if (result.OverallResult != BuildResultCode.Success)
72+
{
73+
LogBuildErrors(ctx, output);
74+
}
7075

7176
return new(
7277
new ProjectBuildResults(resolveResults.Creator, output, result.OverallResult == BuildResultCode.Success),

0 commit comments

Comments
 (0)