adjust namespaces add tests

Author: Ihar Yakimush

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

@@ -5,6 +5,8 @@
 
     using Community.OData.Linq.xTests.SampleData;
 
+    using Microsoft.OData;
+
     using Xunit;
 
     public class FilterNavigationLinkTests
@@ -17,5 +19,11 @@ public void WhereNav1()
             Assert.Single((IEnumerable) result);
             Assert.Equal(21, result[0].Id);
         }
+
+        [Fact]
+        public void WhereNavThrowException()
+        {
+            Assert.Throws<ODataException>(() => ClassWithLink.CreateQuery().OData().Filter("Link2/Id eq 211"));
+        }
     }
 }

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

@@ -31,6 +31,22 @@ public void OrderByIdDefault()
             Assert.Equal(1, result.Id);
         }
 
+        [Fact]
+        public void OrderByIdCaseInsensitiveDefault()
+        {
+            var result = SimpleClass.CreateQuery().OData().OrderBy("id desc,name").First();
+
+            Assert.Equal(2, result.Id);
+        }
+
+        [Fact]
+        public void OrderByIdCaseSensitiveConfig()
+        {
+            Assert.Throws<ODataException>(
+                () => SimpleClass.CreateQuery().OData(s => s.EnableCaseInsensitive = false).OrderBy("id desc,name"));
+        }
+
+
         [Fact]
         public void OrderByNotSortable()
         {

Community.Data.OData.Linq.xTests/SampleData/ClassWithLink.cs

@@ -2,6 +2,8 @@
 {
     using System.Linq;
 
+    using Community.OData.Linq.Annotations;
+
     public class ClassWithLink
     {
         private static readonly ClassWithLink[] items = new[]
@@ -20,5 +22,8 @@ public static IQueryable<ClassWithLink> CreateQuery()
         public string Name { get; set; }
 
         public virtual SimpleClass Link1 { get; set; }
+
+        [NotNavigable]
+        public virtual SimpleClass Link2 { get; set; }
     }
 }

Community.Data.OData.Linq/Builder/ODataModelBuilder.cs

@@ -203,8 +203,6 @@ public SingletonConfiguration<TEntityType> Singleton<TEntityType>(string name) w
             return new SingletonConfiguration<TEntityType>(this, this.AddSingleton(name, entity));
         }
 
-        
-        
         /// <summary>
         /// Registers an entity type as part of the model and returns an object that can be used to configure the entity.
         /// This method can be called multiple times for the same entity to perform multiple lines of configuration.

Community.Data.OData.Linq/Builder/ODataConventionModelBuilder.cs renamed to Community.Data.OData.Linq/ODataConventionModelBuilder.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
-namespace Community.OData.Linq.Builder
+namespace Community.OData.Linq
 {
     using System;
     using System.Collections.Generic;
@@ -10,6 +10,7 @@ namespace Community.OData.Linq.Builder
     using System.Linq;
     using System.Reflection;
 
+    using Community.OData.Linq.Builder;
     using Community.OData.Linq.Builder.Conventions;
     using Community.OData.Linq.Builder.Conventions.Attributes;
     using Community.OData.Linq.Common;

Community.Data.OData.Linq/Builder/ODataConventionModelBuilderExtensions.cs renamed to Community.Data.OData.Linq/ODataConventionModelBuilderExtensions.cs

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
-namespace Community.OData.Linq.Builder
+namespace Community.OData.Linq
 {
     using System;
     using System.ComponentModel;
 
+    using Community.OData.Linq.Builder;
+
     /// <summary>
     /// Provides extension methods for the <see cref="ODataConventionModelBuilder"/> class.
     /// </summary>

Community.Data.OData.Linq/OdataLinqExtensions.cs

@@ -130,19 +130,22 @@ public static IOrderedQueryable<T> OrderBy<T>(this ODataQuery<T> query, string o
             ODataQueryOptionParser queryOptionParser = GetParser(query, entitySetName,
                     new Dictionary<string, string> { { "$orderby", orderbyText } });
 
+            ODataSettings settings = query.ServiceProvider.GetRequiredService<ODataSettings>();
+
+            // Workaround for strange behavior in QueryOptionsParserConfiguration constructor which set it to false always
+            queryOptionParser.Resolver.EnableCaseInsensitive = settings.EnableCaseInsensitive;
+
             var orderByClause = queryOptionParser.ParseOrderBy();
 
             orderByClause = TranslateParameterAlias(orderByClause, queryOptionParser);
 
-            ODataSettings settings = query.ServiceProvider.GetRequiredService<ODataSettings>();
-
             ICollection<OrderByNode> nodes = OrderByNode.CreateCollection(orderByClause);
 
             OrderValidator.Validate(nodes, settings.ValidationSettings, edmModel);
 
-            IOrderedQueryable<T> result = (IOrderedQueryable<T>) OrderApplyToCore<T>(query, settings.QuerySettings, nodes, edmModel);
+            IOrderedQueryable<T> result = (IOrderedQueryable<T>)OrderApplyToCore<T>(query, settings.QuerySettings, nodes, edmModel);
 
-            return new ODataQueryOrdered<T>(result,query.ServiceProvider);
+            return new ODataQueryOrdered<T>(result, query.ServiceProvider);
         }
 
         private static IOrderedQueryable OrderApplyToCore<T>(ODataQuery<T> query, ODataQuerySettings querySettings, ICollection<OrderByNode> nodes, IEdmModel model)

TODO.txt

@@ -8,5 +8,5 @@ exception handling
 +non filterable attributes
 negative scenarious in unit tests
 readme with samples
-nuget package
++nuget package
 github CI