removing all dependencies on the sql server for tests

aaronpowell · aaronpowell · commit cb88a690ab45 · 2012-04-26T22:19:44.000+10:00
Tests should now be runable on a build server or fresh machine with nothing more than what's in the repo
diff --git a/src/FunnelWeb.Tests/FunnelWeb.Tests.csproj b/src/FunnelWeb.Tests/FunnelWeb.Tests.csproj
@@ -124,7 +124,6 @@
     <Compile Include="Integration\Queries\EntryByNameAndRevisionQueryMatchesEntryByName.cs" />
     <Compile Include="Integration\Queries\EntryByNameQueryMatchesEntryByName.cs" />
     <Compile Include="Integration\Queries\EntryByNameQueryMatchesEntryByNameThatHasComments.cs" />
-    <Compile Include="Integration\Queries\FullTextSearchEntriesQueryReturnsEntry.cs" />
     <Compile Include="Integration\Queries\GetCommentsQueryReturnsComments.cs" />
     <Compile Include="Integration\Queries\GetEntriesQueryByTagReturnsEntryWithWithRequestedTagOnly.cs" />
     <Compile Include="Integration\Queries\GetEntriesQueryReturnsEntry.cs" />
@@ -136,12 +135,10 @@
     <Compile Include="DatabaseDeployer\DatabaseModuleTests.cs" />
     <Compile Include="DatabaseDeployer\DatabaseUpgradeDetectorTests.cs" />
     <Compile Include="Helpers\Requires.cs" />
-    <Compile Include="Helpers\TemporaryDatabase.cs" />
     <Compile Include="Integration\CanDeployDatabase.cs" />
     <Compile Include="Helpers\RouteExtensions.cs" />
     <Compile Include="Helpers\Specification.cs" />
     <Compile Include="Helpers\ThenAttribute.cs" />
-    <Compile Include="Helpers\IntegrationTest.cs" />
     <Compile Include="Integration\UpdateCommentCountTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="LifetimeJustifications.cs" />
diff --git a/src/FunnelWeb.Tests/Helpers/IntegrationTest.cs b/src/FunnelWeb.Tests/Helpers/IntegrationTest.cs
diff --git a/src/FunnelWeb.Tests/Helpers/QueryIntegrationTest.cs b/src/FunnelWeb.Tests/Helpers/QueryIntegrationTest.cs
@@ -6,7 +6,6 @@ namespace FunnelWeb.Tests.Helpers
     public abstract class QueryIntegrationTest
     {
         private readonly TheDatabase requirements;
-        private static TemporaryDatabase SqlDatabase { get; set; }
         private static SqlCeTemporaryDatabase SqlCeDatabase { get; set; }
 
         protected QueryIntegrationTest(TheDatabase requirements)
@@ -17,8 +16,6 @@ protected QueryIntegrationTest(TheDatabase requirements)
         [Test]
         public void RunTestQuery()
         {
-            Database = SqlDatabase;
-            TestQuery();
             Database = SqlCeDatabase;
             TestQuery();
         }
@@ -30,12 +27,6 @@ public void RunTestQuery()
         [SetUp]
         public void SetUp()
         {
-            if ((requirements & TheDatabase.MustBeFresh) == TheDatabase.MustBeFresh || SqlDatabase == null)
-            {
-                SqlDatabase = new TemporaryDatabase();
-                SqlDatabase.CreateAndDeploy();
-            }
-
             if ((requirements & TheDatabase.MustBeFresh) == TheDatabase.MustBeFresh || SqlCeDatabase == null)
             {
                 SqlCeDatabase = new SqlCeTemporaryDatabase();
diff --git a/src/FunnelWeb.Tests/Helpers/TemporaryDatabase.cs b/src/FunnelWeb.Tests/Helpers/TemporaryDatabase.cs
diff --git a/src/FunnelWeb.Tests/Integration/CanDeployDatabase.cs b/src/FunnelWeb.Tests/Integration/CanDeployDatabase.cs
@@ -5,7 +5,7 @@
 namespace FunnelWeb.Tests.Integration
 {
     [TestFixture]
-    public class DatabaseDeploymentTests : IntegrationTest
+    public class DatabaseDeploymentTests : SqlCeIntegrationTest
     {
         public DatabaseDeploymentTests() : base(TheDatabase.MustBeFresh)
         {
@@ -14,13 +14,13 @@ public DatabaseDeploymentTests() : base(TheDatabase.MustBeFresh)
         [Test]
         public void TablesAreCreated()
         {
-            var tables = Database.AdHoc.ExecuteReader("select * from sys.Tables order by [name] desc");
+            var tables = Database.AdHoc.ExecuteReader("select * from INFORMATION_SCHEMA.Tables order by [TABLE_NAME] desc");
 
-            Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "Entry"));
-            Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "Revision"));
-            Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "Comment"));
-            Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "SchemaVersions"));
-            Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "Tag"));
+            Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "Entry"));
+            Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "Revision"));
+            Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "Comment"));
+            Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "SchemaVersions"));
+            Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "Tag"));
         }
     }
 }
diff --git a/src/FunnelWeb.Tests/Integration/Queries/FullTextSearchEntriesQueryReturnsEntry.cs b/src/FunnelWeb.Tests/Integration/Queries/FullTextSearchEntriesQueryReturnsEntry.cs
diff --git a/src/FunnelWeb.Tests/Web/Controllers/FeedControllerTests.cs b/src/FunnelWeb.Tests/Web/Controllers/FeedControllerTests.cs
@@ -51,8 +51,8 @@ public void SetsLastModifiedOnResponseCache()
                                           Author = "Test",
                                           Body = "Some Body",
                                           Name = "Name",
-                                          Published = DateTime.Now.AddDays(-3),
-                                          Revised = published,
+                                          Published = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now.AddDays(-3)),
+                                          Revised = TimeZoneInfo.ConvertTimeToUtc(published),
                                       }
                               };
             Repository.Find(Arg.Any<GetFullEntriesQuery>(), Arg.Any<int>(), Arg.Any<int>())
@@ -73,8 +73,8 @@ public void FeedOutputsCorrectly()
                                           Author = "Test",
                                           Body = "Some Body",
                                           Name = "Title",
-                                          Published = DateTime.Now.AddDays(-3),
-                                          Revised = DateTime.Now.AddDays(-1),
+                                          Published = DateTime.UtcNow.AddDays(-3),
+                                          Revised = DateTime.UtcNow.AddDays(-1),
                                       }
                               };
             Repository.Find(Arg.Any<GetFullEntriesQuery>(), Arg.Any<int>(), Arg.Any<int>())
diff --git a/src/FunnelWeb.Web/Controllers/FeedController.cs b/src/FunnelWeb.Web/Controllers/FeedController.cs
@@ -74,7 +74,7 @@ orderby e.Published descending
                         Summary = content,
                         Content = content,
                         LastUpdatedTime = TimeZoneInfo.ConvertTimeFromUtc(e.Revised, TimeZoneInfo.Local),
-                        PublishDate = TimeZoneInfo.ConvertTimeFromUtc(e.Published, TimeZoneInfo.Local),
+                        PublishDate = e.Published,
                         Links =
                             {
                                 new SyndicationLink(itemUri)
diff --git a/src/Information/VersionInfo.cs b/src/Information/VersionInfo.cs
@@ -13,7 +13,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("2.2.0.727")]
-[assembly: AssemblyFileVersion("2.2.0.727")]
+[assembly: AssemblyVersion("2.2.0.729")]
+[assembly: AssemblyFileVersion("2.2.0.729")]
 
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace FunnelWeb.Tests.Helpers`
`6`	`6`	`public abstract class QueryIntegrationTest`
`7`	`7`	`{`
`8`	`8`	`private readonly TheDatabase requirements;`
`9`		`- private static TemporaryDatabase SqlDatabase { get; set; }`
`10`	`9`	`private static SqlCeTemporaryDatabase SqlCeDatabase { get; set; }`
`11`	`10`
`12`	`11`	`protected QueryIntegrationTest(TheDatabase requirements)`
`@@ -17,8 +16,6 @@ protected QueryIntegrationTest(TheDatabase requirements)`
`17`	`16`	`[Test]`
`18`	`17`	`public void RunTestQuery()`
`19`	`18`	`{`
`20`		`- Database = SqlDatabase;`
`21`		`- TestQuery();`
`22`	`19`	`Database = SqlCeDatabase;`
`23`	`20`	`TestQuery();`
`24`	`21`	`}`
`@@ -30,12 +27,6 @@ public void RunTestQuery()`
`30`	`27`	`[SetUp]`
`31`	`28`	`public void SetUp()`
`32`	`29`	`{`
`33`		`- if ((requirements & TheDatabase.MustBeFresh) == TheDatabase.MustBeFresh \|\| SqlDatabase == null)`
`34`		`- {`
`35`		`- SqlDatabase = new TemporaryDatabase();`
`36`		`- SqlDatabase.CreateAndDeploy();`
`37`		`- }`
`38`		`-`
`39`	`30`	`if ((requirements & TheDatabase.MustBeFresh) == TheDatabase.MustBeFresh \|\| SqlCeDatabase == null)`
`40`	`31`	`{`
`41`	`32`	`SqlCeDatabase = new SqlCeTemporaryDatabase();`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace FunnelWeb.Tests.Integration`
`6`	`6`	`{`
`7`	`7`	`[TestFixture]`
`8`		`- public class DatabaseDeploymentTests : IntegrationTest`
	`8`	`+ public class DatabaseDeploymentTests : SqlCeIntegrationTest`
`9`	`9`	`{`
`10`	`10`	`public DatabaseDeploymentTests() : base(TheDatabase.MustBeFresh)`
`11`	`11`	`{`
`@@ -14,13 +14,13 @@ public DatabaseDeploymentTests() : base(TheDatabase.MustBeFresh)`
`14`	`14`	`[Test]`
`15`	`15`	`public void TablesAreCreated()`
`16`	`16`	`{`
`17`		`- var tables = Database.AdHoc.ExecuteReader("select * from sys.Tables order by [name] desc");`
	`17`	`+ var tables = Database.AdHoc.ExecuteReader("select * from INFORMATION_SCHEMA.Tables order by [TABLE_NAME] desc");`
`18`	`18`
`19`		`- Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "Entry"));`
`20`		`- Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "Revision"));`
`21`		`- Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "Comment"));`
`22`		`- Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "SchemaVersions"));`
`23`		`- Assert.IsNotNull(tables.FirstOrDefault(table => table["name"] == "Tag"));`
	`19`	`+ Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "Entry"));`
	`20`	`+ Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "Revision"));`
	`21`	`+ Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "Comment"));`
	`22`	`+ Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "SchemaVersions"));`
	`23`	`+ Assert.IsNotNull(tables.FirstOrDefault(table => table["TABLE_NAME"] == "Tag"));`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ orderby e.Published descending`
`74`	`74`	`Summary = content,`
`75`	`75`	`Content = content,`
`76`	`76`	`LastUpdatedTime = TimeZoneInfo.ConvertTimeFromUtc(e.Revised, TimeZoneInfo.Local),`
`77`		`- PublishDate = TimeZoneInfo.ConvertTimeFromUtc(e.Published, TimeZoneInfo.Local),`
	`77`	`+ PublishDate = e.Published,`
`78`	`78`	`Links =`
`79`	`79`	`{`
`80`	`80`	`new SyndicationLink(itemUri)`