Skip to content

Commit 1f1ea89

Browse files
sebastienrossebastienros
authored
Centralize Verify convention (#9371)
1 parent 6cbb289 commit 1f1ea89

27 files changed

+206
-258
lines changed

‎tests/Aspire.Hosting.Azure.Tests/AzureAppServiceTests.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ public async Task AddContainerAppEnvironmentAddsDeploymentTargetWithContainerApp
4848
var (manifest, bicep) = await GetManifestWithBicep(resource);
4949

5050
await Verify(manifest.ToString(), "json")
51-
.AppendContentAsFile(bicep, "bicep")
52-
.UseHelixAwareDirectory();
51+
.AppendContentAsFile(bicep, "bicep");
5352
}
5453

5554
[Fact]
@@ -70,8 +69,7 @@ public async Task AddContainerAppEnvironmentAddsEnvironmentResource()
7069
var (manifest, bicep) = await GetManifestWithBicep(environment);
7170

7271
await Verify(manifest.ToString(), "json")
73-
.AppendContentAsFile(bicep, "bicep")
74-
.UseHelixAwareDirectory();
72+
.AppendContentAsFile(bicep, "bicep");
7573
}
7674

7775
[Fact]
@@ -104,8 +102,7 @@ public async Task KeyvaultReferenceHandling()
104102
var (manifest, bicep) = await GetManifestWithBicep(resource);
105103

106104
await Verify(manifest.ToString(), "json")
107-
.AppendContentAsFile(bicep, "bicep")
108-
.UseHelixAwareDirectory();
105+
.AppendContentAsFile(bicep, "bicep");
109106
}
110107

111108
[Fact]
@@ -140,8 +137,7 @@ public async Task EndpointReferencesAreResolvedAcrossProjects()
140137
var (manifest, bicep) = await GetManifestWithBicep(resource);
141138

142139
await Verify(manifest.ToString(), "json")
143-
.AppendContentAsFile(bicep, "bicep")
144-
.UseHelixAwareDirectory();
140+
.AppendContentAsFile(bicep, "bicep");
145141
}
146142

147143
[Fact]

‎tests/Aspire.Hosting.Azure.Tests/AzureBicepResourceTests.cs

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,7 @@ public async Task AddAzureCosmosDBViaRunMode_WithAccessKeyAuthentication(string?
324324

325325
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
326326

327-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
328-
.UseHelixAwareDirectory("Snapshots");
327+
await Verify(manifest.BicepText, extension: "bicep");
329328

330329
Assert.NotNull(callbackDatabases);
331330
Assert.Collection(
@@ -368,8 +367,7 @@ public async Task AddAzureCosmosDBViaRunMode_NoAccessKeyAuthentication()
368367
output.WriteLine(manifest.ManifestNode.ToString());
369368
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
370369

371-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
372-
.UseHelixAwareDirectory("Snapshots");
370+
await Verify(manifest.BicepText, extension: "bicep");
373371

374372
Assert.NotNull(callbackDatabases);
375373
Assert.Collection(
@@ -445,8 +443,7 @@ public async Task AddAzureCosmosDBViaPublishMode_WithAccessKeyAuthentication(str
445443
output.WriteLine(m);
446444
Assert.Equal(expectedManifest, m);
447445

448-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
449-
.UseHelixAwareDirectory("Snapshots");
446+
await Verify(manifest.BicepText, extension: "bicep");
450447

451448
Assert.NotNull(callbackDatabases);
452449
Assert.Collection(
@@ -487,8 +484,7 @@ public async Task AddAzureCosmosDBViaPublishMode_NoAccessKeyAuthentication()
487484
""";
488485
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
489486

490-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
491-
.UseHelixAwareDirectory("Snapshots");
487+
await Verify(manifest.BicepText, extension: "bicep");
492488

493489
Assert.NotNull(callbackDatabases);
494490
Assert.Collection(
@@ -611,8 +607,7 @@ public async Task AddApplicationInsightsWithoutExplicitLawGetsDefaultLawParamete
611607
""";
612608
Assert.Equal(expectedManifest, appInsightsManifest.ManifestNode.ToString());
613609

614-
await Verifier.Verify(appInsightsManifest.BicepText, extension: "bicep")
615-
.UseHelixAwareDirectory("Snapshots");
610+
await Verify(appInsightsManifest.BicepText, extension: "bicep");
616611
}
617612

618613
[Fact]
@@ -640,8 +635,7 @@ public async Task AddApplicationInsightsWithoutExplicitLawGetsDefaultLawParamete
640635
""";
641636
Assert.Equal(expectedManifest, appInsightsManifest.ManifestNode.ToString());
642637

643-
await Verifier.Verify(appInsightsManifest.BicepText, extension: "bicep")
644-
.UseHelixAwareDirectory("Snapshots");
638+
await Verify(appInsightsManifest.BicepText, extension: "bicep");
645639
}
646640

647641
[Fact]
@@ -673,8 +667,7 @@ public async Task AddApplicationInsightsWithExplicitLawArgumentDoesntGetDefaultP
673667
""";
674668
Assert.Equal(expectedManifest, appInsightsManifest.ManifestNode.ToString());
675669

676-
await Verifier.Verify(appInsightsManifest.BicepText, extension: "bicep")
677-
.UseHelixAwareDirectory("Snapshots");
670+
await Verify(appInsightsManifest.BicepText, extension: "bicep");
678671
}
679672

680673
[Fact]
@@ -696,8 +689,7 @@ public async Task AddLogAnalyticsWorkspace()
696689
""";
697690
Assert.Equal(expectedManifest, appInsightsManifest.ManifestNode.ToString());
698691

699-
await Verifier.Verify(appInsightsManifest.BicepText, extension: "bicep")
700-
.UseHelixAwareDirectory("Snapshots");
692+
await Verify(appInsightsManifest.BicepText, extension: "bicep");
701693
}
702694

703695
[Fact]
@@ -846,8 +838,7 @@ public async Task PublishAsRedisPublishesRedisAsAzureRedisInfrastructure()
846838
""";
847839
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
848840

849-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
850-
.UseHelixAwareDirectory("Snapshots");
841+
await Verify(manifest.BicepText, extension: "bicep");
851842
}
852843

853844
[Fact]
@@ -878,8 +869,7 @@ public async Task AsAzureSqlDatabaseViaRunMode()
878869
""";
879870
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
880871

881-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
882-
.UseHelixAwareDirectory("Snapshots");
872+
await Verify(manifest.BicepText, extension: "bicep");
883873
}
884874

885875
[Fact]
@@ -910,8 +900,7 @@ public async Task AsAzureSqlDatabaseViaPublishMode()
910900
""";
911901
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
912902

913-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
914-
.UseHelixAwareDirectory("Snapshots");
903+
await Verify(manifest.BicepText, extension: "bicep");
915904
}
916905

917906
[Fact]
@@ -954,8 +943,7 @@ public async Task AsAzurePostgresFlexibleServerViaRunMode()
954943
""";
955944
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
956945

957-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
958-
.UseHelixAwareDirectory("Snapshots");
946+
await Verify(manifest.BicepText, extension: "bicep");
959947
}
960948

961949
[Fact]
@@ -998,8 +986,7 @@ public async Task AsAzurePostgresFlexibleServerViaPublishMode()
998986
""";
999987
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
1000988

1001-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1002-
.UseHelixAwareDirectory("Snapshots");
989+
await Verify(manifest.BicepText, extension: "bicep");
1003990
}
1004991

1005992
[Fact]
@@ -1154,8 +1141,7 @@ public async Task AddAzureServiceBus(bool useObsoleteMethods)
11541141
""";
11551142
Assert.Equal(expected, manifest.ManifestNode.ToString());
11561143

1157-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1158-
.UseHelixAwareDirectory("Snapshots");
1144+
await Verify(manifest.BicepText, extension: "bicep");
11591145

11601146
var sbRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "sb-roles");
11611147
var sbRolesManifest = await GetManifestWithBicep(sbRoles, skipPreparer: true);
@@ -1215,8 +1201,7 @@ public async Task AddDefaultAzureWebPubSub()
12151201

12161202
Assert.Equal("wps1", wps.Resource.Name);
12171203
output.WriteLine(manifest.BicepText);
1218-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1219-
.UseHelixAwareDirectory("Snapshots");
1204+
await Verify(manifest.BicepText, extension: "bicep");
12201205

12211206
var wpsRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "wps1-roles");
12221207
var wpsRolesManifest = await GetManifestWithBicep(wpsRoles, skipPreparer: true);
@@ -1274,8 +1259,7 @@ public async Task AddAzureWebPubSubWithParameters()
12741259

12751260
Assert.Equal("wps1", wps.Resource.Name);
12761261

1277-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1278-
.UseHelixAwareDirectory("Snapshots");
1262+
await Verify(manifest.BicepText, extension: "bicep");
12791263
}
12801264

12811265
[Fact]
@@ -1352,8 +1336,7 @@ public async Task AddAzureStorageViaRunMode()
13521336
""";
13531337
Assert.Equal(expectedStorageManifest, storageManifest.ManifestNode.ToString());
13541338

1355-
await Verifier.Verify(storageManifest.BicepText, extension: "bicep")
1356-
.UseHelixAwareDirectory("Snapshots");
1339+
await Verify(storageManifest.BicepText, extension: "bicep");
13571340

13581341
// Check blob resource.
13591342
var blob = storage.AddBlobs("blob");
@@ -1438,8 +1421,7 @@ public async Task AddAzureStorageViaRunModeAllowSharedKeyAccessOverridesDefaultF
14381421
""";
14391422
Assert.Equal(expectedStorageManifest, storageManifest.ManifestNode.ToString());
14401423

1441-
await Verifier.Verify(storageManifest.BicepText, extension: "bicep")
1442-
.UseHelixAwareDirectory("Snapshots");
1424+
await Verify(storageManifest.BicepText, extension: "bicep");
14431425

14441426
// Check blob resource.
14451427
var blob = storage.AddBlobs("blob");
@@ -1529,8 +1511,7 @@ public async Task AddAzureStorageViaPublishMode()
15291511
""";
15301512
Assert.Equal(expectedStorageManifest, storageManifest.ManifestNode.ToString());
15311513

1532-
await Verifier.Verify(storageManifest.BicepText, extension: "bicep")
1533-
.UseHelixAwareDirectory("Snapshots");
1514+
await Verify(storageManifest.BicepText, extension: "bicep");
15341515

15351516
var storageRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "storage-roles");
15361517
var storageRolesManifest = await GetManifestWithBicep(storageRoles, skipPreparer: true);
@@ -1660,8 +1641,7 @@ public async Task AddAzureStorageViaPublishModeEnableAllowSharedKeyAccessOverrid
16601641

16611642
Assert.Equal(expectedStorageManifest, storageManifest.ManifestNode.ToString());
16621643

1663-
await Verifier.Verify(storageManifest.BicepText, extension: "bicep")
1664-
.UseHelixAwareDirectory("Snapshots");
1644+
await Verify(storageManifest.BicepText, extension: "bicep");
16651645

16661646
// Check blob resource.
16671647
var blob = storage.AddBlobs("blob");
@@ -1752,8 +1732,7 @@ public async Task AddAzureSearch()
17521732
""";
17531733
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
17541734

1755-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1756-
.UseHelixAwareDirectory("Snapshots");
1735+
await Verify(manifest.BicepText, extension: "bicep");
17571736

17581737
var searchRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "search-roles");
17591738
var searchRolesManifest = await GetManifestWithBicep(searchRoles, skipPreparer: true);
@@ -1884,8 +1863,7 @@ public async Task AddAzureOpenAI(bool overrideLocalAuthDefault, bool useObsolete
18841863
""";
18851864
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
18861865

1887-
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1888-
.UseHelixAwareDirectory("Snapshots");
1866+
await Verify(manifest.BicepText, extension: "bicep");
18891867

18901868
var openaiRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "openai-roles");
18911869
var openaiRolesManifest = await GetManifestWithBicep(openaiRoles, skipPreparer: true);
@@ -1985,8 +1963,7 @@ public async Task InfrastructureCanBeMutatedAfterCreation()
19851963
""";
19861964
Assert.Equal(expectedManifest, manifest.ToString());
19871965

1988-
await Verifier.Verify(bicep, extension: "bicep")
1989-
.UseHelixAwareDirectory("Snapshots");
1966+
await Verify(bicep, extension: "bicep");
19901967
}
19911968

19921969
[UnsafeAccessor(UnsafeAccessorKind.Method, Name = "ExecuteBeforeStartHooksAsync")]

0 commit comments

Comments
 (0)