Implemented IDisplayFolderFilter to fix DisplayFolder support

NBi.NUnit/Builder/AbstractStructureBuilder.cs

@@ -65,6 +65,9 @@ protected virtual IEnumerable<CaptionFilter> BuildFilters(AbstractItem item)
                 yield return new CaptionFilter(Target.Levels, ((ILevelFilter)item).Level);
             if (item is IMeasureGroupFilter && !(string.IsNullOrEmpty(((IMeasureGroupFilter)item).MeasureGroup)))
                 yield return new CaptionFilter(Target.MeasureGroups, ((IMeasureGroupFilter)item).MeasureGroup);
+            if (item is IDisplayFolderFilter && !(string.IsNullOrEmpty(((IDisplayFolderFilter)item).DisplayFolder)))
+                yield return new CaptionFilter(Target.DisplayFolders, ((IDisplayFolderFilter)item).DisplayFolder);
+
             //if (item is ISchemaFilter)
             //    yield return new CaptionFilter(Target.Schemas, ((ISchemaFilter)item).Schema);
             if (item is ITableFilter)

NBi.Testing/Unit/NUnit/Builder/StructureEquivalentToBuilderTest.cs

@@ -1,8 +1,7 @@
     #region Using directives
-using System;
+
 using System.Linq;
 using Moq;
-using NBi.Core.Analysis.Request;
 using NBi.NUnit.Builder;
 using NBi.NUnit.Structure;
 using NBi.Xml.Constraints;
@@ -11,6 +10,8 @@
 using NBi.Xml.Systems;
 using NUnit.Framework;
 using NBi.Core.Structure.Olap;
+using NBi.Xml.Items.Filters;
+
 #endregion
 
 namespace NBi.Testing.Unit.NUnit.Builder
@@ -198,7 +199,7 @@ public void GetSystemUnderTest_CorrectMeasureTarget_Success()
             var sut = builder.GetSystemUnderTest();
 
             //Assertion
-            Assert.That(sut, Is.InstanceOf<OlapCommand>());
+            Assert.That(sut, Is.InstanceOf<OlapCommand>()); 
         }
 
         //**********************
@@ -223,9 +224,13 @@ public void GetSystemUnderTest_CorrectDimensionTarget_Success()
             //Call the method to test
             builder.Build();
             var sut = builder.GetSystemUnderTest();
-            
+
             //Assertion
-            Assert.That(sut, Is.InstanceOf<OlapCommand>());
+            var command = sut as OlapCommand;
+            Assert.NotNull(command);
+            Assert.NotNull(command.Description);
+            Assert.IsTrue(command.Description.Filters.Any(f => f.Caption == "Perspective"));
+            Assert.AreEqual(command.Description.Filters.Count(), 1);
         }
 
         //**********************
@@ -310,5 +315,79 @@ public void GetSystemUnderTest_CorrectPropertyTarget_Success()
             Assert.That(sut, Is.InstanceOf<OlapCommand>());
         }
 
+        //**********************
+        //  Test Filters
+        //    IPerspectiveFilter
+        //    IMeasureGroupFilter      
+        //    IDisplayFolderFilter
+        //**********************
+
+
+        [Test]
+        public void GetSystemUndeTest_CorrectFiltersAppliedOnDescriptionPart1_Success()
+        {
+            //Buiding object used during test
+            var ctrXmlStubFactory = new Mock<EquivalentToXml>();
+            var ctrXml = ctrXmlStubFactory.Object;
+
+            var sutXml = new StructureXml();
+            sutXml.Item = new MeasuresXml();
+            sutXml.Item.ConnectionString = ConnectionStringReader.GetAdomd();
+            ((IPerspectiveFilter)sutXml.Item).Perspective = "Perspective";
+            ((IMeasureGroupFilter)sutXml.Item).MeasureGroup = "MeasureGroup";
+            ((IDisplayFolderFilter)sutXml.Item).DisplayFolder = "DisplayFolder";
+            var builder = new StructureEquivalentToBuilder();
+            builder.Setup(sutXml, ctrXml);
+            builder.Build();
+            var sut = builder.GetSystemUnderTest();
+
+            //Assertion
+            Assert.That(sut, Is.InstanceOf<OlapCommand>());
+
+            var command = sut as OlapCommand;
+            Assert.NotNull(command);
+            Assert.NotNull(command.Description);
+            Assert.IsTrue(command.Description.Filters.Any(f => f.Caption == "Perspective"));
+            Assert.IsTrue(command.Description.Filters.Any(f => f.Caption == "MeasureGroup"));
+            Assert.IsTrue(command.Description.Filters.Any(f => f.Caption == "DisplayFolder"));
+        }
+
+
+        //**********************
+        //  Test Filters
+        //    IDimensionFilter
+        //    IHierarchyFilter
+        //    ILevelFilter
+        //**********************
+
+
+        [Test]
+        public void GetSystemUndeTest_CorrectFiltersAppliedOnDescriptionPart2_Success()
+        {
+            //Buiding object used during test
+            var ctrXmlStubFactory = new Mock<EquivalentToXml>();
+            var ctrXml = ctrXmlStubFactory.Object;
+
+            var sutXml = new StructureXml();
+            sutXml.Item = new PropertiesXml();
+            sutXml.Item.ConnectionString = ConnectionStringReader.GetAdomd();
+            ((IDimensionFilter)sutXml.Item).Dimension = "Dimension";
+            ((IHierarchyFilter)sutXml.Item).Hierarchy = "Hierarchy";
+            ((ILevelFilter)sutXml.Item).Level = "Level";
+            var builder = new StructureEquivalentToBuilder();
+            builder.Setup(sutXml, ctrXml);
+            builder.Build();
+            var sut = builder.GetSystemUnderTest();
+
+            //Assertion
+            Assert.That(sut, Is.InstanceOf<OlapCommand>());
+
+            var command = sut as OlapCommand;
+            Assert.NotNull(command);
+            Assert.NotNull(command.Description);
+            Assert.IsTrue(command.Description.Filters.Any(f => f.Caption == "Dimension"));
+            Assert.IsTrue(command.Description.Filters.Any(f => f.Caption == "Hierarchy"));
+            Assert.IsTrue(command.Description.Filters.Any(f => f.Caption == "Level"));
+        }
     }
 }

NBi.Xml/Items/Filters/IDisplayFolderFilter.cs

@@ -0,0 +1,7 @@
+namespace NBi.Xml.Items.Filters
+{
+    public interface IDisplayFolderFilter
+    {
+        string DisplayFolder { get; set; }
+    }
+}

NBi.Xml/Items/HierarchiesXml.cs

@@ -6,7 +6,7 @@
 
 namespace NBi.Xml.Items
 {
-    public class HierarchiesXml : DimensionsXml, IDimensionFilter
+    public class HierarchiesXml : DimensionsXml, IDimensionFilter, IDisplayFolderFilter
     {
         public HierarchiesXml()
         {

NBi.Xml/Items/HierarchyXml.cs

@@ -6,7 +6,7 @@
 
 namespace NBi.Xml.Items
 {
-    public class HierarchyXml : DimensionXml, IDimensionFilter
+    public class HierarchyXml : DimensionXml, IDimensionFilter, IDisplayFolderFilter
     {
         public HierarchyXml()
         {

NBi.Xml/Items/MeasureXml.cs

@@ -6,7 +6,7 @@
 
 namespace NBi.Xml.Items
 {
-    public class MeasureXml : MeasureGroupXml, IMeasureGroupFilter
+    public class MeasureXml : MeasureGroupXml, IMeasureGroupFilter, IDisplayFolderFilter
     {
         protected string measureGroup;
         [XmlAttribute("measure-group")]

NBi.Xml/Items/MeasuresXml.cs

@@ -6,7 +6,7 @@
 
 namespace NBi.Xml.Items
 {
-    public class MeasuresXml : MeasureGroupsXml, IMeasureGroupFilter
+    public class MeasuresXml : MeasureGroupsXml, IMeasureGroupFilter, IDisplayFolderFilter
     {
         protected string measureGroup;
         [XmlAttribute("measure-group")]

NBi.Xml/NBi.Xml.csproj

@@ -97,6 +97,7 @@
     <Compile Include="InheritanceTestXml.cs" />
     <Compile Include="Items\ColumnXml.cs" />
     <Compile Include="Items\ColumnsXml.cs" />
+    <Compile Include="Items\Filters\IDisplayFolderFilter.cs" />
     <Compile Include="Items\Filters\IHierarchyFilter.cs" />
     <Compile Include="Items\Filters\ILevelFilter.cs" />
     <Compile Include="Items\Filters\IMeasureGroupFilter.cs" />