Added RunDate to FileReportModel

mwhelan · mwhelan · commit 99056d7b6b1d · 2014-04-10T14:51:10.000+01:00
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/HtmlReportBuilderTests.cs b/TestStack.BDDfy.Tests/Reporters/Html/HtmlReportBuilderTests.cs
@@ -1,8 +1,5 @@
 using System;
-using System.IO;
-using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
 using ApprovalTests;
 using ApprovalTests.Reporters;
 using NUnit.Framework;
@@ -29,8 +26,9 @@ public void ShouldProduceExpectedHtml()
                 var model = new HtmlReportViewModel(
                     new DefaultHtmlReportConfiguration(),
                     new ReportTestData().CreateTwoStoriesEachWithTwoScenariosWithThreeStepsOfFiveMilliseconds());
+                model.RunDate = new DateTime(2014, 3, 25, 11, 30, 5);
 
-                var sut = new HtmlReportBuilder {DateProvider = () => new DateTime(2014, 3, 25, 11, 30, 5)};
+                var sut = new HtmlReportBuilder();
                 var result = sut.CreateReport(model);
                 Approvals.Verify(result);
             }
diff --git a/TestStack.BDDfy.Tests/Reporters/HtmlMetro/HtmlMetroReportBuilderTests.cs b/TestStack.BDDfy.Tests/Reporters/HtmlMetro/HtmlMetroReportBuilderTests.cs
@@ -28,8 +28,9 @@ public void ShouldProduceExpectedHtml()
                 var model = new HtmlReportViewModel(
                     new DefaultHtmlReportConfiguration(),
                     new ReportTestData().CreateMixContainingEachTypeOfOutcome());
+                model.RunDate = new DateTime(2014, 3, 25, 11, 30, 5);
 
-                var sut = new HtmlMetroReportBuilder {DateProvider = () => new DateTime(2014, 3, 25, 11, 30, 5)};
+                var sut = new HtmlMetroReportBuilder();
                 var result = sut.CreateReport(model);
                 Approvals.Verify(result);
             }
diff --git a/TestStack.BDDfy/Reporters/FileReportModel.cs b/TestStack.BDDfy/Reporters/FileReportModel.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace TestStack.BDDfy.Reporters
@@ -9,10 +10,12 @@ public FileReportModel(IEnumerable<Story> stories)
         {
             _stories = stories;
             Summary = new FileReportSummaryModel(stories);
+            RunDate = DateTime.Now;
         }
 
         readonly IEnumerable<Story> _stories;
         public FileReportSummaryModel Summary { get; private set; }
+        public DateTime RunDate { get; set; }
 
         public IEnumerable<Story> Stories
         {
diff --git a/TestStack.BDDfy/Reporters/Html/HtmlReportBuilder.cs b/TestStack.BDDfy/Reporters/Html/HtmlReportBuilder.cs
@@ -6,7 +6,6 @@ namespace TestStack.BDDfy.Reporters.Html
 {
     public class HtmlReportBuilder : IReportBuilder
     {
-        private Func<DateTime> _dateProvider = () => DateTime.Now;
         private HtmlReportViewModel _viewModel;
         readonly StringBuilder _html;
         const int TabIndentation = 2;
@@ -43,7 +42,7 @@ private void HtmlHead()
                 EmbedCssFile(HtmlReportResources.BDDfy_css_min);
                 EmbedCssFile(_viewModel.CustomStylesheet, HtmlReportResources.CustomStylesheetComment);
 
-                AddLine(string.Format("<title>BDDfy Test Result {0}</title>", DateProvider().ToShortDateString()));
+                AddLine(string.Format("<title>BDDfy Test Result {0}</title>", _viewModel.RunDate.ToShortDateString()));
             }
         }
 
@@ -129,7 +128,7 @@ private void ResultDetails()
                     }
                 }
 
-                AddLine(string.Format("<p><span>Tested at: {0}</span></p>", _dateProvider()));
+                AddLine(string.Format("<p><span>Tested at: {0}</span></p>", _viewModel.RunDate));
             }
         }
 
@@ -296,11 +295,5 @@ private void AddHtmlComment(string htmlComment)
             _html.AppendFormat("/*{0}*/", htmlComment);
             _html.AppendLine();
         }
-
-        public Func<DateTime> DateProvider
-        {
-            get { return _dateProvider; } 
-            set { _dateProvider = value; }
-        }
     }
 }
diff --git a/TestStack.BDDfy/Reporters/HtmlMetro/HtmlMetroReportBuilder.cs b/TestStack.BDDfy/Reporters/HtmlMetro/HtmlMetroReportBuilder.cs
@@ -5,22 +5,14 @@ namespace TestStack.BDDfy.Reporters.HtmlMetro
 {
     public class HtmlMetroReportBuilder : IReportBuilder
     {
-        private Func<DateTime> _dateProvider = () => DateTime.Now;
-
         string IReportBuilder.CreateReport(FileReportModel model)
         {
             return CreateReport(model as HtmlReportViewModel);
         }
 
         public string CreateReport(HtmlReportViewModel model)
         {
-            return new MetroHtmlReportTemplate(model, DateProvider()).TransformText();
+            return new MetroHtmlReportTemplate(model).TransformText();
         }
-
-        public Func<DateTime> DateProvider
-        {
-            get { return _dateProvider; }
-            set { _dateProvider = value; }
-        }     
     }
 }
diff --git a/TestStack.BDDfy/Reporters/HtmlMetro/MetroHtmlReportTemplate.Model.cs b/TestStack.BDDfy/Reporters/HtmlMetro/MetroHtmlReportTemplate.Model.cs
@@ -11,12 +11,10 @@ namespace TestStack.BDDfy.Reporters.HtmlMetro
     partial class MetroHtmlReportTemplate
     {
         private readonly HtmlReportViewModel _model;      
-        public DateTime RunDate { get; set; }
 
-        public MetroHtmlReportTemplate(HtmlReportViewModel model, DateTime runDate)
+        public MetroHtmlReportTemplate(HtmlReportViewModel model)
         {
             _model = model;
-            RunDate = runDate;
         }
 
         public HtmlReportViewModel Model
diff --git a/TestStack.BDDfy/Reporters/HtmlMetro/MetroHtmlReportTemplate.cs b/TestStack.BDDfy/Reporters/HtmlMetro/MetroHtmlReportTemplate.cs
@@ -55,7 +55,7 @@ public virtual string TransformText()
                     " rel=\'stylesheet\' type=\'text/css\'>\r\n\t\t<title>BDDfy Test Result ");
             
             #line 18 "D:\Apps\github\TestStack.BDDfy\TestStack.BDDfy\Reporters\HtmlMetro\MetroHtmlReportTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(RunDate.ToShortDateString()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(Model.RunDate.ToShortDateString()));
             
             #line default
             #line hidden
@@ -468,7 +468,7 @@ public virtual string TransformText()
             this.Write("\r\n\t\t\t\t</ul>\r\n\t\t\t</section>\r\n    \r\n\t\t\t<section>\r\n\t\t\t\t<p>Tested at: ");
             
             #line 172 "D:\Apps\github\TestStack.BDDfy\TestStack.BDDfy\Reporters\HtmlMetro\MetroHtmlReportTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(RunDate));
+            this.Write(this.ToStringHelper.ToStringWithCulture(Model.RunDate));
             
             #line default
             #line hidden
diff --git a/TestStack.BDDfy/Reporters/HtmlMetro/MetroHtmlReportTemplate.tt b/TestStack.BDDfy/Reporters/HtmlMetro/MetroHtmlReportTemplate.tt
@@ -15,7 +15,7 @@
 <#= Model.CustomStylesheet ?? "" #>
 	</style>
 		<link href='http://fonts.googleapis.com/css?family=Roboto:400,300' rel='stylesheet' type='text/css'>
-		<title>BDDfy Test Result <#= RunDate.ToShortDateString() #></title>
+		<title>BDDfy Test Result <#= Model.RunDate.ToShortDateString() #></title>
 	</head>
 	<body>
 		<div id='main'>
@@ -169,7 +169,7 @@ else
 			</section>
     
 			<section>
-				<p>Tested at: <#= RunDate #></p>
+				<p>Tested at: <#= Model.RunDate #></p>
 				<p>Powered by <a href='https://github.com/TestStack/TestStack.BDDfy'>BDDfy</a></p>
 			</section>		
 		

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.Linq;`
`3`	`4`
`4`	`5`	`namespace TestStack.BDDfy.Reporters`
`@@ -9,10 +10,12 @@ public FileReportModel(IEnumerable<Story> stories)`
`9`	`10`	`{`
`10`	`11`	`_stories = stories;`
`11`	`12`	`Summary = new FileReportSummaryModel(stories);`
	`13`	`+ RunDate = DateTime.Now;`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`readonly IEnumerable<Story> _stories;`
`15`	`17`	`public FileReportSummaryModel Summary { get; private set; }`
	`18`	`+ public DateTime RunDate { get; set; }`
`16`	`19`
`17`	`20`	`public IEnumerable<Story> Stories`
`18`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace TestStack.BDDfy.Reporters.Html`
`6`	`6`	`{`
`7`	`7`	`public class HtmlReportBuilder : IReportBuilder`
`8`	`8`	`{`
`9`		`- private Func<DateTime> _dateProvider = () => DateTime.Now;`
`10`	`9`	`private HtmlReportViewModel _viewModel;`
`11`	`10`	`readonly StringBuilder _html;`
`12`	`11`	`const int TabIndentation = 2;`
`@@ -43,7 +42,7 @@ private void HtmlHead()`
`43`	`42`	`EmbedCssFile(HtmlReportResources.BDDfy_css_min);`
`44`	`43`	`EmbedCssFile(_viewModel.CustomStylesheet, HtmlReportResources.CustomStylesheetComment);`
`45`	`44`
`46`		`- AddLine(string.Format("<title>BDDfy Test Result {0}</title>", DateProvider().ToShortDateString()));`
	`45`	`+ AddLine(string.Format("<title>BDDfy Test Result {0}</title>", _viewModel.RunDate.ToShortDateString()));`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`
`@@ -129,7 +128,7 @@ private void ResultDetails()`
`129`	`128`	`}`
`130`	`129`	`}`
`131`	`130`
`132`		`- AddLine(string.Format("<p><span>Tested at: {0}</span></p>", _dateProvider()));`
	`131`	`+ AddLine(string.Format("<p><span>Tested at: {0}</span></p>", _viewModel.RunDate));`
`133`	`132`	`}`
`134`	`133`	`}`
`135`	`134`
`@@ -296,11 +295,5 @@ private void AddHtmlComment(string htmlComment)`
`296`	`295`	`_html.AppendFormat("/{0}/", htmlComment);`
`297`	`296`	`_html.AppendLine();`
`298`	`297`	`}`
`299`		`-`
`300`		`- public Func<DateTime> DateProvider`
`301`		`- {`
`302`		`- get { return _dateProvider; }`
`303`		`- set { _dateProvider = value; }`
`304`		`- }`
`305`	`298`	`}`
`306`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,22 +5,14 @@ namespace TestStack.BDDfy.Reporters.HtmlMetro`
`5`	`5`	`{`
`6`	`6`	`public class HtmlMetroReportBuilder : IReportBuilder`
`7`	`7`	`{`
`8`		`- private Func<DateTime> _dateProvider = () => DateTime.Now;`
`9`		`-`
`10`	`8`	`string IReportBuilder.CreateReport(FileReportModel model)`
`11`	`9`	`{`
`12`	`10`	`return CreateReport(model as HtmlReportViewModel);`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`public string CreateReport(HtmlReportViewModel model)`
`16`	`14`	`{`
`17`		`- return new MetroHtmlReportTemplate(model, DateProvider()).TransformText();`
	`15`	`+ return new MetroHtmlReportTemplate(model).TransformText();`
`18`	`16`	`}`
`19`		`-`
`20`		`- public Func<DateTime> DateProvider`
`21`		`- {`
`22`		`- get { return _dateProvider; }`
`23`		`- set { _dateProvider = value; }`
`24`		`- }`
`25`	`17`	`}`
`26`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,10 @@ namespace TestStack.BDDfy.Reporters.HtmlMetro`
`11`	`11`	`partial class MetroHtmlReportTemplate`
`12`	`12`	`{`
`13`	`13`	`private readonly HtmlReportViewModel _model;`
`14`		`- public DateTime RunDate { get; set; }`
`15`	`14`
`16`		`- public MetroHtmlReportTemplate(HtmlReportViewModel model, DateTime runDate)`
	`15`	`+ public MetroHtmlReportTemplate(HtmlReportViewModel model)`
`17`	`16`	`{`
`18`	`17`	`_model = model;`
`19`		`- RunDate = runDate;`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`public HtmlReportViewModel Model`