Skip to content

Commit 8b29f59

Browse files
webprofusion-chriscwebprofusion-chrisc
committed
Tests: cleanup
1 parent 0e684f6 commit 8b29f59

File tree

6 files changed

+37
-32
lines changed

6 files changed

+37
-32
lines changed

‎src/Certify.Tests/Certify.Core.Tests.Integration/CertRequestTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public CertRequestTests()
4444
PrimaryTestDomain = ConfigSettings["Cloudflare_TestDomain"];
4545

4646
testSiteDomain = "integration1." + PrimaryTestDomain;
47-
testSitePath = _primaryWebRoot;
47+
testSitePath = PrimaryWebRootPath;
4848

4949
_testCredStorageKey = ConfigSettings["TestCredentialsKey_Cloudflare"];
5050

@@ -69,7 +69,7 @@ public async Task SetupIIS()
6969
await iisManager.DeleteSite(testSiteName);
7070
}
7171

72-
var site = await iisManager.CreateSite(testSiteName, testSiteDomain, _primaryWebRoot, "DefaultAppPool", port: testSiteHttpPort);
72+
var site = await iisManager.CreateSite(testSiteName, testSiteDomain, PrimaryWebRootPath, "DefaultAppPool", port: testSiteHttpPort);
7373
Assert.IsTrue(await iisManager.SiteExists(testSiteName));
7474
_siteId = site.Id.ToString();
7575
}
@@ -527,7 +527,7 @@ public async Task TestChallengeRequestDNSWildcard()
527527
await iisManager.DeleteSite(testWildcardSiteName);
528528
}
529529

530-
var site = await iisManager.CreateSite(testWildcardSiteName, "test" + testStr + "." + PrimaryTestDomain, _primaryWebRoot, "DefaultAppPool", port: testSiteHttpPort);
530+
var site = await iisManager.CreateSite(testWildcardSiteName, "test" + testStr + "." + PrimaryTestDomain, PrimaryWebRootPath, "DefaultAppPool", port: testSiteHttpPort);
531531

532532
ManagedCertificate managedCertificate = null;
533533
X509Certificate2 certInfo = null;

‎src/Certify.Tests/Certify.Core.Tests.Integration/CertificateStoreCleanup.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public async Task TestCertCleanupAtExpiry()
2929
await iisManager.DeleteSite(testSiteDomain);
3030
}
3131

32-
var site = await iisManager.CreateSite(testSiteDomain, testSiteDomain, _primaryWebRoot, "DefaultAppPool");
32+
var site = await iisManager.CreateSite(testSiteDomain, testSiteDomain, PrimaryWebRootPath, "DefaultAppPool");
3333

3434
await iisManager.AddOrUpdateSiteBinding(
3535
new Models.BindingInfo
@@ -92,7 +92,7 @@ public async Task TestCertCleanupByThumbprint()
9292
await iisManager.DeleteSite(testSiteDomain);
9393
}
9494

95-
var site = await iisManager.CreateSite(testSiteDomain, testSiteDomain, _primaryWebRoot, "DefaultAppPool");
95+
var site = await iisManager.CreateSite(testSiteDomain, testSiteDomain, PrimaryWebRootPath, "DefaultAppPool");
9696

9797
await iisManager.AddOrUpdateSiteBinding(
9898
new Models.BindingInfo
@@ -156,7 +156,7 @@ public async Task TestCertCleanupFull()
156156
await iisManager.DeleteSite(testSiteDomain);
157157
}
158158

159-
var site = await iisManager.CreateSite(testSiteDomain, testSiteDomain, _primaryWebRoot, "DefaultAppPool");
159+
var site = await iisManager.CreateSite(testSiteDomain, testSiteDomain, PrimaryWebRootPath, "DefaultAppPool");
160160

161161
await iisManager.AddOrUpdateSiteBinding(
162162
new Models.BindingInfo
@@ -223,7 +223,7 @@ public async Task TestCertCleanupAfterRenewal()
223223
await iisManager.DeleteSite(testSiteDomain);
224224
}
225225

226-
var site = await iisManager.CreateSite(testSiteDomain, testSiteDomain, _primaryWebRoot, "DefaultAppPool");
226+
var site = await iisManager.CreateSite(testSiteDomain, testSiteDomain, PrimaryWebRootPath, "DefaultAppPool");
227227

228228
await iisManager.AddOrUpdateSiteBinding(
229229
new Models.BindingInfo

‎src/Certify.Tests/Certify.Core.Tests.Integration/CertifyManagerServerTypeTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public async Task SetupIIS()
3737
await _iisManager.DeleteSite(_testSiteName);
3838
}
3939

40-
var site = await _iisManager.CreateSite(_testSiteName, _testSiteDomain, _primaryWebRoot, "DefaultAppPool", ipAddress: _testSiteIp, port: _testSiteHttpPort);
40+
var site = await _iisManager.CreateSite(_testSiteName, _testSiteDomain, PrimaryWebRootPath, "DefaultAppPool", ipAddress: _testSiteIp, port: _testSiteHttpPort);
4141
Assert.IsTrue(await _iisManager.SiteExists(_testSiteName));
4242
_testSiteId = site.Id.ToString();
4343
}
@@ -158,7 +158,7 @@ public async Task TestCertifyManagerGetDomainOptionsFromSiteNoDomain()
158158
}
159159

160160
// Add no domain site
161-
var noDomainSite = await _iisManager.CreateSite(noDomainSiteName, "", _primaryWebRoot, "DefaultAppPool", port: 81);
161+
var noDomainSite = await _iisManager.CreateSite(noDomainSiteName, "", PrimaryWebRootPath, "DefaultAppPool", port: 81);
162162
Assert.IsTrue(await _iisManager.SiteExists(_testSiteName), "Expected no domain site to be created");
163163
var noDomainSiteId = noDomainSite.Id.ToString();
164164

‎src/Certify.Tests/Certify.Core.Tests.Integration/DeploymentPreviewTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public DeploymentPreviewTests()
3535
PrimaryTestDomain = ConfigSettings["AWS_TestDomain"];
3636

3737
testSiteDomain = "integration1." + PrimaryTestDomain;
38-
testSitePath = _primaryWebRoot;
38+
testSitePath = PrimaryWebRootPath;
3939

4040
_awsCredStorageKey = ConfigSettings["TestCredentialsKey_Route53"];
4141

@@ -60,7 +60,7 @@ public async Task SetupIIS()
6060
await iisManager.DeleteSite(testSiteName);
6161
}
6262

63-
var site = await iisManager.CreateSite(testSiteName, testSiteDomain, _primaryWebRoot, "DefaultAppPool", port: testSiteHttpPort);
63+
var site = await iisManager.CreateSite(testSiteName, testSiteDomain, PrimaryWebRootPath, "DefaultAppPool", port: testSiteHttpPort);
6464
Assert.IsTrue(await iisManager.SiteExists(testSiteName));
6565
_siteId = site.Id.ToString();
6666
}
@@ -85,7 +85,7 @@ public async Task TestPreviewWildcard()
8585
await iisManager.DeleteSite(testPreviewSiteName);
8686
}
8787

88-
var site = await iisManager.CreateSite(testPreviewSiteName, hostname, _primaryWebRoot, "DefaultAppPool", port: testSiteHttpPort);
88+
var site = await iisManager.CreateSite(testPreviewSiteName, hostname, PrimaryWebRootPath, "DefaultAppPool", port: testSiteHttpPort);
8989

9090
ManagedCertificate managedCertificate = null;
9191
X509Certificate2 certInfo = null;
@@ -166,7 +166,7 @@ public async Task TestPreviewStaticIPBindings()
166166

167167
var ipAddress = GetTestStaticIP();
168168

169-
var site = await iisManager.CreateSite(testPreviewSiteName, hostname, _primaryWebRoot, "DefaultAppPool", "http", ipAddress, testSiteHttpPort);
169+
var site = await iisManager.CreateSite(testPreviewSiteName, hostname, PrimaryWebRootPath, "DefaultAppPool", "http", ipAddress, testSiteHttpPort);
170170

171171
ManagedCertificate managedCertificate = null;
172172
X509Certificate2 certInfo = null;

‎src/Certify.Tests/Certify.Core.Tests.Integration/IntegrationTestBase.cs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ namespace Certify.Core.Tests
1111
{
1212
public class IntegrationTestBase
1313
{
14-
public string PrimaryTestDomain = "test.certifytheweb.com"; // TODO: get this from debug config as it changes per dev machine
15-
public string _primaryWebRoot = @"c:\inetpub\wwwroot\";
1614
public Dictionary<string, string> ConfigSettings = new Dictionary<string, string>();
15+
16+
public string PrimaryTestDomain = "test.certifytheweb.com"; // TODO: get this from debug config as it changes per dev machine
17+
public string PrimaryWebRootPath = @"c:\inetpub\wwwroot\";
18+
19+
private string _testConfigPath = @"c:\temp\Certify\TestConfigSettings.json";
20+
1721
internal ILog _log;
1822

1923
public IntegrationTestBase()
@@ -23,13 +27,14 @@ public IntegrationTestBase()
2327
PrimaryTestDomain = Environment.GetEnvironmentVariable("CERTIFY_TESTDOMAIN");
2428
}
2529

26-
/* ConfigSettings.Add("AWS_ZoneId", "example");
27-
ConfigSettings.Add("Azure_ZoneId", "example");
28-
ConfigSettings.Add("Cloudflare_ZoneId", "example");
29-
System.IO.File.WriteAllText("C:\\temp\\TestConfigSettings.json", JsonConvert.SerializeObject(ConfigSettings));
30-
*/
31-
32-
ConfigSettings = JsonConvert.DeserializeObject<Dictionary<string, string>>(System.IO.File.ReadAllText("C:\\temp\\Certify\\TestConfigSettings.json"));
30+
if (File.Exists("C:\\temp\\Certify\\TestConfigSettings.json"))
31+
{
32+
ConfigSettings = JsonConvert.DeserializeObject<Dictionary<string, string>>(System.IO.File.ReadAllText(_testConfigPath));
33+
}
34+
else
35+
{
36+
System.Diagnostics.Debug.WriteLine("Test config file not found: " + _testConfigPath);
37+
}
3338

3439
_log = new Loggy(LoggerFactory.Create(builder => builder.AddDebug()).CreateLogger<IntegrationTestBase>());
3540
}

‎src/Certify.Tests/Certify.Core.Tests.Integration/ServerManagers/IISManagerTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public async Task SetupIIS()
5151
await iisManager.DeleteSite(testSiteName);
5252
}
5353

54-
var site = await iisManager.CreateSite(testSiteName, testSiteDomain, _primaryWebRoot, "DefaultAppPool");
54+
var site = await iisManager.CreateSite(testSiteName, testSiteDomain, PrimaryWebRootPath, "DefaultAppPool");
5555
_siteId = site.Id.ToString();
5656
Assert.IsTrue(await iisManager.SiteExists(testSiteName));
5757
}
@@ -111,7 +111,7 @@ public async Task TestCreateUnusualBindings()
111111
try
112112
{
113113
// create net.msmq://localhost binding, no port or ip
114-
await iisManager.CreateSite(siteName, "localhost", _primaryWebRoot, null, protocol: "net.msmq", ipAddress: null, port: null);
114+
await iisManager.CreateSite(siteName, "localhost", PrimaryWebRootPath, null, protocol: "net.msmq", ipAddress: null, port: null);
115115

116116
var sites = iisManager.GetSiteBindingList(false);
117117
}
@@ -134,7 +134,7 @@ public async Task TestCreateFixedIPBindings()
134134
try
135135
{
136136
var ipAddress = Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString();
137-
var site = await iisManager.CreateSite(testName, testDomainName, _primaryWebRoot, "DefaultAppPool", "http", ipAddress);
137+
var site = await iisManager.CreateSite(testName, testDomainName, PrimaryWebRootPath, "DefaultAppPool", "http", ipAddress);
138138

139139
Assert.IsTrue(await iisManager.SiteExists(testSiteName));
140140

@@ -165,7 +165,7 @@ public async Task TestManySiteBindingUpdates()
165165
await iisManager.DeleteSite(testSiteName);
166166
}
167167

168-
await iisManager.CreateSite(testSiteName, "site_" + i + "_toomany.com", _primaryWebRoot, null, protocol: "http");
168+
await iisManager.CreateSite(testSiteName, "site_" + i + "_toomany.com", PrimaryWebRootPath, null, protocol: "http");
169169
var site = await iisManager.GetSiteBindingByDomain(domain);
170170
for (var d = 0; d < 2; d++)
171171
{
@@ -175,7 +175,7 @@ public async Task TestManySiteBindingUpdates()
175175
{
176176
SiteId = site.SiteId,
177177
Host = testDomain,
178-
PhysicalPath = _primaryWebRoot
178+
PhysicalPath = PrimaryWebRootPath
179179
}, addNew: true));
180180
}
181181
}
@@ -200,7 +200,7 @@ public async Task TestManySiteBindingUpdates()
200200
{
201201
SiteId = site.SiteId,
202202
Host = testDomain,
203-
PhysicalPath = _primaryWebRoot
203+
PhysicalPath = PrimaryWebRootPath
204204
}, addNew: true));
205205
}
206206
else
@@ -209,7 +209,7 @@ public async Task TestManySiteBindingUpdates()
209209
{
210210
SiteId = site.SiteId,
211211
Host = testDomain,
212-
PhysicalPath = _primaryWebRoot
212+
PhysicalPath = PrimaryWebRootPath
213213
}, addNew: true));
214214
}
215215
}
@@ -261,7 +261,7 @@ public async Task TestTooManyBindings()
261261
try
262262
{
263263
// create net.msmq://localhost binding, no port or ip
264-
await iisManager.CreateSite("ManyBindings", "toomany.com", _primaryWebRoot, null, protocol: "http");
264+
await iisManager.CreateSite("ManyBindings", "toomany.com", PrimaryWebRootPath, null, protocol: "http");
265265
var site = await iisManager.GetSiteBindingByDomain("toomany.com");
266266
var domains = new List<string>();
267267
for (var i = 0; i < 101; i++)
@@ -287,7 +287,7 @@ public async Task TestLongBinding()
287287
await iisManager.DeleteSite(testName);
288288
}
289289

290-
var site = await iisManager.CreateSite(testName, testDomainName, _primaryWebRoot, null);
290+
var site = await iisManager.CreateSite(testName, testDomainName, PrimaryWebRootPath, null);
291291

292292
try
293293
{
@@ -344,7 +344,7 @@ public async Task TestBindingMatch()
344344
}
345345

346346
// create site with IP all unassigned, no hostname
347-
var site = await iisManager.CreateSite(testBindingSiteName, "", _primaryWebRoot, "DefaultAppPool", port: testSiteHttpPort);
347+
var site = await iisManager.CreateSite(testBindingSiteName, "", PrimaryWebRootPath, "DefaultAppPool", port: testSiteHttpPort);
348348

349349
// add another hostname binding (matching cert and not matching cert)
350350
var testDomains = new List<string> { testSiteDomain, "label1." + testSiteDomain, "nested.label." + testSiteDomain };

0 commit comments

Comments
 (0)