145 fix custom partial generation

kontent-ai · Apr 20, 2022 · b9532af · b9532af
1 parent 9614593
commit b9532af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/src/Kentico.Kontent.ModelGenerator.Core/Common/ClassCodeGeneratorFactory.cs b/src/Kentico.Kontent.ModelGenerator.Core/Common/ClassCodeGeneratorFactory.cs
@@ -23,13 +23,13 @@ public static ClassCodeGenerator CreateClassCodeGenerator(CodeGeneratorOptions o
                 throw new ArgumentNullException(nameof(classFilename));
             }
 
-            if (options.ManagementApi)
+            if (customPartial)
             {
-                return new ManagementClassCodeGenerator(classDefinition, classFilename, options.Namespace);
+                return new PartialClassCodeGenerator(classDefinition, classFilename, options.Namespace);
             }
 
-            return customPartial
-                ? new PartialClassCodeGenerator(classDefinition, classFilename, options.Namespace)
+            return options.ManagementApi
+                ? new ManagementClassCodeGenerator(classDefinition, classFilename, options.Namespace)
                 : new DeliveryClassCodeGenerator(classDefinition, classFilename, options.Namespace);
         }
     }

diff --git a/test/Kentico.Kontent.ModelGenerator.Tests/Common/ClassCodeGeneratorFactoryTests.cs b/test/Kentico.Kontent.ModelGenerator.Tests/Common/ClassCodeGeneratorFactoryTests.cs
@@ -59,14 +59,16 @@ public void CreateClassCodeGenerator_DeliveryClassCodeGenerator_NoCustomPartialP
             AssertClassCodeGenerator<DeliveryClassCodeGenerator>(result, classDefinitionCodename, classFileName, ClassCodeGenerator.DefaultNamespace);
         }
 
-        [Fact]
-        public void CreateClassCodeGenerator_PartialClassCodeGenerator_Returns()
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void CreateClassCodeGenerator_PartialClassCodeGenerator_Returns(bool managementApi)
         {
             var classDefinitionCodename = "codename";
             var classFileName = "classFileName";
             var codeGeneratorOptions = new CodeGeneratorOptions
             {
-                ManagementApi = false
+                ManagementApi = managementApi
             };
 
             var result = ClassCodeGeneratorFactory.CreateClassCodeGenerator(codeGeneratorOptions, new ClassDefinition(classDefinitionCodename), classFileName, true);
@@ -108,23 +110,6 @@ public void CreateClassCodeGenerator_DeliveryClassCodeGenerator_CustomNamespace_
             AssertClassCodeGenerator<DeliveryClassCodeGenerator>(result, classDefinitionCodename, classFileName, customNamespace);
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public void CreateClassCodeGenerator_ManagementClassCodeGenerator_WithCustomPartialProperty_Returns(bool customPartial)
-        {
-            var classDefinitionCodename = "codename";
-            var classFileName = "classFileName";
-            var codeGeneratorOptions = new CodeGeneratorOptions
-            {
-                ManagementApi = true
-            };
-
-            var result = ClassCodeGeneratorFactory.CreateClassCodeGenerator(codeGeneratorOptions, new ClassDefinition(classDefinitionCodename), classFileName, customPartial);
-
-            AssertClassCodeGenerator<ManagementClassCodeGenerator>(result, classDefinitionCodename, classFileName, ClassCodeGenerator.DefaultNamespace);
-        }
-
         [Fact]
         public void CreateClassCodeGenerator_ManagementClassCodeGenerator_NoCustomPartialProperty_Returns()
         {