Add conditional compilation because some OrganizationDetail propertie…

…s are v9 specific plus the request is available only for >= 2015 versions. DynamicsValue/fake-xrm-easy#136
DynamicsValue · Mar 2, 2024 · 051763c · 051763c
1 parent 05db9a3
commit 051763c
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 20 deletions.
diff --git a/src/FakeXrmEasy.Messages/ContextProperties/CurrentOrganizationDetails.cs b/src/FakeXrmEasy.Messages/ContextProperties/CurrentOrganizationDetails.cs
@@ -1,3 +1,5 @@
+#if FAKE_XRM_EASY_9 || FAKE_XRM_EASY_365 || FAKE_XRM_EASY_2016 || FAKE_XRM_EASY_2015
+
 using Microsoft.Xrm.Sdk.Organization;
 
 namespace FakeXrmEasy.Messages.ContextProperties
@@ -12,4 +14,5 @@ public class CurrentOrganizationDetails
         /// </summary>
         public OrganizationDetail Details { get; set; }
     }
-}
+}
+#endif
diff --git a/src/FakeXrmEasy.Messages/FakeMessageExecutors/RetrieveCurrentOrganizationRequestExecutor.cs b/src/FakeXrmEasy.Messages/FakeMessageExecutors/RetrieveCurrentOrganizationRequestExecutor.cs
@@ -1,3 +1,5 @@
+#if FAKE_XRM_EASY_9 || FAKE_XRM_EASY_365 || FAKE_XRM_EASY_2016 || FAKE_XRM_EASY_2015
+
 using System;
 using FakeXrmEasy.Abstractions;
 using FakeXrmEasy.Abstractions.FakeMessageExecutors;
@@ -50,4 +52,6 @@ public Type GetResponsibleRequestType()
             return typeof(RetrieveCurrentOrganizationRequest);
         }
     }
-}
+}
+
+#endif
diff --git a/...cutors/RetrieveCurrentOrganizationRequestTests/RetrieveCurrentOrganizationRequestTests.cs b/...cutors/RetrieveCurrentOrganizationRequestTests/RetrieveCurrentOrganizationRequestTests.cs
@@ -1,3 +1,5 @@
+#if FAKE_XRM_EASY_9 || FAKE_XRM_EASY_365 || FAKE_XRM_EASY_2016 || FAKE_XRM_EASY_2015
+
 using System;
 using FakeXrmEasy.Messages.ContextProperties;
 using Microsoft.Crm.Sdk.Messages;
@@ -8,6 +10,29 @@ namespace FakeXrmEasy.Messages.Tests.FakeMessageExecutors.RetrieveCurrentOrganiz
 {
     public class RetrieveCurrentOrganizationRequestTests: FakeXrmEasyTestsBase
     {
+        private readonly OrganizationDetail _organizationDetail;
+
+        public RetrieveCurrentOrganizationRequestTests() : base()
+        {
+            _organizationDetail = new OrganizationDetail()
+            {
+                #if FAKE_XRM_EASY_9
+                Geo = "Geo",
+                EnvironmentId = Guid.NewGuid().ToString(),
+                TenantId = Guid.NewGuid().ToString(),
+                #endif
+                State = OrganizationState.Enabled,
+                FriendlyName = "OrgFriendlyName",
+                UniqueName = "UniqueName",
+                UrlName = "UrlName",
+                OrganizationId = Guid.NewGuid(),
+                OrganizationVersion = "0.0.0.0",
+                Endpoints =
+                {
+                    { EndpointType.OrganizationDataService, "http://localhost/XrmService/2011/OrganizationData.svc" }
+                }
+            };
+        }
         [Fact]
         public void Should_retrieve_current_organization_details_if_none_was_set_by_default()
         {
@@ -23,22 +48,7 @@ public void Should_retrieve_current_organization_details()
         {
             var currentOrgDetails = new CurrentOrganizationDetails()
             {
-                Details = new OrganizationDetail()
-                {
-                    Geo = "Geo",
-                    EnvironmentId = Guid.NewGuid().ToString(),
-                    State = OrganizationState.Enabled,
-                    FriendlyName = "OrgFriendlyName",
-                    UniqueName = "UniqueName",
-                    UrlName = "UrlName",
-                    OrganizationId = Guid.NewGuid(),
-                    TenantId = Guid.NewGuid().ToString(),
-                    OrganizationVersion = "0.0.0.0",
-                    Endpoints =
-                    {
-                        { EndpointType.OrganizationDataService, "http://localhost/XrmService/2011/OrganizationData.svc" }
-                    }
-                }
+                Details = _organizationDetail
             };
 
             _context.SetProperty(currentOrgDetails);
@@ -47,15 +57,19 @@ public void Should_retrieve_current_organization_details()
             Assert.NotNull(response);
 
             var orgDetail = (response as RetrieveCurrentOrganizationResponse).Detail;
+            #if FAKE_XRM_EASY_9
             Assert.Equal(currentOrgDetails.Details.EnvironmentId, orgDetail.EnvironmentId);
             Assert.Equal(currentOrgDetails.Details.Geo, orgDetail.Geo);
+            Assert.Equal(currentOrgDetails.Details.TenantId, orgDetail.TenantId);
+            #endif
             Assert.Equal(currentOrgDetails.Details.State, orgDetail.State);
             Assert.Equal(currentOrgDetails.Details.FriendlyName, orgDetail.FriendlyName);
             Assert.Equal(currentOrgDetails.Details.UniqueName, orgDetail.UniqueName);
             Assert.Equal(currentOrgDetails.Details.UrlName, orgDetail.UrlName);
             Assert.Equal(currentOrgDetails.Details.OrganizationId, orgDetail.OrganizationId);
-            Assert.Equal(currentOrgDetails.Details.TenantId, orgDetail.TenantId);
             Assert.Equal(currentOrgDetails.Details.OrganizationVersion, orgDetail.OrganizationVersion);
         }
     }
-}
+}
+
+#endif