Add separate test for Spark and Spark2

Author: jeffersonezra

src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/ConfigurationTests.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System.Collections;
 using Microsoft.Azure.Commands.HDInsight.Models;
 using Microsoft.Azure.Management.HDInsight;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
@@ -46,37 +47,14 @@ public void CanCreateNewConfigForRServer()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanAddSparkCustomConfigs()
         {
-            AzureHDInsightConfig config = new AzureHDInsightConfig();
-
-            var addConfigValuesCmdlet = new AddAzureHDInsightConfigValuesCommand
-            {
-                CommandRuntime = commandRuntimeMock.Object,
-                HDInsightManagementClient = hdinsightManagementMock.Object,
-                Config = config,
-                SparkDefaults = new System.Collections.Hashtable() { { @"spark.executor.instances", "3" } },
-                SparkThriftConf = new System.Collections.Hashtable() { { @"spark.executor.cores", "4" } },
-                Spark2Defaults = new System.Collections.Hashtable() { { @"spark.executor.memory", "2048m" } },
-                Spark2ThriftConf = new System.Collections.Hashtable() { { @"spark.driver.memory.overhead", "1024" } },
-            };
-
-            addConfigValuesCmdlet.ExecuteCmdlet();
+            CustomizeSpark(1);
+        }
 
-            commandRuntimeMock.Verify(
-                f =>
-                    f.WriteObject(
-                        It.Is<AzureHDInsightConfig>(
-                            c =>
-                                c.Configurations != null &&
-                                c.Configurations.ContainsKey(ConfigurationKey.SparkDefaults) &&
-                                c.Configurations[ConfigurationKey.SparkDefaults]["spark.executor.instances"].Equals("3") &&
-                                c.Configurations.ContainsKey(ConfigurationKey.SparkThriftConf) &&
-                                c.Configurations[ConfigurationKey.SparkThriftConf]["spark.executor.cores"].Equals("4") &&
-                                c.Configurations.ContainsKey(ConfigurationKey.Spark2Defaults) &&
-                                c.Configurations[ConfigurationKey.Spark2Defaults]["spark.executor.memory"].Equals("2048m") &&
-                                c.Configurations.ContainsKey(ConfigurationKey.Spark2ThriftConf) &&
-                                c.Configurations[ConfigurationKey.Spark2ThriftConf]["spark.driver.memory.overhead"].Equals("1024") &&
-                                c.ScriptActions.Count == 0)),
-                Times.Once);
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void CanAddSpark2CustomConfigs()
+        {
+            CustomizeSpark(2);
         }
 
         public void CreateNewConfig(bool setEdgeNodeVmSize = false)
@@ -110,5 +88,49 @@ public void CreateNewConfig(bool setEdgeNodeVmSize = false)
                                 c.ScriptActions.Count == 0)),
                 Times.Once);
         }
+
+        private void CustomizeSpark(int sparkVersion)
+        {
+            AzureHDInsightConfig config = new AzureHDInsightConfig();
+
+            Hashtable sparkDefaults = new Hashtable() { { @"spark.executor.instances", "3" } };
+            Hashtable sparkThriftConf = new Hashtable() { { @"spark.executor.cores", "4" } };
+
+            AddAzureHDInsightConfigValuesCommand addConfigValuesCmdlet = new AddAzureHDInsightConfigValuesCommand
+            {
+                CommandRuntime = commandRuntimeMock.Object,
+                HDInsightManagementClient = hdinsightManagementMock.Object,
+                Config = config,
+            };
+
+            if (sparkVersion == 1)
+            {
+                addConfigValuesCmdlet.SparkDefaults = sparkDefaults;
+                addConfigValuesCmdlet.SparkThriftConf = sparkThriftConf;
+            }
+            else
+            {
+                addConfigValuesCmdlet.Spark2Defaults = sparkDefaults;
+                addConfigValuesCmdlet.Spark2ThriftConf = sparkThriftConf;
+            }
+
+            addConfigValuesCmdlet.ExecuteCmdlet();
+
+            commandRuntimeMock.Verify(
+                f =>
+                    f.WriteObject(
+                        It.Is<AzureHDInsightConfig>(
+                            c =>
+                                c.Configurations != null &&
+                                ((sparkVersion == 1 && c.Configurations.ContainsKey(ConfigurationKey.SparkDefaults) &&
+                                c.Configurations[ConfigurationKey.SparkDefaults]["spark.executor.instances"].Equals(sparkDefaults["spark.executor.instances"]) &&
+                                c.Configurations.ContainsKey(ConfigurationKey.SparkThriftConf) &&
+                                c.Configurations[ConfigurationKey.SparkThriftConf]["spark.executor.cores"].Equals(sparkThriftConf["spark.executor.cores"])) ||
+                                (sparkVersion == 2 &&  c.Configurations.ContainsKey(ConfigurationKey.Spark2Defaults) &&
+                                c.Configurations[ConfigurationKey.Spark2Defaults]["spark.executor.instances"].Equals(sparkDefaults["spark.executor.instances"]) &&
+                                c.Configurations.ContainsKey(ConfigurationKey.Spark2ThriftConf) &&
+                                c.Configurations[ConfigurationKey.Spark2ThriftConf]["spark.executor.cores"].Equals(sparkThriftConf["spark.executor.cores"]))))),
+                Times.Once);
+        }
     }
 }