Merge branch 'master' of github.com:mcintyre321/mvc.jquery.datatables

Conflicts:
	Mvc.JQuery.Datatables.sln.DotSettings.user
	Mvc.JQuery.Datatables/DataTablesResult.cs
	Mvc.JQuery.Datatables/TypeFilters.cs

Author: mcintyre321

Mvc.Jquery.DataTables.Tests/EF/EntityFramework.cs

@@ -0,0 +1,71 @@
+using System.Data.Entity;
+using System.Data.Entity.Infrastructure;
+using System.IO;
+using Mvc.JQuery.Datatables;
+using NUnit.Framework;
+
+namespace Mvc.JQuery.DataTables.Tests.EF
+{
+
+
+    [TestFixture]
+    public class EntityFramework
+    {
+        public class SomeContext : DbContext
+        {
+            public DbSet<SomeModel> Models { get; set; }
+        }
+
+        protected const string DbFile = "test.sdf";
+        protected const string Password = "1234567890";
+
+        [SetUp]
+        public void InitTest()
+        {
+            DataContext = new SomeContext();
+            Database.DefaultConnectionFactory = new SqlCeConnectionFactory("System.Data.SqlServerCe.4.0", "", string.Format("Data Source=\"{0}\";Password={1}", DbFile, Password));
+
+            DataContext.Database.Initialize(true);
+            for (var i = 0; i < 100; i++)
+            {
+                DataContext.Models.Add(new SomeModel() {DisplayName = "Name " + i});
+
+            }
+            DataContext.SaveChanges();
+        }
+
+        protected SomeContext DataContext { get; set; }
+
+        [Test]
+        public void ItMakesAppropriateQueries()
+        {
+            //arrange
+            var source = DataContext.Models;
+            var dataTablesParam = new DataTablesParam();
+            dataTablesParam.iColumns = 2;
+            dataTablesParam.bSearchable.Add(false);
+            dataTablesParam.bSearchable.Add(true);
+
+            dataTablesParam.sSearch = "Name 10";
+
+            //act
+            var result = new DataTablesResult<SomeModel, SomeModel>(source, dataTablesParam, model => model);
+            var data = (DataTablesData) result.Data;
+        
+            //assert
+            //TODO: need to check that appropriate SQL queries are made somehow.
+
+        }
+
+        [TearDown]
+        public void CleanupTest()
+        {
+            DataContext.Dispose();
+
+            if (File.Exists(DbFile))
+            {
+                File.Delete(DbFile);
+            }
+        }
+    }
+}

Mvc.Jquery.DataTables.Tests/EF/SomeModel.cs

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Mvc.JQuery.DataTables.Tests.EF
+{
+    public class SomeModel
+    {
+        [Key]
+        public int Id { get; set; }
+        public string DisplayName { get; set; }
+    }
+}

Mvc.Jquery.DataTables.Tests/EF/SomeView.cs

@@ -0,0 +1,7 @@
+namespace Mvc.JQuery.DataTables.Tests.EF
+{
+    public class SomeView
+    {
+        public string Name { get; set; }
+    }
+}

Mvc.Jquery.DataTables.Tests/Mvc.JQuery.DataTables.Tests.csproj

@@ -58,6 +58,10 @@
     <Compile Include="Fixtures\EntityFrameworkCe.cs" />
     <Compile Include="Fixtures\Linq.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="EF\EntityFramework.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="EF\SomeModel.cs" />
+    <Compile Include="EF\SomeView.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />