output folder cleanup tests adjusted

boyko-ant · boyko-ant · commit 75ce1a44e9e4 · 2018-07-19T15:36:34.000+03:00
diff --git a/src/Test/SolidifyProject.Engine.Test.Integration/Infrastructure/Services/OrchestrationServiceTest.cs b/src/Test/SolidifyProject.Engine.Test.Integration/Infrastructure/Services/OrchestrationServiceTest.cs
@@ -42,6 +42,10 @@ public class OrchestrationServiceTest
 
         private IHtmlMinificationService HtmlMinificationService => new GoogleHtmlMinificationService();
 
+
+        private const string PAGE_CONTENT = "<html><head><link href=\"/assets/style.css\" rel=\"stylesheet\" type=\"text/css\"><title>Static Site Generator - Home</title><link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/Assets/favicon.ico\"></head><body><div><ul><li><a href=\"https://facebook.com\">Facebook</a></li><li><a href=\"https://twitter.com\">Twitter</a></li></ul></div><h1>Welcome to Static Site Generator!</h1><h4>Authors</h4><h5>Founders</h5><ul><li>Anton Boyko (Microsoft Azure MVP)</li></ul><h5>Contributors</h5><p><strong>Powered by .NET Core 2.0</strong></p><div><i>All rights reserved</i></div></body></html>";
+        
+        
         [TearDown]
         public void TearDown()
         {
@@ -81,7 +85,7 @@ public async Task ProduceHtml()
 
             var page = _pageModelWriterStorage.Single(x => x.Id.Equals("index.html"));
             
-            Assert.AreEqual("<html><head><link href=\"/assets/style.css\" rel=\"stylesheet\" type=\"text/css\"><title>Static Site Generator - Home</title><link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/Assets/favicon.ico\"></head><body><div><ul><li><a href=\"https://facebook.com\">Facebook</a></li><li><a href=\"https://twitter.com\">Twitter</a></li></ul></div><h1>Welcome to Static Site Generator!</h1><h4>Authors</h4><h5>Founders</h5><ul><li>Anton Boyko (Microsoft Azure MVP)</li></ul><h5>Contributors</h5><p><strong>Powered by .NET Core 2.0</strong></p><div><i>All rights reserved</i></div></body></html>", page.ContentRaw);
+            Assert.AreEqual(PAGE_CONTENT, page.ContentRaw);
         }
 
         [Test]
@@ -128,15 +132,15 @@ public async Task CleanUpBeforeRender()
             Assert.AreEqual(2, _pageModelWriterStorage.Count);
             Assert.IsFalse(_pageModelWriterStorage.All(x => x.ContentRaw == null));
             
-            Assert.AreEqual(2, _assetsWriterStorage.Count);
+            Assert.AreEqual(3, _assetsWriterStorage.Count);
             Assert.IsFalse(_assetsWriterStorage.All(x => x.ContentRaw == null));
 
             var logoAsset = _assetsWriterStorage.SingleOrDefault(x => x.Id.Contains("img") && x.Id.Contains("logo.png"));
             Assert.IsNotNull(logoAsset);
 
             var page = _pageModelWriterStorage.Single(x => x.Id.Equals("index.html"));
             
-            Assert.AreEqual("<html><head><link href=\"/assets/style.css\" rel=\"stylesheet\" type=\"text/css\"><title>Static Site Generator - Home</title></head><body><div><ul><li><a href=\"https://facebook.com\">Facebook</a></li><li><a href=\"https://twitter.com\">Twitter</a></li></ul></div><h1>Welcome to Static Site Generator!</h1><h4>Authors</h4><h5>Founders</h5><ul><li>Anton Boyko (Microsoft Azure MVP)</li></ul><h5>Contributors</h5><p><strong>Powered by .NET Core 2.0</strong></p><div><i>All rights reserved</i></div></body></html>", page.ContentRaw);
+            Assert.AreEqual(PAGE_CONTENT, page.ContentRaw);
         }
     }
 }
diff --git a/src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Services/ContentWriterService/_ContentWriterServiceTestBase.cs b/src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Services/ContentWriterService/_ContentWriterServiceTestBase.cs
@@ -32,11 +32,15 @@ public virtual async Task CleanOutputAsyncTest(T newElement)
         {
             await ContentWriterService.SaveContentAsync(newElement.Id, newElement);
 
+            var actualElement = await ContentReaderService.LoadContentByIdAsync(newElement.Id);
+            
+            Assert.IsNotNull(actualElement);
+            
             await ContentWriterService.CleanFolderAsync("");
 
-            var newElementActual = await ContentReaderService.LoadContentByIdAsync(newElement.Id);
+            actualElement = await ContentReaderService.LoadContentByIdAsync(newElement.Id);
             
-            Assert.IsNull(newElementActual);
+            Assert.IsNull(actualElement);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,10 @@ public class OrchestrationServiceTest`
`42`	`42`
`43`	`43`	`private IHtmlMinificationService HtmlMinificationService => new GoogleHtmlMinificationService();`
`44`	`44`
	`45`	`+`
	`46`	+ private const string PAGE_CONTENT = "<html><head><link href=\"/assets/style.css\" rel=\"stylesheet\" type=\"text/css\"><title>Static Site Generator - Home</title><link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/Assets/favicon.ico\"></head><body><div><ul><li><a href=\"https://facebook.com\">Facebook</a></li><li><a href=\"https://twitter.com\">Twitter</a></li></ul></div><h1>Welcome to Static Site Generator!</h1><h4>Authors</h4><h5>Founders</h5><ul><li>Anton Boyko (Microsoft Azure MVP)</li></ul><h5>Contributors</h5><p><strong>Powered by .NET Core 2.0</strong></p><div><i>All rights reserved</i></div></body></html>";
	`47`	`+`
	`48`	`+`
`45`	`49`	`[TearDown]`
`46`	`50`	`public void TearDown()`
`47`	`51`	`{`
`@@ -81,7 +85,7 @@ public async Task ProduceHtml()`
`81`	`85`
`82`	`86`	`var page = _pageModelWriterStorage.Single(x => x.Id.Equals("index.html"));`
`83`	`87`
`84`		- Assert.AreEqual("<html><head><link href=\"/assets/style.css\" rel=\"stylesheet\" type=\"text/css\"><title>Static Site Generator - Home</title><link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/Assets/favicon.ico\"></head><body><div><ul><li><a href=\"https://facebook.com\">Facebook</a></li><li><a href=\"https://twitter.com\">Twitter</a></li></ul></div><h1>Welcome to Static Site Generator!</h1><h4>Authors</h4><h5>Founders</h5><ul><li>Anton Boyko (Microsoft Azure MVP)</li></ul><h5>Contributors</h5><p><strong>Powered by .NET Core 2.0</strong></p><div><i>All rights reserved</i></div></body></html>", page.ContentRaw);
	`88`	`+ Assert.AreEqual(PAGE_CONTENT, page.ContentRaw);`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`[Test]`
`@@ -128,15 +132,15 @@ public async Task CleanUpBeforeRender()`
`128`	`132`	`Assert.AreEqual(2, _pageModelWriterStorage.Count);`
`129`	`133`	`Assert.IsFalse(_pageModelWriterStorage.All(x => x.ContentRaw == null));`
`130`	`134`
`131`		`- Assert.AreEqual(2, _assetsWriterStorage.Count);`
	`135`	`+ Assert.AreEqual(3, _assetsWriterStorage.Count);`
`132`	`136`	`Assert.IsFalse(_assetsWriterStorage.All(x => x.ContentRaw == null));`
`133`	`137`
`134`	`138`	`var logoAsset = _assetsWriterStorage.SingleOrDefault(x => x.Id.Contains("img") && x.Id.Contains("logo.png"));`
`135`	`139`	`Assert.IsNotNull(logoAsset);`
`136`	`140`
`137`	`141`	`var page = _pageModelWriterStorage.Single(x => x.Id.Equals("index.html"));`
`138`	`142`
`139`		- Assert.AreEqual("<html><head><link href=\"/assets/style.css\" rel=\"stylesheet\" type=\"text/css\"><title>Static Site Generator - Home</title></head><body><div><ul><li><a href=\"https://facebook.com\">Facebook</a></li><li><a href=\"https://twitter.com\">Twitter</a></li></ul></div><h1>Welcome to Static Site Generator!</h1><h4>Authors</h4><h5>Founders</h5><ul><li>Anton Boyko (Microsoft Azure MVP)</li></ul><h5>Contributors</h5><p><strong>Powered by .NET Core 2.0</strong></p><div><i>All rights reserved</i></div></body></html>", page.ContentRaw);
	`143`	`+ Assert.AreEqual(PAGE_CONTENT, page.ContentRaw);`
`140`	`144`	`}`
`141`	`145`	`}`
`142`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,15 @@ public virtual async Task CleanOutputAsyncTest(T newElement)`
`32`	`32`	`{`
`33`	`33`	`await ContentWriterService.SaveContentAsync(newElement.Id, newElement);`
`34`	`34`
	`35`	`+ var actualElement = await ContentReaderService.LoadContentByIdAsync(newElement.Id);`
	`36`	`+`
	`37`	`+ Assert.IsNotNull(actualElement);`
	`38`	`+`
`35`	`39`	`await ContentWriterService.CleanFolderAsync("");`
`36`	`40`
`37`		`- var newElementActual = await ContentReaderService.LoadContentByIdAsync(newElement.Id);`
	`41`	`+ actualElement = await ContentReaderService.LoadContentByIdAsync(newElement.Id);`
`38`	`42`
`39`		`- Assert.IsNull(newElementActual);`
	`43`	`+ Assert.IsNull(actualElement);`
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`	`}`