Fixed a few unit tests

Particular · Sep 18, 2014 · cac5ad0 · cac5ad0
1 parent 1d39c0e
commit cac5ad0
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 631 deletions.
diff --git a/src/NServiceBus.NHibernate.Tests/App.config b/src/NServiceBus.NHibernate.Tests/App.config
diff --git a/src/NServiceBus.NHibernate.Tests/NServiceBus.NHibernate.Tests.csproj b/src/NServiceBus.NHibernate.Tests/NServiceBus.NHibernate.Tests.csproj
@@ -94,27 +94,25 @@
     <Compile Include="SagaPersister\When_persisting_sagas_on_non_transactional_endpoints.cs" />
     <Compile Include="SagaPersister\When_persisting_sagas_on_transactional_endpoints.cs" />
     <Compile Include="SubscriptionStorage\Config\When_configuring_the_subscription_storage.cs" />
-    <Compile Include="SubscriptionStorage\EnsuringBackwardsCompatability.cs" />
     <Compile Include="SubscriptionStorage\InMemoryDBFixture.cs" />
     <Compile Include="SubscriptionStorage\TestData.cs" />
     <Compile Include="SubscriptionStorage\When_initializing_the_storage_with_existing_v2X_subscriptions.cs" />
     <Compile Include="SubscriptionStorage\When_listing_subscribers_for_message_types.cs" />
     <Compile Include="SubscriptionStorage\When_receiving_a_subscription_message.cs" />
     <Compile Include="SubscriptionStorage\When_receiving_a_unsubscription_message.cs" />
     <Compile Include="SubscriptionStorage\When_using_semantic_versioning_of_messages.cs" />
-    <Compile Include="TimeoutPersister\EnsuringBackwardsCompatability.cs" />
     <Compile Include="TimeoutPersister\InMemoryDBFixture.cs" />
     <Compile Include="TimeoutPersister\When_fetching_timeouts_from_storage.cs" />
     <Compile Include="TimeoutPersister\When_removing_timeouts_from_the_storage.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="hibernate.cfg.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
     <EmbeddedResource Include="SagaPersister\TestSagaWithHbmlXmlOverride.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
     <None Include="packages.config" />
     <None Include="Testing.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/src/NServiceBus.NHibernate.Tests/Persistence/NHibernateProperties.cs b/src/NServiceBus.NHibernate.Tests/Persistence/NHibernateProperties.cs
@@ -142,7 +142,7 @@ public void Should_read_settings_from_hibernate_configuration_config_section_if_
 
             var expected = new Dictionary<string, string>
                 {
-                    {"connection.connection_string", @"Testing"},
+                    {"connection.connection_string", @"Data Source=:memory:;New=True;"},
                 };
 
             CollectionAssert.IsSubsetOf(expected, result);
@@ -164,7 +164,7 @@ public void Should_read_settings_from_hibernate_cfg_xml_if_available()
 
             var expected = new Dictionary<string, string>
                 {
-                    {"connection.connection_string", @"Testing2"},
+                    {"connection.connection_string", @"Server=localhost\sqlexpress;Database=nservicebus;Trusted_Connection=True;"},
                 };
 
             CollectionAssert.IsSubsetOf(expected, result);

diff --git a/src/NServiceBus.NHibernate.Tests/SagaPersister/InMemoryFixture.cs b/src/NServiceBus.NHibernate.Tests/SagaPersister/InMemoryFixture.cs
@@ -24,7 +24,7 @@ public class InMemoryFixture
         [SetUp]
         public void SetUp()
         {
-            var connectionString = String.Format(@"Data Source={0};Version=3;New=True;", Path.GetTempFileName());
+            var connectionString = String.Format(@"Data Source={0};New=True;", Path.GetTempFileName());
 
             Configure.ConfigurationSource = new FakeConfigurationSource();
 

diff --git a/src/NServiceBus.NHibernate.Tests/SagaPersister/SQLiteConfiguration.cs b/src/NServiceBus.NHibernate.Tests/SagaPersister/SQLiteConfiguration.cs
@@ -16,7 +16,7 @@ public static IDictionary<string, string> InMemory()
             var cfg = Base();
 
             cfg.Add(Environment.ReleaseConnections, "on_close");
-            cfg.Add(Environment.ConnectionString, "Data Source=:memory:;Version=3;New=True;");
+            cfg.Add(Environment.ConnectionString, "Data Source=:memory:;New=True;");
 
             return cfg;
         }
@@ -28,7 +28,7 @@ public static IDictionary<string, string> UsingFile(string filename)
         {
             var cfg = Base();
 
-            cfg.Add(Environment.ConnectionString, string.Format(@"Data Source={0};Version=3;New=True;", filename));
+            cfg.Add(Environment.ConnectionString, string.Format(@"Data Source={0};New=True;", filename));
 
             return cfg;
         }

diff --git a/src/NServiceBus.NHibernate.Tests/SubscriptionStorage/EnsuringBackwardsCompatability.cs b/src/NServiceBus.NHibernate.Tests/SubscriptionStorage/EnsuringBackwardsCompatability.cs
diff --git a/src/NServiceBus.NHibernate.Tests/Testing.config b/src/NServiceBus.NHibernate.Tests/Testing.config
@@ -8,7 +8,7 @@
     <session-factory>
       <property name="connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
       <property name="connection.driver_class">NHibernate.Driver.SQLite20Driver</property>
-      <property name="connection.connection_string">Testing</property>
+      <property name="connection.connection_string">Data Source=:memory:;New=True;</property>
       <property name="dialect">NHibernate.Dialect.SQLiteDialect</property>
     </session-factory>
   </hibernate-configuration>