Update namespaces, upgrade abstractions version, add tests for new Fi…

…ndReflectedType method
DynamicsValue · Oct 13, 2023 · c300afa · c300afa
1 parent cb0368c
commit c300afa
Show file tree

Hide file tree

Showing 71 changed files with 168 additions and 78 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 ## [2.3.3]
 
+### Added
+
+- New method to retrieve early bound types based on EntityTypeCode.
+
 ### Changed
 
--  Upgraded GitHub Actions to update Java major version to run SonarCloud analysis - https://github.com/DynamicsValue/fake-xrm-easy/issues/110
-º
+-  Update namespaces in tests project for consistency
+ - Upgraded GitHub Actions to update Java major version to run SonarCloud analysis - https://github.com/DynamicsValue/fake-xrm-easy/issues/110
  - Introduced new NewEntityRecord method to easily create instances of entity records based on the current use of early-bound or late-bound entities 
  - Resolves an issue with query evaluation and MultiOptionSets when using late bound entities or if type information is not present. - https://github.com/DynamicsValue/fake-xrm-easy/issues/66
 

diff --git a/src/FakeXrmEasy.Core/FakeXrmEasy.Core.csproj b/src/FakeXrmEasy.Core/FakeXrmEasy.Core.csproj
@@ -102,22 +102,22 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.3.2-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.3.3-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.3.2-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.3.3-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.3.2-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.3.3-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.3.2-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.3.3-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_365'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.3.2-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.3.3-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_9'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.3.2-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.3.3-*,3.0)" />
   </ItemGroup>
 
   <Target Name="PreparePackageReleaseNotesFromFile" BeforeTargets="GenerateNuspec">

diff --git a/src/FakeXrmEasy.Core/XrmFakedContext.Queries.cs b/src/FakeXrmEasy.Core/XrmFakedContext.Queries.cs
@@ -18,7 +18,7 @@ namespace FakeXrmEasy
     public partial class XrmFakedContext : IXrmFakedContext
     {
         /// <summary>
-        /// 
+        /// Finds the early-bound type based on an entity's logical name
         /// </summary>
         /// <param name="logicalName"></param>
         /// <returns></returns>
@@ -45,6 +45,35 @@ public Type FindReflectedType(string logicalName)
 
             return types.SingleOrDefault();
         }
+
+        /// <summary>
+        /// Finds the early-bound type based on an entity's generated type code
+        /// </summary>
+        /// <param name="entityTypeCode"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        public Type FindReflectedType(int entityTypeCode)
+        {
+            var types =
+                ProxyTypesAssemblies.Select(a => FindReflectedType(entityTypeCode, a))
+                    .Where(t => t != null);
+
+            if (types.Count() > 1)
+            {
+                var errorMsg = $"Type { entityTypeCode } is defined in multiple assemblies: ";
+                foreach (var type in types)
+                {
+                    errorMsg += type.Assembly
+                        .GetName()
+                        .Name + "; ";
+                }
+                var lastIndex = errorMsg.LastIndexOf("; ");
+                errorMsg = errorMsg.Substring(0, lastIndex) + ".";
+                throw new InvalidOperationException(errorMsg);
+            }
+
+            return types.SingleOrDefault();
+        }
 
         /// <summary>
         /// Finds reflected type for given entity from given assembly.
@@ -92,6 +121,53 @@ private static Type FindReflectedType(string logicalName,
                 throw new Exception("XrmFakedContext.FindReflectedType: " + s);
             }
         }
+
+        /// <summary>
+        /// Finds reflected type for given entity from given assembly.
+        /// </summary>
+        /// <param name="entityTypeCode">
+        /// Entity logical name which type is searched from given
+        /// <paramref name="assembly"/>.
+        /// </param>
+        /// <param name="assembly">
+        /// Assembly where early-bound type is searched for given
+        /// <paramref name="logicalName"/>.
+        /// </param>
+        /// <returns>
+        /// Early-bound type of <paramref name="entityTypeCode"/> if it's found
+        /// from <paramref name="assembly"/>. Otherwise null is returned.
+        /// </returns>
+        private static Type FindReflectedType(int entityTypeCode,
+            Assembly assembly)
+        {
+            try
+            {
+                if (assembly == null)
+                {
+                    throw new ArgumentNullException(nameof(assembly));
+                }
+
+                var subClassType = assembly.GetTypes()
+                    .Where(t => typeof(Entity).IsAssignableFrom(t))
+                    .Where(t => t.GetCustomAttributes(typeof(EntityLogicalNameAttribute), true).Length > 0)
+                    .Where(t => t.GetField("EntityTypeCode").GetValue(null).Equals(entityTypeCode))
+                    .FirstOrDefault();
+
+                return subClassType;
+            }
+            catch (ReflectionTypeLoadException exception)
+            {
+                // now look at ex.LoaderExceptions - this is an Exception[], so:
+                var s = "";
+                foreach (var innerException in exception.LoaderExceptions)
+                {
+                    // write details of "inner", in particular inner.Message
+                    s += innerException.Message + " ";
+                }
+
+                throw new Exception("XrmFakedContext.FindReflectedType: " + s);
+            }
+        }
 
         /// <summary>
         /// 

diff --git a/tests/FakeXrmEasy.Core.Tests/Extensions/EntityExtensionsTests.cs b/tests/FakeXrmEasy.Core.Tests/Extensions/EntityExtensionsTests.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.Extensions
+namespace FakeXrmEasy.Core.Tests.Extensions
 {
     public class EntityExtensionsTests
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/Extensions/EntityMetadataExtensionsTests.cs b/tests/FakeXrmEasy.Core.Tests/Extensions/EntityMetadataExtensionsTests.cs
@@ -4,7 +4,7 @@
 using Xunit;
 using System.Collections.Generic;
 
-namespace FakeXrmEasy.Tests.Extensions
+namespace FakeXrmEasy.Core.Tests.Extensions
 {
     public class EntityMetadataExtensionsTests
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/Extensions/OrganizationRequestExtensionsTests.cs b/tests/FakeXrmEasy.Core.Tests/Extensions/OrganizationRequestExtensionsTests.cs
@@ -7,7 +7,7 @@
 using System;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.Extensions
+namespace FakeXrmEasy.Core.Tests.Extensions
 {
     public class OrganizationRequestExtensionsTests
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/Extensions/QueryExpressionExtensionsTests.cs b/tests/FakeXrmEasy.Core.Tests/Extensions/QueryExpressionExtensionsTests.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xrm.Sdk.Query;
 using FakeXrmEasy.Query;
 
-namespace FakeXrmEasy.Tests.Extensions
+namespace FakeXrmEasy.Core.Tests.Extensions
 {
     public class QueryExpressionExtensionsTests
     {

diff --git a/.../FakeXrmEasy.Core.Tests/FakeContextTests/DateTimeBehaviourTests/DateTimeBehaviourTests.cs b/.../FakeXrmEasy.Core.Tests/FakeContextTests/DateTimeBehaviourTests/DateTimeBehaviourTests.cs
@@ -10,7 +10,7 @@
 using Xunit;
 using FakeXrmEasy.Extensions;
 
-namespace FakeXrmEasy.Tests.FakeContextTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests
 {
     public class DateTimeBehaviourTests: FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTestCreateQuery.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTestCreateQuery.cs
@@ -7,7 +7,7 @@
 using System.Reflection;
 using Xunit;
 
-namespace FakeXrmEasy.Tests
+namespace FakeXrmEasy.Core.Tests
 {
     public class FakeContextTestCreateQuery: FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTestDelete.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTestDelete.cs
@@ -8,7 +8,7 @@
 using Xunit;
 
 
-namespace FakeXrmEasy.Tests
+namespace FakeXrmEasy.Core.Tests
 {
     public class FakeXrmEasyTestsDelete : FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTestMetadata.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTestMetadata.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.FakeContextTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests
 {
     public class FakeContextTestMetadata : FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTests.AddEntity.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTests.AddEntity.cs
@@ -2,7 +2,7 @@
 using Crm;
 using Xunit;
 
-namespace FakeXrmEasy.Tests
+namespace FakeXrmEasy.Core.Tests
 {
     public class FakeXrmEasyTestsAddEntity : FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTests.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeContextTests.cs
@@ -9,7 +9,7 @@
 using Crm;
 using System.Reflection;
 
-namespace FakeXrmEasy.Tests
+namespace FakeXrmEasy.Core.Tests
 {
     public class FakeContextCoreTests : FakeXrmEasyTestsBase
     {
@@ -300,7 +300,7 @@ public void Should_return_entity_by_id()
         }
 
         [Fact]
-        public void Should_return_error_if_entity_lofical_name_doesnt_exists() 
+        public void Should_return_error_if_entity_logical_name_doesnt_exists() 
         {
             Assert.Throws<InvalidOperationException>(() =>_context.GetEntityById("doesNotExist", Guid.NewGuid())); 
         }
@@ -318,5 +318,15 @@ public void Should_return_error_if_entity_id_does_not_exists()
 
             Assert.Throws<InvalidOperationException>(() =>_context.GetEntityById("contact", Guid.NewGuid())); 
         }
+
+        [Fact]
+        public void Should_find_reflected_type_by_entity_type_code() {
+
+            var assembly = typeof(Crm.Account).Assembly;
+            _context.EnableProxyTypes(assembly);
+
+            var type = _context.FindReflectedType(1);
+            Assert.Equal(typeof(Account), type);
+        }
     }
 }
diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeTracingServiceTests.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/FakeTracingServiceTests.cs
@@ -1,7 +1,7 @@
 using Xunit;
 using System;
 
-namespace FakeXrmEasy.Tests.FakeContextTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests
 {
     public class FakeTracingServiceTests
     {

diff --git a/...asy.Core.Tests/FakeContextTests/TranslateQueryExpressionTests/ConditionExpressionTests.cs b/...asy.Core.Tests/FakeContextTests/TranslateQueryExpressionTests/ConditionExpressionTests.cs
@@ -8,7 +8,7 @@
 using System.Linq;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.FakeContextTests.TranslateQueryExpressionTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests.TranslateQueryExpressionTests
 {
     public class ConditionExpressionTests: FakeXrmEasyTestsBase
     {

diff --git a/...re.Tests/FakeContextTests/TranslateQueryExpressionTests/FakeContextTestFormattedValues.cs b/...re.Tests/FakeContextTests/TranslateQueryExpressionTests/FakeContextTestFormattedValues.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.FakeContextTests.TranslateQueryExpressionTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests.TranslateQueryExpressionTests
 {
     public class FormattedValuesTests: FakeXrmEasyTestsBase
     {

diff --git a/...FakeContextTests/TranslateQueryExpressionTests/FakeContextTestTranslateQueryExpression.cs b/...FakeContextTests/TranslateQueryExpressionTests/FakeContextTestTranslateQueryExpression.cs
@@ -10,7 +10,7 @@
 using FakeXrmEasy.Abstractions;
 using FakeXrmEasy.Query;
 
-namespace FakeXrmEasy.Tests
+namespace FakeXrmEasy.Core.Tests
 {
     public class FakeContextTestTranslateQueryExpression: FakeXrmEasyTestsBase
     {

diff --git a/...rmEasy.Core.Tests/FakeContextTests/TranslateQueryExpressionTests/FilterExpressionTests.cs b/...rmEasy.Core.Tests/FakeContextTests/TranslateQueryExpressionTests/FilterExpressionTests.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.FakeContextTests.TranslateQueryExpressionTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests.TranslateQueryExpressionTests
 {
     public class FilterExpressionTests: FakeXrmEasyTestsBase
     {

diff --git a/...ntextTests/TranslateQueryExpressionTests/OperatorTests/DateTime/DateTimeOperatorsTests.cs b/...ntextTests/TranslateQueryExpressionTests/OperatorTests/DateTime/DateTimeOperatorsTests.cs
@@ -7,7 +7,7 @@
 using Xunit;
 using FakeXrmEasy.Query;
 
-namespace FakeXrmEasy.Tests.FakeContextTests.TranslateQueryExpressionTests.OperatorTests.DateTimes
+namespace FakeXrmEasy.Core.Tests.FakeContextTests.TranslateQueryExpressionTests.OperatorTests.DateTimes
 {
     public class DateTimeOperatorsTests: FakeXrmEasyTestsBase
     {

diff --git a/...slateQueryExpressionTests/OperatorTests/MultiSelectOptionSet/MultiSelectOptionSetTests.cs b/...slateQueryExpressionTests/OperatorTests/MultiSelectOptionSet/MultiSelectOptionSetTests.cs
@@ -6,7 +6,7 @@
 using Microsoft.Xrm.Sdk.Query;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.FakeContextTests.TranslateQueryExpressionTests.OperatorTests.MultiSelectOptionSet
+namespace FakeXrmEasy.Core.Tests.FakeContextTests.TranslateQueryExpressionTests.OperatorTests.MultiSelectOptionSet
 {
     public class MultiSelectOptionSetTests: FakeXrmEasyTestsBase
     {

diff --git a/...eContextTests/TranslateQueryExpressionTests/OperatorTests/Strings/StringOperatorsTests.cs b/...eContextTests/TranslateQueryExpressionTests/OperatorTests/Strings/StringOperatorsTests.cs
@@ -7,7 +7,7 @@
 using Xunit;
 using FakeXrmEasy.Query;
 
-namespace FakeXrmEasy.Tests.FakeContextTests.TranslateQueryExpressionTests.OperatorTests.Strings
+namespace FakeXrmEasy.Core.Tests.FakeContextTests.TranslateQueryExpressionTests.OperatorTests.Strings
 {
     public class StringOperatorsTests: FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/TranslateQueryExpressionTests/OrderByTests.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/TranslateQueryExpressionTests/OrderByTests.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.FakeContextTests.TranslateQueryExpressionTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests.TranslateQueryExpressionTests
 {
     public class OrderByTests: FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/ValidateReferencesTests.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/ValidateReferencesTests.cs
@@ -13,7 +13,7 @@
 using System.Collections.Generic;
 
 
-namespace FakeXrmEasy.Tests.FakeContextTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests
 {
     public class ValidateReferencesTests: FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeContextTests/XrmFakedRelationshipTests.cs b/tests/FakeXrmEasy.Core.Tests/FakeContextTests/XrmFakedRelationshipTests.cs
@@ -5,7 +5,7 @@
 using Xunit;
 using FakeXrmEasy.Abstractions;
 
-namespace FakeXrmEasy.Tests.FakeContextTests
+namespace FakeXrmEasy.Core.Tests.FakeContextTests
 {
     public class XrmFakedRelationshipTests: FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/FakeXrmEasyTestsBase.cs b/tests/FakeXrmEasy.Core.Tests/FakeXrmEasyTestsBase.cs
@@ -3,7 +3,7 @@
 using FakeXrmEasy.Middleware;
 using Microsoft.Xrm.Sdk;
 
-namespace FakeXrmEasy.Tests
+namespace FakeXrmEasy.Core.Tests
 {
     public class FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/Issue116.cs b/tests/FakeXrmEasy.Core.Tests/Issue116.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.Issues
+namespace FakeXrmEasy.Core.Tests.Issues
 {
     public class Issue116 : FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/Issues/Issue125.cs b/tests/FakeXrmEasy.Core.Tests/Issues/Issue125.cs
@@ -7,7 +7,7 @@
 using Xunit;
 using FakeXrmEasy.Abstractions;
 
-namespace FakeXrmEasy.Tests.Issues
+namespace FakeXrmEasy.Core.Tests.Issues
 {
     public class Issue125 : FakeXrmEasyTestsBase
     {

diff --git a/tests/FakeXrmEasy.Core.Tests/Issues/Issue156.cs b/tests/FakeXrmEasy.Core.Tests/Issues/Issue156.cs
@@ -6,7 +6,7 @@
 using System.Reflection;
 using Xunit;
 
-namespace FakeXrmEasy.Tests.Issues
+namespace FakeXrmEasy.Core.Tests.Issues
 {
     public class Issue156: FakeXrmEasyTestsBase
     {