From 7833bb9f914314c3d0c17def227df8a17aab02a3 Mon Sep 17 00:00:00 2001
From: matus <matus.macik@gmail.com>
Date: Fri, 20 Jul 2018 16:26:24 +0200
Subject: [PATCH] Modification: changes in pom, auto start, test, auto stop
 configured

---
 build-system/pom.xml                          |  1 +
 gui/admin-gui/pom.xml                         |  8 +-
 testing/schrodingertest/pom.xml               | 90 ++++++++++++-------
 ...rPhotoTestsIT.java => UserPhotoTests.java} |  2 +-
 .../testng-integration-schrodinger.xml        | 25 ++++++
 .../schrodingertest/testng-integration.xml    |  6 --
 6 files changed, 91 insertions(+), 41 deletions(-)
 rename testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/{UserPhotoTestsIT.java => UserPhotoTests.java} (98%)
 create mode 100644 testing/schrodingertest/testng-integration-schrodinger.xml

diff --git a/build-system/pom.xml b/build-system/pom.xml
index 0367ec837d0..90d9bb6976b 100644
--- a/build-system/pom.xml
+++ b/build-system/pom.xml
@@ -94,6 +94,7 @@
         <reflections.version>0.9.11</reflections.version>
         <guava.version>20.0</guava.version>
         <jcommander.version>1.72</jcommander.version>
+		<failsafe.version>2.22.0</failsafe.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index 2544799eb6e..1d24dfd8263 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -102,16 +102,16 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring.boot.version}</version>
                 <configuration>
-                    <wait>1000</wait> <!-- POSSIBLY OBSOLETE ! : Added because spring-boot:start goal -->
-                    <maxAttempts>150</maxAttempts><!-- POSSIBLY OBSOLETE ! : Added because spring-boot:start goal -->
+                    <wait>1000</wait> <!-- TODO POSSIBLY OBSOLETE ! : Added because spring-boot:start goal -->
+                    <maxAttempts>150</maxAttempts><!-- TODO  POSSIBLY OBSOLETE ! : Added because spring-boot:start goal -->
                     <fork>true</fork>
                     <excludeDevtools>true</excludeDevtools>
                     <skip>false</skip>
-                    <!-- POSSIBLY OBSOLETE ! -->
+                    <!-- TODO POSSIBLY OBSOLETE ! -->
                     <!--<noverify>true</noverify>-->
                     <!--<jvmArguments>"-Dcom.sun.management.jmxremote.port=20002","-Djava.rmi.server.hostname=0.0.0.0"</jvmArguments>-->
                     <!--<jmxPort>20002</jmxPort>-->
-
+                    <jvmArguments>"-Dmidpoint.schrodinger=true"</jvmArguments><!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
                 </configuration>
                 <executions>
                     <execution>
diff --git a/testing/schrodingertest/pom.xml b/testing/schrodingertest/pom.xml
index a306db37656..36307898b34 100644
--- a/testing/schrodingertest/pom.xml
+++ b/testing/schrodingertest/pom.xml
@@ -17,6 +17,7 @@
         <project.build.directory>C:\Users\matus\Documents\mp3.7\midpoint\gui\admin-gui\target</project.build.directory>
         <!--<project.starter.module>/c/Users/matus/Documents/mp3.7/midpoint/gui/admin-gui</project.starter.module>-->
         <project.starter.module>../../gui/admin-gui</project.starter.module>
+        <project.app.package.name>com.evolveum.midpoint.web.boot.MidPointSpringApplication</project.app.package.name>
     </properties>
 
     <dependencies>
@@ -211,19 +212,24 @@
     <build>
         <plugins>
 
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-failsafe-plugin</artifactId>-->
-                <!--<version>2.19.1</version>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<goals>-->
-                            <!--<goal>integration-test</goal>-->
-                            <!--<goal>verify</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${failsafe.version}</version>
+                <configuration>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>testng-integration-schrodinger.xml</suiteXmlFile>
+                    </suiteXmlFiles>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
             <!--<plugin>-->
                 <!--<artifactId>maven-dependency-plugin</artifactId>-->
@@ -311,39 +317,63 @@
 
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.6</version>
+                <version>${antrun.version}</version>
                 <executions>
                     <execution>
                         <phase>pre-integration-test</phase>
                         <configuration>
-                            <target>
-                                <exec dir="." executable="cmd"
-                                      spawn="true">
+                            <target name="####### Midpoint ${project.version} booting up for integration testing">
+                                <exec dir="." executable="cmd" osfamily="windows"  spawn="true">
                                     <arg value="/c"/>
                                     <arg value="mvn"/>
                                     <arg value="-f"/>
                                     <arg value="${project.starter.module}/pom.xml"/>
                                     <arg value="spring-boot:run"/>
                                 </exec>
-                                <sleep seconds="200" /><!-- Needed so MP boots up, but the whole thing is quite hackish  -->
+                                <exec dir="." executable="bash" osfamily="unix" spawn="true">
+                                    <arg value="mvn"/>
+                                    <arg value="-f"/>
+                                    <arg value="${project.starter.module}/pom.xml"/>
+                                    <arg value="spring-boot:run"/>
+                                </exec>
+                                <sleep seconds="230" /><!--TODO CHANGE! (This should be rather the concern of the tests) : Needed so MP boots up, but the whole thing is quite hackish and depends on the environment (and almost the weather)-->
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>Shut-down-process</id>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <target name="####### Shuting down Midpoint ${project.version} after integration testing completed">
+                                <exec executable="jps"> <!-- TODO ok?: JDK needed to be referenced on the PATH-->
+                                    <arg value="-l" />
+                                    <redirector outputproperty="process.pid">
+                                        <outputfilterchain>
+                                            <linecontains>
+                                                <contains value="${project.app.package.name}" />
+                                            </linecontains>
+                                            <replacestring from=" ${project.app.package.name}" />
+                                        </outputfilterchain>
+                                    </redirector>
+                                </exec>
+                                <exec executable="taskkill" osfamily="windows">
+                                    <arg value="/PID" />
+                                    <arg value="${process.pid}" />
+                                    <arg value="/F" />  <!-- TODO ok?: Had to force this-->
+                                </exec>
+                                <exec executable="kill" osfamily="unix">
+                                    <arg value="-15" />
+                                    <arg value="${process.pid}" />
+                                </exec>
                             </target>
                         </configuration>
                         <goals>
                             <goal>run</goal>
                         </goals>
                     </execution>
-                    <!--<execution>-->
-                        <!--<id>sleep-for-a-while</id>-->
-                        <!--<phase>integration-test</phase>-->
-                        <!--<configuration>-->
-                            <!--<target>-->
-                                <!--<sleep seconds="300" />-->
-                            <!--</target>-->
-                        <!--</configuration>-->
-                        <!--<goals>-->
-                            <!--<goal>run</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
                 </executions>
             </plugin>
 
diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserPhotoTestsIT.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserPhotoTests.java
similarity index 98%
rename from testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserPhotoTestsIT.java
rename to testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserPhotoTests.java
index 9772d0c9e36..3676afdc160 100644
--- a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserPhotoTestsIT.java
+++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserPhotoTests.java
@@ -12,7 +12,7 @@
 /**
  * Created by matus on 5/11/2018.
  */
-public class UserPhotoTestsIT extends TestBase {
+public class UserPhotoTests extends TestBase {
 
     private static final String TEST_USER_LEO_NAME= "leonardo";
     private static final File PHOTO_SOURCE_FILE_LARGE = new File("./src/test/resources/images/leonardo_large_nc.jpg");
diff --git a/testing/schrodingertest/testng-integration-schrodinger.xml b/testing/schrodingertest/testng-integration-schrodinger.xml
new file mode 100644
index 00000000000..554962c1598
--- /dev/null
+++ b/testing/schrodingertest/testng-integration-schrodinger.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2015 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="integration" parallel="false" verbose="1">
+    <test name="Schrodinger" preserve-order="true" parallel="false" verbose="10" enabled="true">
+                <classes>
+        <class name="com.evolveum.midpoint.testing.schrodinger.TestSuiteConfig"/>
+                    <class name="com.evolveum.midpoint.testing.schrodinger.scenarios.UserPhotoTests"/>
+                </classes>
+            </test>
+</suite>
diff --git a/testing/schrodingertest/testng-integration.xml b/testing/schrodingertest/testng-integration.xml
index 1879f7fbf46..ad76cb3698a 100644
--- a/testing/schrodingertest/testng-integration.xml
+++ b/testing/schrodingertest/testng-integration.xml
@@ -16,10 +16,4 @@
   -->
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="integration" parallel="false" verbose="1">
-    <test name="Schrodinger" preserve-order="true" parallel="false" verbose="10" enabled="true">
-                <classes>
-        <class name="com.evolveum.midpoint.testing.schrodinger.TestSuiteConfig"/>
-                    <class name="com.evolveum.midpoint.testing.schrodinger.scenarios.UserPhotoTestsIT"/>
-                </classes>
-            </test>
 </suite>