Added tests and updated Flag

Author: daryllabar

spkl/SparkleXrm.Tasks.Tests/EarlyBoundTypes.cs

@@ -13,6 +13,82 @@ namespace SparkleXrm.Tasks.Tests
     [TestClass]
     public class EarlyBoundTypes
     {
+        [TestMethod]
+        [TestCategory("Integration Tests")]
+        public void TestEbgGenerateGlobalOptionsets()
+        {
+            // Arrange
+            Guid id = Guid.NewGuid();
+            var tempFolder = Path.Combine(Path.GetTempPath(), id.ToString());
+            Directory.CreateDirectory(tempFolder);
+            try
+            {
+                var config = new ConfigFile
+                {
+                    earlyboundtypes = new List<EarlyBoundTypeConfig>{
+                                new EarlyBoundTypeConfig{
+                                    useEarlyBoundGeneratorApi = true,
+                                  generateOptionsetEnums = true,
+                                  entities ="socialprofile,socialactivity"
+                                    }
+                                },
+                    filePath = tempFolder
+
+                };
+                Generate(tempFolder, config);
+
+                // Check that there was only a single instance of the global optionsset 'socialprofile_community'
+                // public enum socialprofile_community
+
+                var matches = CountMatches("public enum SocialProfile_Community", tempFolder);
+                Assert.AreEqual(1, matches, "Global optionset created once only");
+            }
+            finally
+            {
+                Directory.Delete(tempFolder, true);
+            }
+        }
+
+        [TestMethod]
+        [TestCategory("Integration Tests")]
+        public void TestEbgGenerateGlobalOptionsets_OneTypePerFile()
+        {
+            // Arrange
+            Guid id = Guid.NewGuid();
+            var tempFolder = Path.Combine(Path.GetTempPath(), id.ToString());
+            Directory.CreateDirectory(tempFolder);
+            try
+            {
+                var config = new ConfigFile
+                {
+                    earlyboundtypes = new List<EarlyBoundTypeConfig>{
+                        new EarlyBoundTypeConfig{
+                            generateOptionsetEnums = true,
+                            useEarlyBoundGeneratorApi = true,
+                            entities ="socialprofile,socialactivity",
+                            oneTypePerFile = true
+                        }
+                    },
+                    filePath = tempFolder
+
+                };
+                Generate(tempFolder, config);
+
+
+                Assert.IsFalse(File.Exists(Path.Combine(tempFolder, "entities.cs")));
+
+                EnsureClassIsCreatedCorrectly(Path.Combine($"{tempFolder}\\Entities", "SocialProfile.cs"), "SocialProfile");
+                EnsureClassIsCreatedCorrectly(Path.Combine($"{tempFolder}\\Entities", "SocialActivity.cs"), "SocialActivity");
+
+                EnsureOptionSetsIsCreatedCorrectly(Path.Combine($"{tempFolder}\\OptionSets", "socialprofile_community.cs"), "SocialProfile_Community");
+                EnsureOptionSetsIsCreatedCorrectly(Path.Combine($"{tempFolder}\\OptionSets", "socialactivity_prioritycode.cs"), "SocialActivity_PriorityCode");
+            }
+            finally
+            {
+                Directory.Delete(tempFolder, true);
+            }
+        }
+
         [TestMethod]
         [TestCategory("Integration Tests")]
         public void TestGenerateGlobalOptionsets()

spkl/SparkleXrm.Tasks.Tests/app.config

@@ -3,7 +3,7 @@
   <connectionStrings>
     <add name="integration_testing" connectionString="Url=http://dev04/Contoso" />
   </connectionStrings>
-    
+  
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 
@@ -73,7 +73,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.19.8.0" newVersion="3.19.8.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

spkl/SparkleXrm.Tasks/Config/EarlyBoundTypeConfig.cs

@@ -2,7 +2,7 @@
 {
     public class EarlyBoundTypeConfig : DLaB.EarlyBoundGenerator.Settings.POCO.ExtensionConfig
     {
-        public bool useEarlyBoundGenerator;
+        public bool useEarlyBoundGeneratorApi;
 
         public string profile;
         public string entities;
@@ -24,7 +24,6 @@ public class EarlyBoundTypeConfig : DLaB.EarlyBoundGenerator.Settings.POCO.Exten
 
         #region Early Bound Generator Specific
 
-        
         public bool? generateActions;
         public string actionFilename;
         public string optionSetFilename;

spkl/SparkleXrm.Tasks/Tasks/EarlyBoundClassGeneratorTask.cs

@@ -47,7 +47,7 @@ public void CreateEarlyBoundTypes(OrganizationServiceContext ctx, ConfigFile con
             var earlyBoundTypeConfigs = config.GetEarlyBoundConfig(Profile);
             foreach (var earlyboundConfig in earlyBoundTypeConfigs)
             {
-                if (earlyboundConfig.useEarlyBoundGenerator)
+                if (earlyboundConfig.useEarlyBoundGeneratorApi)
                 {
                     ProcessEbgGeneration(config, earlyboundConfig, crmSvcUtilPath);
                 }