Adjust conditional params tests

JanKrivanek · Dec 22, 2022 · 4d82bae · 4d82bae
1 parent 1f6ea11
commit 4d82bae
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 38 deletions.
diff --git a/...otnet-new/test_templates/TemplateWithConditionalParameters/.template.config/template.json b/...otnet-new/test_templates/TemplateWithConditionalParameters/.template.config/template.json
@@ -12,14 +12,14 @@
       "type": "parameter",
       "datatype": "string",
       "description": "parameter A description",
-      "isEnabled": "A_enabled == true",
+      "isEnabled": "A_enabled",
       "isRequired": true,
       "replaces": "placeholderA"
     },
     "paramB": {
       "type": "parameter",
       "datatype": "string",
-      "isEnabled": "B_enabled == true",
+      "isEnabled": "B_enabled",
       "description": "parameter B description",
       "replaces": "placeholderB"
     },

diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/Test.cs b/src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/Test.cs
@@ -2,10 +2,10 @@
 // value of paramA: placeholderA
 // value of paramB: placeholderB
 
-//#if( A_enabled )
+//#if( paramA )
 // A is enabled
 //#endif
 
-//#if( B_enabled )
+//#if( paramB )
 // B is enabled
 //#endif
diff --git a/...hDisabledParams_parameters=A.verified.txt → ...lyEnabledParams_parameters=A.verified.txt b/...hDisabledParams_parameters=A.verified.txt → ...lyEnabledParams_parameters=A.verified.txt
diff --git a/...ateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB.verified.txt b/...ateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB.verified.txt
@@ -1,7 +1,5 @@
 
-// value of paramA: valA
-// value of paramB: valB
+// value of paramA: placeholderA
+// value of paramB: placeholderB
 
-// A is enabled
 
-// B is enabled
diff --git a/...anInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_ABenabled.verified.txt b/...anInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_ABenabled.verified.txt
@@ -0,0 +1,7 @@
+
+// value of paramA: true
+// value of paramB: true
+
+// A is enabled
+
+// B is enabled
diff --git a/...CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_Aenabled.verified.txt b/...CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_Aenabled.verified.txt
@@ -0,0 +1,6 @@
+
+// value of paramA: true
+// value of paramB: placeholderB
+
+// A is enabled
+
diff --git a/....CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=A_Aenabled.verified.txt b/....CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=A_Aenabled.verified.txt
@@ -0,0 +1,6 @@
+
+// value of paramA: true
+// value of paramB: placeholderB
+
+// A is enabled
+
diff --git a/...wInstantiateTests.CannotInstantiateTemplate_WithDisabledParams_parameters=AB.verified.txt b/...wInstantiateTests.CannotInstantiateTemplate_WithDisabledParams_parameters=AB.verified.txt
diff --git a/src/Tests/dotnet-new.Tests/DotnetNewInstantiateTests.Approval.cs b/src/Tests/dotnet-new.Tests/DotnetNewInstantiateTests.Approval.cs
@@ -685,8 +685,11 @@ public Task CanInstantiateTemplate_WithRequiredParams(string parameters, string
         }
 
         [Theory]
-        //[InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--A_enabled", "A")]
-        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB|--A_enabled|--B_enabled", "AB")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true|--A_enabled", "A_Aenabled")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true", "A")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true|--paramB|true", "AB")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true|--paramB|true|--A_enabled", "AB_Aenabled")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true|--paramB|true|--A_enabled|--B_enabled", "AB_ABenabled")]
         public Task CanInstantiateTemplate_WithConditionallyEnabledParams(string parameters, string setName)
         {
             string workingDirectory = CreateTemporaryFolder();
@@ -730,28 +733,5 @@ public Task CannotInstantiateTemplate_WithoutRequiredParams(string parameters, s
             return Verify(commandResult.FormatOutputStreams())
                 .UseParameters(setName);
         }
-
-        [Theory]
-        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA", "A")]
-        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB", "AB")]
-        //[InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB|--A_enabled", "AB")]
-        public Task CannotInstantiateTemplate_WithDisabledParams(string parameters, string setName)
-        {
-            string workingDirectory = CreateTemporaryFolder();
-            string homeDirectory = CreateTemporaryFolder();
-            InstallTestTemplate("TemplateWithConditionalParameters", _log, homeDirectory, workingDirectory);
-
-            CommandResult commandResult = new DotnetNewCommand(_log, parameters.Split("|"))
-                .WithCustomHive(homeDirectory)
-                .WithWorkingDirectory(workingDirectory)
-                .Execute();
-
-            commandResult
-                 .Should()
-                 .Pass();
-
-            return Verify(File.ReadAllText(Path.Combine(workingDirectory, "Test.cs")))
-                .UseParameters(setName);
-        }
     }
 }