test: add more test cases for CPF merge

intersystems · Jan 15, 2025 · 65bddb7 · 65bddb7
1 parent 2d3eac7
commit 65bddb7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/tests/integration_tests/Test/PM/Integration/CPFMerge.cls b/tests/integration_tests/Test/PM/Integration/CPFMerge.cls
@@ -23,8 +23,13 @@ Method TestCPFMerge()
     Do $$$AssertEquals(packageMap.Database, "USER")
 
     // Test role
-    // Somehow the role cannot be created. Something's wrong with create-roles.cpf
-    Do $$$AssertTrue(##class(Security.Roles).Exists("MyTestRole", .role))
+    Do $$$AssertTrue(##class(Security.Roles).Exists("MyTestRole"))
+
+    // Test Resource
+    Do $$$AssertTrue(##class(Security.Resources).Exists("MyTestResource"))
+
+    // Test Web Application
+    Do $$$AssertTrue(##class(Security.Applications).Exists("/csp/my-test-webapp"))
 }
 
 }
diff --git a/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/actions.cpf b/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/actions.cpf
@@ -0,0 +1,5 @@
+[Actions]   
+CreateRole:Name=MyTestRole
+CreateResource:Name=MyTestResource,PublicPermission=R
+CreateApplication:Name=/csp/my-test-webapp
+
diff --git a/...tegration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/create-roles.cpf b/...tegration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/create-roles.cpf
diff --git a/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/module.xml b/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/module.xml
@@ -6,7 +6,7 @@
       <Version>0.0.1</Version>
       <Packaging>module</Packaging>
       <CPF Name="config-globals.cpf"/>
-      <CPF Name="create-roles.cpf" Directory="custom-cpf-directory"/>
+      <CPF Name="actions.cpf" Directory="custom-cpf-directory"/>
       <CPF Name="package-mapping.cpf"/>
     </Module>
   </Document>