Should_order_by

RobertMischke · Jun 10, 2014 · 8caf63b · 8caf63b
1 parent 0c6350c
commit 8caf63b
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 4 deletions.
diff --git a/scr/Lib.Persistence/2 Lib.Persistence.csproj b/scr/Lib.Persistence/2 Lib.Persistence.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/scr/Lib.Persistence/Persistence.NHibernate/RepositoryDb.cs b/scr/Lib.Persistence/Persistence.NHibernate/RepositoryDb.cs
@@ -231,7 +231,6 @@ public virtual IList<TDomainObject> GetBy(ISearchDesc searchSpec)
 			return GetBy(searchSpec, null);
 		}
 
-
 		/// <param name="searchSpec"></param>
 		/// <param name="criteriaExtender">Here you can plug in additional changes of the criteria.</param>
 		/// <returns></returns>

diff --git a/scr/Lib.Persistence/Persistence.Query/OrderBy/OrderByCriteria.cs b/scr/Lib.Persistence/Persistence.Query/OrderBy/OrderByCriteria.cs
@@ -45,10 +45,11 @@ internal void EndAdding()
     		IsAdding = false;
     	}
 
-		public void Add(OrderBy orderBy)
+        public OrderByCriteria Add(OrderBy orderBy)
 		{
 			CurrentList.RemoveAll(order => order.PropertyName == orderBy.PropertyName);
 			CurrentList.Add(orderBy);
+            return this;
 		}
 
     	public bool IsSet()

diff --git a/scr/Lib.Settings/2 Lib.Settings.csproj b/scr/Lib.Settings/2 Lib.Settings.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/scr/Lib/1 Lib.csproj b/scr/Lib/1 Lib.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/scr/Lib/ExtensionMethods/StringExtensions.cs b/scr/Lib/ExtensionMethods/StringExtensions.cs
@@ -64,6 +64,9 @@ public static string Truncate(this string text, int maxLength)
         /// <returns></returns>
         public static List<string> WordWrap(this string text, int maxLineLength)
         {
+            if (String.IsNullOrEmpty(text))
+                return new List<string>();
+
             text = text.Replace(Environment.NewLine, "\n");
 
             var lines = text.Split('\n').ToList();

diff --git a/scr/Seedworks.sln.DotSettings.user b/scr/Seedworks.sln.DotSettings.user
diff --git a/scr/Tests/Lib.Persistance/RepositoryOrderBy.cs b/scr/Tests/Lib.Persistance/RepositoryOrderBy.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using FluentNHibernate.Conventions;
+using NUnit.Framework;
+using Seedworks.Lib.Persistence;
+
+namespace Seedworks.Tests.Lib.Persistence
+{
+    public class RepositoryOrderBy : BaseTestEntitites
+    {
+        [Test]
+        public void Should_order_by()
+        {
+            var entityRepository = Resolve<SampleEntityRepository>();
+            entityRepository.Create(new SampleEntity { Name = "A", Text = "A"});
+            entityRepository.Create(new SampleEntity { Name = "B", Text = "B"});
+            entityRepository.Create(new SampleEntity { Name = "B", Text = "A"});
+
+            var spec = new SampleEntitySearchSpec();
+            spec.OrderBy.Name.Asc();
+            spec.OrderBy.Text.Asc();
+
+            var entities = entityRepository.GetBy(spec);
+
+            Assert.That(entities[0].Name, Is.EqualTo("A"));
+            Assert.That(entities[1].Name, Is.EqualTo("B"));
+            Assert.That(entities[1].Text, Is.EqualTo("A"));
+        }
+    }
+}
diff --git a/scr/Tests/Lib.Persistance/Sample/Entity.WithDateModified/SampleEntity.cs b/scr/Tests/Lib.Persistance/Sample/Entity.WithDateModified/SampleEntity.cs
@@ -10,6 +10,7 @@ public class SampleEntity : IPersistable, WithDateModified, WithDateCreated
     {
         public virtual int Id { get; set; }
         public virtual string Name { get; set; }
+        public virtual string Text { get; set; }
 
         public virtual DateTime DateCreated { get; set; }
         public virtual DateTime DateModified { get; set; }

diff --git a/scr/Tests/Lib.Persistance/Sample/Entity.WithDateModified/SampleEntityMap.cs b/scr/Tests/Lib.Persistance/Sample/Entity.WithDateModified/SampleEntityMap.cs
@@ -13,6 +13,7 @@ public SampleEntityMap()
         {
             Id(x => x.Id);
             Map(x => x.Name);
+            Map(x => x.Text);
             Map(x => x.DateCreated);
             Map(x => x.DateModified);
         }

diff --git a/scr/Tests/Lib.Persistance/Sample/Entity.WithDateModified/SampleEntitySearchSpec.cs b/scr/Tests/Lib.Persistance/Sample/Entity.WithDateModified/SampleEntitySearchSpec.cs
@@ -6,7 +6,7 @@
 
 namespace Seedworks.Tests.Lib.Persistence
 {
-    public class SampleEntitySearchSpec : SearchSpecificationBase<SampleEntityFilter, OrderByCriteria>
+    public class SampleEntitySearchSpec : SearchSpecificationBase<SampleEntityFilter, SampleOrderBy>
     {
     }
 
@@ -26,13 +26,19 @@ public SampleEntityFilter()
 
     public class SampleOrderBy : OrderByCriteria
     {
+        public OrderBy Name;
+        public OrderBy Text;
+
         public OrderBy Created;
         public OrderBy Modified;
 
         public SampleOrderBy()
         {
             Created = new OrderBy("DateCreated", this);
             Modified = new OrderBy("DateModified", this);
+
+            Name = new OrderBy("Name", this);
+            Text = new OrderBy("Text", this);
         }        
     }
 

diff --git a/scr/Tests/Tests.csproj b/scr/Tests/Tests.csproj
@@ -24,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -83,6 +84,7 @@
     <Compile Include="Infrastructure\BaseTestSetting.cs" />
     <Compile Include="Lib.Persistance\EntityFilterTestsEntitites.cs" />
     <Compile Include="Lib.Persistance\RepositoryGetBySingleTestsEntitites.cs" />
+    <Compile Include="Lib.Persistance\RepositoryOrderBy.cs" />
     <Compile Include="Lib.Persistance\Sample\Entity.BaseTypeEntity\SampleEntityBaseEntity.cs" />
     <Compile Include="Lib.Persistance\Sample\Entity.BaseTypeEntity\SampleEntityBaseEntityMap.cs" />
     <Compile Include="Lib.Persistance\Sample\Entity.BaseTypeEntity\SampleEntityBaseEntityRepository.cs" />

diff --git a/scr/Web.Lib.State/3 Web.Lib.State.csproj b/scr/Web.Lib.State/3 Web.Lib.State.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>