Added tests for fixed issues

markrendle · Sep 5, 2011 · 4e5aa12 · 4e5aa12
2 parents 6b677fa + d7a2c7a
commit 4e5aa12
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 58 deletions.
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -21,3 +21,4 @@
 
 [assembly: AssemblyVersion("0.9.4.1")]
 [assembly: AssemblyFileVersion("0.9.4.1")]
+
diff --git a/Simple.Data.Ado/Simple.Data.Ado.nuspec b/Simple.Data.Ado/Simple.Data.Ado.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Simple.Data.Ado</id>
-    <version>0.9.3.1</version>
+    <version>0.9.3.2</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>ADO Adapter for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Core" version="0.9.3.1" />
+      <dependency id="Simple.Data.Core" version="0.9.3.2" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.Mocking/Simple.Data.Mocking.nuspec b/Simple.Data.Mocking/Simple.Data.Mocking.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.Mocking</id>
-    <version>0.9.3.1</version>
+    <version>0.9.3.2</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>XML-based Mocking adapter for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>database data .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="0.9.3.1" />
+      <dependency id="Simple.Data.Ado" version="0.9.3.2" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec b/Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.SqlCompact40</id>
-    <version>0.9.3.1</version>
+    <version>0.9.3.2</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>SQL Server Compact 4.0 ADO provider for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver compact sqlce database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="0.9.3.1" />
+      <dependency id="Simple.Data.Ado" version="0.9.3.2" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.SqlCe40/SqlCeDbParameterFactory.cs b/Simple.Data.SqlCe40/SqlCeDbParameterFactory.cs
@@ -12,7 +12,8 @@ public class SqlCeDbParameterFactory : IDbParameterFactory
         public IDbDataParameter CreateParameter(string name, Column column)
         {
             var sqlCeColumn = (SqlCeColumn) column;
-            return new SqlCeParameter(name, sqlCeColumn.SqlDbType, column.MaxLength, column.ActualName);
+
+            return new SqlCeParameter(name, sqlCeColumn.SqlDbType, 0, column.ActualName);
         }
 
         public IDbDataParameter CreateParameter(string name, DbType dbType, int maxLength)

diff --git a/Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec b/Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.SqlServer</id>
-    <version>0.9.3.1</version>
+    <version>0.9.3.2</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>SQL Server ADO provider for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="0.9.3.1" />
+      <dependency id="Simple.Data.Ado" version="0.9.3.2" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.SqlTest/FindTests.cs b/Simple.Data.SqlTest/FindTests.cs
@@ -54,6 +54,14 @@ public void TestFindAllByName()
             Assert.AreEqual(1, users.Count());
         }
 
+        [Test]
+        public void TestFindAllByNameAsIEnumerableOfDynamic()
+        {
+            var db = DatabaseHelper.Open();
+            IEnumerable<dynamic> users = db.Users.FindAllByName("Bob");
+            Assert.AreEqual(1, users.Count());
+        }
+
         [Test]
         public void TestFindAllByPartialName()
         {

diff --git a/Simple.Data.SqlTest/QueryTest.cs b/Simple.Data.SqlTest/QueryTest.cs
@@ -124,8 +124,8 @@ public void WithTotalCountShouldGiveCount()
             Promise<int> count;
             var db = DatabaseHelper.Open();
             var list = db.PagingTest.QueryById(1.to(50))
-                .WithTotalCount(out count)
                 .Take(10)
+                .WithTotalCount(out count)
                 .ToList();
 
             Assert.AreEqual(10, list.Count);

diff --git a/Simple.Data.SqlTest/SqlQueryPagerTest.cs b/Simple.Data.SqlTest/SqlQueryPagerTest.cs
@@ -1,47 +1,47 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using NUnit.Framework;
-using Simple.Data.SqlServer;
-
-namespace Simple.Data.SqlTest
-{
-    [TestFixture]
-    public class SqlQueryPagerTest
-    {
-        static readonly Regex Normalize = new Regex(@"\s+", RegexOptions.Multiline);
-
-        [Test]
-        public void ShouldApplyPagingUsingOrderBy()
-        {
-            const string sql = "select a,b,c from d where a = 1 order by c";
-            const string expected =
-                "with __data as (select a,b,c, row_number() over(order by c) as [_#_] from d where a = 1)"
-                + " select a,b,c from __data where [_#_] between @skip + 1 and @skip + @take";
-
-            var modified = new SqlQueryPager().ApplyPaging(sql, "@skip", "@take");
-            modified = Normalize.Replace(modified, " ").ToLowerInvariant();
-
-            Assert.AreEqual(expected, modified);
-        }
-
-        [Test]
-        public void ShouldApplyPagingUsingOrderByFirstColumnIfNotAlreadyOrdered()
-        {
-            const string sql = "select a,b,c from d where a = 1";
-            const string expected =
-                "with __data as (select a,b,c, row_number() over(order by a) as [_#_] from d where a = 1)"
-                + " select a,b,c from __data where [_#_] between @skip + 1 and @skip + @take";
-
-            var modified = new SqlQueryPager().ApplyPaging(sql, "@skip", "@take");
-            modified = Normalize.Replace(modified, " ").ToLowerInvariant();
-
-            Assert.AreEqual(expected, modified);
-        }
-
-        [Test]
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using NUnit.Framework;
+using Simple.Data.SqlServer;
+
+namespace Simple.Data.SqlTest
+{
+    [TestFixture]
+    public class SqlQueryPagerTest
+    {
+        static readonly Regex Normalize = new Regex(@"\s+", RegexOptions.Multiline);
+
+        [Test]
+        public void ShouldApplyPagingUsingOrderBy()
+        {
+            const string sql = "select a,b,c from d where a = 1 order by c";
+            const string expected =
+                "with __data as (select a,b,c, row_number() over(order by c) as [_#_] from d where a = 1)"
+                + " select a,b,c from __data where [_#_] between @skip + 1 and @skip + @take";
+
+            var modified = new SqlQueryPager().ApplyPaging(sql, "@skip", "@take");
+            modified = Normalize.Replace(modified, " ").ToLowerInvariant();
+
+            Assert.AreEqual(expected, modified);
+        }
+
+        [Test]
+        public void ShouldApplyPagingUsingOrderByFirstColumnIfNotAlreadyOrdered()
+        {
+            const string sql = "select a,b,c from d where a = 1";
+            const string expected =
+                "with __data as (select a,b,c, row_number() over(order by a) as [_#_] from d where a = 1)"
+                + " select a,b,c from __data where [_#_] between @skip + 1 and @skip + @take";
+
+            var modified = new SqlQueryPager().ApplyPaging(sql, "@skip", "@take");
+            modified = Normalize.Replace(modified, " ").ToLowerInvariant();
+
+            Assert.AreEqual(expected, modified);
+        }
+
+        [Test]
         public void ShouldCopeWithAliasedColumns()
         {
             const string sql = "select [a],[b] as [foo],[c] from [d] where [a] = 1";
@@ -53,6 +53,6 @@ public void ShouldCopeWithAliasedColumns()
             modified = Normalize.Replace(modified, " ").ToLowerInvariant();
 
             Assert.AreEqual(expected, modified);
-        }
-    }
-}
+        }
+    }
+}
diff --git a/Simple.Data/Simple.Data.nuspec b/Simple.Data/Simple.Data.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Simple.Data.Core</id>
-    <version>0.9.3.1</version>
+    <version>0.9.3.2</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>