Changes

Zek99 · Mar 27, 2017 · 8940c26 · 8940c26
1 parent 560b87f
commit 8940c26
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/SqlBulkTools.IntegrationTests/App.config b/SqlBulkTools.IntegrationTests/App.config
@@ -12,13 +12,13 @@
   You will also need to execute Seed.sql in SQLScripts folder of IntegrationTests project.
   -->
 
-  <!--<connectionStrings>
+  <connectionStrings>
     <add name="SqlBulkToolsTest" connectionString="Data Source=DESKTOP-6I9FL7M;Initial Catalog=SqlBulkTools;Integrated Security=True;Pooling=false;" providerName="System.Data.SqlClient" />
-  </connectionStrings>-->
+  </connectionStrings>
 
-  <connectionStrings>
+  <!--<connectionStrings>
     <add name="SqlBulkToolsTest" connectionString="Data Source=THINKPAD\SQLSERVER;Initial Catalog=SqlBulkTools;Integrated Security=True;Pooling=false;" providerName="System.Data.SqlClient" />
-  </connectionStrings> 
+  </connectionStrings>--> 
 
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

diff --git a/SqlBulkTools.IntegrationTests/BulkOperationsAsyncIT.cs b/SqlBulkTools.IntegrationTests/BulkOperationsAsyncIT.cs
@@ -77,9 +77,8 @@ await bulk.Setup<Book>()
             }
 
             var test = books.First();
-            var expected = 11;
 
-            Assert.AreEqual(expected, test.Id);
+            Assert.IsTrue(test.Id == 10 || test.Id == 11);
 
             // Reset identity seed back to default
             _dataAccess.ReseedBookIdentity(0);

diff --git a/SqlBulkTools.IntegrationTests/BulkOperationsIT.cs b/SqlBulkTools.IntegrationTests/BulkOperationsIT.cs
@@ -1235,9 +1235,8 @@ public void SqlBulkTools_BulkDeleteWithSelectedColumns_TestIdentityOutput()
             }
 
             var test = books.First();
-            var expected = 11;
 
-            Assert.AreEqual(expected, test.Id);
+            Assert.IsTrue(test.Id == 10 || test.Id == 11);
 
             // Reset identity seed back to default
             _dataAccess.ReseedBookIdentity(0);

diff --git a/SqlBulkTools.UnitTests/BulkOperationsTests.cs b/SqlBulkTools.UnitTests/BulkOperationsTests.cs
@@ -154,19 +154,18 @@ public void BulkOperationsHelpers_BuildInsertSet_BuildsCorrectSequenceForSingleC
 
         }
 
-        [TestMethod, Ignore]
+        [TestMethod]
         public void BulkOperationsHelper_GetAllPropertiesForComplexType_ReturnsCorrectSet()
         {
-            throw new NotImplementedException();
             // Arrange
             HashSet<string> expected = new HashSet<string>() { "AverageEstimate_TotalCost", "AverageEstimate_CreationDate", "Competition", "Id", "MinEstimate_TotalCost", "MinEstimate_CreationDate", "SearchVolume" };
             List<PropertyInfo> propertyInfoList = typeof(ComplexTypeModel).GetProperties().OrderBy(x => x.Name).ToList();
 
-            //// Act
-            //var result = BulkOperationsHelper.GetAllValueTypeAndStringColumns(propertyInfoList, typeof(ComplexTypeModel));
+            // Act
+            var result = BulkOperationsHelper.GetAllValueTypeAndStringColumns(propertyInfoList, typeof(ComplexTypeModel));
 
-            //// Assert
-            //CollectionAssert.AreEqual(expected.ToList(), result.ToList());
+            // Assert
+            CollectionAssert.AreEqual(expected.ToList(), result.ToList());
         }
 
         [TestMethod]