model-intest: separate sqale suite removed, there can be only one

This was the goal anyway, sqale suite was only temporary during sqale test fixing. Also security tests are moved back to integration.
Evolveum · Mar 21, 2022 · 6e76837 · 6e76837
1 parent 3e80b83
commit 6e76837
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 225 deletions.
diff --git a/model/model-intest/pom.xml b/model/model-intest/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright (C) 2010-2021 Evolveum and contributors
+  ~ Copyright (C) 2010-2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -431,29 +431,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>sqale</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <suiteXmlFiles>
-                                <suiteXmlFile>testng-integration-sqale.xml</suiteXmlFile>
-                            </suiteXmlFiles>
-                        </configuration>
-                    </plugin>
-                    <!-- TODO: Later we want to run unit tests too, but not yet -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${surefire.version}</version>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/model/model-intest/testng-integration-full.xml b/model/model-intest/testng-integration-full.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2010-2020 Evolveum and contributors
+  ~ Copyright (C) 2010-2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -10,6 +10,15 @@
     <listeners>
         <listener class-name="com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor"/>
     </listeners>
+    <test name="Security" preserve-order="true" parallel="false" verbose="10">
+        <classes>
+            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityPrincipal"/>
+            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityBasic"/>
+            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityMedium"/>
+            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityAdvanced"/>
+            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityMultitenant"/>
+        </classes>
+    </test>
     <test name="Model Integration" preserve-order="true" parallel="false" verbose="10">
         <classes>
             <class name="com.evolveum.midpoint.model.intest.TestModelServiceContract"/>
@@ -44,6 +53,7 @@
             <class name="com.evolveum.midpoint.model.intest.TestEntitlements"/>
             <class name="com.evolveum.midpoint.model.intest.TestCaseIgnore"/>
             <class name="com.evolveum.midpoint.model.intest.TestIntent"/>
+            <class name="com.evolveum.midpoint.model.intest.gensync.TestAssociationInbound"/>
             <class name="com.evolveum.midpoint.model.intest.gensync.TestEditSchema"/>
             <class name="com.evolveum.midpoint.model.intest.gensync.TestRoleEntitlement"/>
             <class name="com.evolveum.midpoint.model.intest.TestConsistencySimple"/>
@@ -169,14 +179,4 @@
             <class name="com.evolveum.midpoint.model.intest.manual.TestDummyItsmIntegration"/>
         </classes>
     </test>
-    <!-- temporarily moved to testng-unit -->
-    <!--<test name="Security" preserve-order="true" parallel="false" verbose="10">-->
-        <!--<classes>-->
-            <!--<class name="com.evolveum.midpoint.model.intest.security.TestSecurityPrincipal"/>-->
-            <!--<class name="com.evolveum.midpoint.model.intest.security.TestSecurityBasic"/>-->
-            <!-- <class name="com.evolveum.midpoint.model.intest.security.TestSecurityMedium"/>-->
-            <!--<class name="com.evolveum.midpoint.model.intest.security.TestSecurityAdvanced"/>-->
-            <!--<class name="com.evolveum.midpoint.model.intest.security.TestSecurityMultitenant"/>-->
-        <!--</classes>-->
-    <!--</test>-->
 </suite>
diff --git a/model/model-intest/testng-integration-sqale.xml b/model/model-intest/testng-integration-sqale.xml
diff --git a/model/model-intest/testng-unit.xml b/model/model-intest/testng-unit.xml
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2015-2020 Evolveum and contributors
+  ~ Copyright (C) 2015-2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="unit" parallel="false" verbose="1">
-    <!-- temporarily moved here -->
-    <test name="Security" preserve-order="true" parallel="false" verbose="10">
-        <classes>
-            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityPrincipal"/>
-            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityBasic"/>
-            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityMedium"/>
-            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityAdvanced"/>
-            <class name="com.evolveum.midpoint.model.intest.security.TestSecurityMultitenant"/>
-        </classes>
-    </test>
+    <!-- use only integration suite for this module -->
 </suite>