From 3d2779339eb47236832b31749deed2a7a9c04dcb Mon Sep 17 00:00:00 2001 From: Samuel Wanjohi Date: Fri, 13 Sep 2024 18:02:51 +0300 Subject: [PATCH] Renaming --- .../Query/Expressions/FakeEdmNodesHelper.cs | 4 ++-- ...mModelBuilder.cs => HardCodedTestModel.cs} | 4 ++-- .../Query/Expressions/QueryBinderTests.cs | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) rename test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/{EdmModelBuilder.cs => HardCodedTestModel.cs} (96%) diff --git a/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/FakeEdmNodesHelper.cs b/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/FakeEdmNodesHelper.cs index d9b2732e1..59fe1a429 100644 --- a/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/FakeEdmNodesHelper.cs +++ b/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/FakeEdmNodesHelper.cs @@ -36,8 +36,8 @@ public override IEdmEntityTypeReference EntityTypeReference public static FakeSingleEntityNode CreateFakeNodeForPerson() { - var personType = EdmModelBuilder.GetEntityType("Microsoft.FullyQualified.NS.Person"); - return new FakeSingleEntityNode(EdmModelBuilder.GetEntityTypeReference(personType), EdmModelBuilder.GetPeopleSet()); + var personType = HardCodedTestModel.GetEntityType("Microsoft.FullyQualified.NS.Person"); + return new FakeSingleEntityNode(HardCodedTestModel.GetEntityTypeReference(personType), HardCodedTestModel.GetPeopleSet()); } } diff --git a/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/EdmModelBuilder.cs b/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/HardCodedTestModel.cs similarity index 96% rename from test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/EdmModelBuilder.cs rename to test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/HardCodedTestModel.cs index 0c7bd983e..4d646a330 100644 --- a/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/EdmModelBuilder.cs +++ b/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/HardCodedTestModel.cs @@ -4,7 +4,7 @@ namespace Microsoft.AspNetCore.OData.Tests.Query.Expressions { - internal static class EdmModelBuilder + internal static class HardCodedTestModel { private static readonly IEdmModel Model = BuildAndGetEdmModel(); @@ -48,7 +48,7 @@ public static IEdmEntitySet GetPeopleSet() return TestModel.EntityContainer.FindEntitySet("People"); } - public static IEdmModel BuildAndGetEdmModel() + private static IEdmModel BuildAndGetEdmModel() { var builder = new ODataConventionModelBuilder(); builder.Namespace = "Microsoft.FullyQualified.NS"; diff --git a/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/QueryBinderTests.cs b/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/QueryBinderTests.cs index fdd2eed94..aec6729c2 100644 --- a/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/QueryBinderTests.cs +++ b/test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/QueryBinderTests.cs @@ -113,14 +113,14 @@ public void BindSingleResourceFunctionCallNode_CastingEntityType_ReturnsExpressi // Arrange var binder = new MyQueryBinder(); - var model = EdmModelBuilder.BuildAndGetEdmModel(); + var model = HardCodedTestModel.TestModel; // Create the type reference and navigation source - var personType = EdmModelBuilder.GetEntityType("Microsoft.FullyQualified.NS.Person"); - var personTypeRef = EdmModelBuilder.GetEntityTypeReference(personType); + var personType = HardCodedTestModel.GetEntityType("Microsoft.FullyQualified.NS.Person"); + var personTypeRef = HardCodedTestModel.GetEntityTypeReference(personType); var collectionNode = FakeCollectionResourceNode.CreateFakeNodeForPerson(); - var employeeType = EdmModelBuilder.GetEntityType("Microsoft.FullyQualified.NS.Employee"); + var employeeType = HardCodedTestModel.GetEntityType("Microsoft.FullyQualified.NS.Employee"); // Create a ResourceRangeVariableReferenceNode for the Person entity var rangeVariable = new ResourceRangeVariable("$it", personTypeRef, collectionNode); @@ -174,22 +174,22 @@ public void BindSingleResourceFunctionCallNode_PropertyCasting_ReturnsExpression // Arrange var binder = new MyQueryBinder(); - var model = EdmModelBuilder.BuildAndGetEdmModel(); + var model = HardCodedTestModel.TestModel; // Create the type reference and navigation source - var personType = EdmModelBuilder.GetEntityType("Microsoft.FullyQualified.NS.Person"); - var personTypeRef = EdmModelBuilder.GetEntityTypeReference(personType); + var personType = HardCodedTestModel.GetEntityType("Microsoft.FullyQualified.NS.Person"); + var personTypeRef = HardCodedTestModel.GetEntityTypeReference(personType); var collectionNode = FakeCollectionResourceNode.CreateFakeNodeForPerson(); - var myAddressType = EdmModelBuilder.GetEdmComplexType("Microsoft.FullyQualified.NS.MyAddress"); - var workAddressType = EdmModelBuilder.GetEdmComplexType("Microsoft.FullyQualified.NS.WorkAddress"); + var myAddressType = HardCodedTestModel.GetEdmComplexType("Microsoft.FullyQualified.NS.MyAddress"); + var workAddressType = HardCodedTestModel.GetEdmComplexType("Microsoft.FullyQualified.NS.WorkAddress"); // Create a ResourceRangeVariableReferenceNode for the Person entity var rangeVariable = new ResourceRangeVariable("$it", personTypeRef, collectionNode); var personNode = new ResourceRangeVariableReferenceNode(rangeVariable.Name, rangeVariable) as SingleValueNode; // Create a SingleComplexNode for the Location property of the Person entity - var locationProperty = EdmModelBuilder.GetPersonLocationProperty(); + var locationProperty = HardCodedTestModel.GetPersonLocationProperty(); var locationNode = new SingleComplexNode(personNode as SingleResourceNode, locationProperty); // Create the parameters list