Refactoring and addressed review comments.

OData · Aug 15, 2022 · 76dab9e · 76dab9e
1 parent dbcc511
commit 76dab9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/sample/ODataRoutingSample.Tests/AccountsControllerTests.cs b/sample/ODataRoutingSample.Tests/AccountsControllerTests.cs
@@ -36,12 +36,12 @@ public void AccountsController_GetTopTwoAccounts_ShouldReturnTopTwoAccounts()
             var edmModel = modelBuilder.GetEdmModel();
 
             var options = new ODataOptions();
-            options.AddModel("odata", EdmCoreModel.Instance);
-            options.AddModel("my{data}", edmModel);
+            options.AddRouteComponents("odata", EdmCoreModel.Instance);
+            options.AddRouteComponents("my{data}", edmModel);
 
             HttpRequest request = RequestFactory.Create("GET",
                 "http://localhost/api?$top=2&$count=true",
-                dataOptions => dataOptions.AddModel("odata", edmModel));
+                dataOptions => dataOptions.AddRouteComponents("odata", edmModel));
 
             var oDataQueryContext = new ODataQueryContext(edmModel, typeof(Account), new ODataPath());
 
@@ -65,12 +65,12 @@ public void AccountsController_SelectAccountWithNameEqualHot_ShouldReturnAccount
             var edmModel = modelBuilder.GetEdmModel();
 
             var options = new ODataOptions();
-            options.AddModel("odata", EdmCoreModel.Instance);
-            options.AddModel("my{data}", edmModel);
+            options.AddRouteComponents("odata", EdmCoreModel.Instance);
+            options.AddRouteComponents("my{data}", edmModel);
 
             HttpRequest request = RequestFactory.Create("GET",
                 "http://localhost/api?filter=Name eq 'Hot'",
-                dataOptions => dataOptions.AddModel("odata", edmModel));
+                dataOptions => dataOptions.AddRouteComponents("odata", edmModel));
 
             var oDataQueryContext = new ODataQueryContext(edmModel, typeof(Account), new ODataPath());
 

diff --git a/sample/ODataRoutingSample.Tests/ODataRoutingSample.Tests.csproj b/sample/ODataRoutingSample.Tests/ODataRoutingSample.Tests.csproj
@@ -13,10 +13,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/ODataRoutingSample.Tests/RequestFactory.cs b/sample/ODataRoutingSample.Tests/RequestFactory.cs
@@ -12,14 +12,15 @@ public static class RequestFactory
         /// </summary>
         /// <param name="method">The http method.</param>
         /// <param name="uri">The http request uri.</param>
+        /// <param name="setupDataConfigurationOption">Data configuration option action</param>
         /// <returns>The HttpRequest.</returns>
-        public static HttpRequest Create(string method, string uri, Action<ODataOptions> setupActio)
+        public static HttpRequest Create(string method, string uri, Action<ODataOptions> setupDataConfigurationOption)
         {
             HttpContext context = new DefaultHttpContext();
             HttpRequest request = context.Request;
 
             IServiceCollection services = new ServiceCollection();
-            services.Configure(setupActio);
+            services.Configure(setupDataConfigurationOption);
             context.RequestServices = services.BuildServiceProvider();
 
             request.Method = method;