expand collection unit tests

Author: Ihar Yakimush

Community.Data.OData.Linq.xTests/ExpandTests.cs

@@ -4,7 +4,7 @@
     using System.Linq;
 
     using Community.OData.Linq.xTests.SampleData;
-
+    using Microsoft.OData;
     using Xunit;
 
     public class ExpandTests
@@ -57,5 +57,60 @@ public void ExpandLinkSelect()
             Assert.Equal(3, metadata.Count);
             Assert.Equal(1, (metadata["Link1"] as ISelectExpandWrapper).ToDictionary().Count);
         }
+
+        [Fact]
+        public void ExpandCollection()
+        {
+            ISelectExpandWrapper[] result = ClassWithCollection.CreateQuery().OData().SelectExpand("Name", "Link2").ToArray();
+
+            IDictionary<string, object> metadata = result[0].ToDictionary();
+
+            // Not expanded by default
+            Assert.Equal(2, metadata.Count);
+            Assert.Equal(2, (metadata["Link2"] as IEnumerable<ISelectExpandWrapper>).Count());
+        }
+
+        [Fact]
+        public void ExpandCollectionWithTop()
+        {
+            ISelectExpandWrapper[] result = ClassWithCollection.CreateQuery().OData().SelectExpand("Name", "Link2($top=1)").ToArray();
+
+            IDictionary<string, object> metadata = result[0].ToDictionary();
+
+            // Not expanded by default
+            Assert.Equal(2, metadata.Count);
+            Assert.Single((metadata["Link2"] as IEnumerable<ISelectExpandWrapper>));
+        }
+
+        [Fact]
+        public void ExpandCollectionWithTopDefaultPageSize()
+        {
+            ISelectExpandWrapper[] result = ClassWithCollection.CreateQuery().OData(s => s.QuerySettings.PageSize = 1).SelectExpand("Name", "Link2").ToArray();
+
+            IDictionary<string, object> metadata = result[0].ToDictionary();
+
+            // Not expanded by default
+            Assert.Equal(2, metadata.Count);
+            Assert.Single((metadata["Link2"] as IEnumerable<ISelectExpandWrapper>));
+        }
+
+        [Fact]
+        public void ExpandCollectionWithTop21()
+        {
+            ISelectExpandWrapper[] result = ClassWithCollection.CreateQuery().OData().SelectExpand("Name", "Link2($top=21)").ToArray();
+
+            IDictionary<string, object> metadata = result[0].ToDictionary();
+
+            // Not expanded by default
+            Assert.Equal(2, metadata.Count);
+            Assert.Equal(2, (metadata["Link2"] as IEnumerable<ISelectExpandWrapper>).Count());
+        }
+
+        [Fact]
+        public void ExpandCollectionWithTopExceedLimit()
+        {
+            Assert.Throws<ODataException>(
+               () => ClassWithCollection.CreateQuery().OData().SelectExpand("Name", "Link2($top=101)"));            
+        }
     }
 }

Community.Data.OData.Linq.xTests/SelectTests.cs

@@ -96,6 +96,19 @@ public void SelectNameToIgnore()
         {
             Assert.Throws<ODataException>(
                 () => SimpleClass.CreateQuery().OData().SelectExpand("NameToIgnore"));
-        }        
+        }
+
+        [Fact]
+        public void SelectLinkWithoutExpandNotWorking()
+        {
+            ISelectExpandWrapper[] result = ClassWithLink.CreateQuery().OData().SelectExpand("Link1").ToArray();
+
+            IDictionary<string, object> metadata = result[0].ToDictionary();
+  
+            Assert.Equal(1, metadata.Count);
+            Assert.Null(metadata["Link3"]);
+        }
+
+        
     }
 }

Community.Data.OData.Linq/ODataSettings.cs

@@ -1,7 +1,5 @@
 namespace Community.OData.Linq
 {
-    using System.ComponentModel.Design;
-
     using Community.OData.Linq.OData.Query;
 
     using Microsoft.OData.UriParser;
@@ -10,7 +8,7 @@ public class ODataSettings
     {
         internal static ODataUriResolver DefaultResolver = new StringAsEnumResolver { EnableCaseInsensitive = true };
 
-        public ODataQuerySettings QuerySettings { get; } = new ODataQuerySettings();
+        public ODataQuerySettings QuerySettings { get; } = new ODataQuerySettings() { PageSize = 20 };
 
         public ODataValidationSettings ValidationSettings { get; } = new ODataValidationSettings();
 
@@ -19,5 +17,15 @@ public class ODataSettings
         public ODataUriResolver Resolver { get; set; } = DefaultResolver;
 
         public bool EnableCaseInsensitive { get; set; } = true;
+
+        public DefaultQuerySettings DefaultQuerySettings { get; } =
+            new DefaultQuerySettings
+            {
+                EnableFilter = true,
+                EnableOrderBy = true,
+                EnableExpand = true,
+                EnableSelect = true,
+                MaxTop = 100
+            };
     }
 }

Community.Data.OData.Linq/OdataLinqExtensions.cs

@@ -25,18 +25,6 @@ public static class ODataLinqExtensions
         /// </summary>
         private static readonly ODataSimplifiedOptions SimplifiedOptions = new ODataSimplifiedOptions();
 
-        /// <summary>
-        /// The query settings default.
-        /// </summary>
-        private static readonly DefaultQuerySettings QuerySettingsDefault =
-            new DefaultQuerySettings
-                {
-                    EnableFilter = true,
-                    EnableOrderBy = true,
-                    EnableExpand = true,
-                    EnableSelect = true
-                };
-
         /// <summary>
         /// Enable applying OData specific functions to query
         /// </summary>
@@ -86,8 +74,8 @@ public static ODataQuery<T> OData<T>(this IQueryable<T> query, Action<ODataSetti
             container.AddService(typeof(ODataUriResolver), settings.Resolver ?? ODataSettings.DefaultResolver);
             container.AddService(typeof(ODataSimplifiedOptions), SimplifiedOptions);
             container.AddService(typeof(ODataSettings), settings);
-            container.AddService(typeof(DefaultQuerySettings), QuerySettingsDefault);
-            container.AddService(typeof(SelectExpandQueryValidator), new SelectExpandQueryValidator(QuerySettingsDefault));
+            container.AddService(typeof(DefaultQuerySettings), settings.DefaultQuerySettings);
+            container.AddService(typeof(SelectExpandQueryValidator), new SelectExpandQueryValidator(settings.DefaultQuerySettings));
 
             ODataQuery<T> dataQuery = new ODataQuery<T>(query, container);
 
@@ -133,7 +121,7 @@ public static ODataQuery<T> Filter<T>(this ODataQuery<T> query, string filterTex
             filterClause = new FilterClause(filterExpression, filterClause.RangeVariable);
             Contract.Assert(filterClause != null);
 
-            var validator = new FilterQueryValidator(QuerySettingsDefault);
+            var validator = new FilterQueryValidator(settings.DefaultQuerySettings);
             validator.Validate(filterClause, settings.ValidationSettings, edmModel);
 
             Expression filter = FilterBinder.Bind(query, filterClause, typeof(T), query.ServiceProvider);
@@ -160,7 +148,7 @@ public static IOrderedQueryable<T> OrderBy<T>(this ODataQuery<T> query, string o
 
             ICollection<OrderByNode> nodes = OrderByNode.CreateCollection(orderByClause);
 
-            var validator = new OrderByQueryValidator(QuerySettingsDefault);
+            var validator = new OrderByQueryValidator(settings.DefaultQuerySettings);
             validator.Validate(nodes, settings.ValidationSettings, edmModel);
 
             IOrderedQueryable<T> result = (IOrderedQueryable<T>)OrderByBinder.OrderApplyToCore(query, settings.QuerySettings, nodes, edmModel);