Some restructuring of selenide tests

Evolveum · Aug 27, 2015 · 55416cb · 55416cb
1 parent 6a8e9e1
commit 55416cb
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 33 deletions.
diff --git a/testing/selenidetest/basic-tests-suite.xml b/testing/selenidetest/basic-tests-suite.xml
@@ -19,23 +19,23 @@
 <suite name="basic-tests-suite" parallel="false">
     <test name="Log in Tests" parallel="false" preserve-order="true" verbose="10">
         <classes>
-            <class name="com.evolveum.midpoint.testing.selenide.tests.LoginTest"/>
+            <class name="com.evolveum.midpoint.testing.selenide.tests.basictests.LoginTest"/>
         </classes>
     </test>
 
     <test name="Simple User Tests" parallel="false" preserve-order="true" verbose="10">
         <classes>
-            <class name="com.evolveum.midpoint.testing.selenide.tests.user.SimpleUserTests"/>
+            <class name="com.evolveum.midpoint.testing.selenide.tests.basictests.SimpleUserTests"/>
         </classes>
     </test>
     <test name="End User Tests" parallel="false" preserve-order="true" verbose="10">
         <classes>
-            <class name="com.evolveum.midpoint.testing.selenide.tests.user.EndUserTests"/>
+            <class name="com.evolveum.midpoint.testing.selenide.tests.basictests.EndUserTests"/>
         </classes>
     </test>
     <test name="Super User Tests" parallel="false" preserve-order="true" verbose="10">
         <classes>
-            <class name="com.evolveum.midpoint.testing.selenide.tests.user.SuperUserTests"/>
+            <class name="com.evolveum.midpoint.testing.selenide.tests.basictests.SuperUserTests"/>
         </classes>
     </test>
 
@@ -56,17 +56,17 @@
     <!--</test>-->
     <test name="Role Tests" parallel="false" preserve-order="true" verbose="10">
         <classes>
-            <class name="com.evolveum.midpoint.testing.selenide.tests.RoleTests"/>
+            <class name="com.evolveum.midpoint.testing.selenide.tests.basictests.RoleTests"/>
         </classes>
     </test>
     <test name="Organization Tests" parallel="false" preserve-order="true" verbose="10">
         <classes>
-            <class name="com.evolveum.midpoint.testing.selenide.tests.OrganizationTests"/>
+            <class name="com.evolveum.midpoint.testing.selenide.tests.basictests.OrganizationTests"/>
         </classes>
     </test>
     <test name="CSV Account Tests" parallel="false" preserve-order="true" verbose="10">
         <classes>
-            <class name="com.evolveum.midpoint.testing.selenide.tests.CsvAccountTests"/>
+            <class name="com.evolveum.midpoint.testing.selenide.tests.basictests.CsvAccountTests"/>
         </classes>
     </test>
 

diff --git a/testing/selenidetest/pom.xml b/testing/selenidetest/pom.xml
@@ -37,30 +37,40 @@
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>2.14.1</version>
                 <configuration>
                     <forkMode>pertest</forkMode>
                     <parallel>classes</parallel>
                     <perCoreThreadCount>false</perCoreThreadCount>
                     <threadCount>1</threadCount>
                     <runOrder>filesystem</runOrder>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>testng.xml</suiteXmlFile>
+                        <!--<suiteXmlFile>basic-tests-suite.xml</suiteXmlFile>-->
+                    </suiteXmlFiles>
                 </configuration>
             </plugin>
         </plugins>
     </build>
     <dependencies>
-        <!--<dependency>-->
-            <!--<groupId>com.evolveum.midpoint.infra</groupId>-->
-            <!--<artifactId>util</artifactId>-->
-            <!--<version>3.3-SNAPSHOT</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
+
+        <dependency>
+            <groupId>com.evolveum.midpoint.tools</groupId>
+            <artifactId>test-ng</artifactId>
+            <version>3.3-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.codeborne</groupId>
             <artifactId>selenide</artifactId>
             <version>2.21</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>4.2.0.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/...test/src/test/java/com/evolveum/midpoint/testing/selenide/tests/AbstractSelenideTest.java b/...test/src/test/java/com/evolveum/midpoint/testing/selenide/tests/AbstractSelenideTest.java
@@ -25,8 +25,9 @@
 /**
  * Created by Kate on 13.08.2015.
  */
-@ContextConfiguration(locations = {"classpath:spring-module.xml"})
-public class AbstractSelenideTest extends AbstractTestNGSpringContextTests {
+//@ContextConfiguration(locations = {"classpath:spring-module.xml"})
+public class AbstractSelenideTest{
+//        extends AbstractTestNGSpringContextTests {
     public static final String SITE_URL = "/midpoint";
     public static final String ADMIN_LOGIN = "administrator";
     public static final String ADMIN_PASSWORD = "5ecr3t";
@@ -86,12 +87,12 @@ public class AbstractSelenideTest extends AbstractTestNGSpringContextTests {
 
     Logger LOGGER = Logger.getLogger(AbstractSelenideTest.class);
 
-    protected AbstractSelenideTest() {
-        SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
-        // configure log4j properties file
-//        DOMConfigurator.configure("log4j.xml");
-//        PropertyConfigurator.configure("log4j.properties");
-    }
+//    protected AbstractSelenideTest() {
+//        SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
+//        // configure log4j properties file
+////        DOMConfigurator.configure("log4j.xml");
+////        PropertyConfigurator.configure("log4j.properties");
+//    }
 
     //Login util methods
     /**

diff --git a/...sting/selenide/tests/CsvAccountTests.java → ...ide/tests/basictests/CsvAccountTests.java b/...sting/selenide/tests/CsvAccountTests.java → ...ide/tests/basictests/CsvAccountTests.java
@@ -1,5 +1,6 @@
-package com.evolveum.midpoint.testing.selenide.tests;
+package com.evolveum.midpoint.testing.selenide.tests.basictests;
 
+import com.evolveum.midpoint.testing.selenide.tests.AbstractSelenideTest;
 import org.openqa.selenium.By;
 import org.testng.annotations.Test;
 import org.w3c.dom.*;

diff --git a/...ing/selenide/tests/user/EndUserTests.java → ...lenide/tests/basictests/EndUserTests.java b/...ing/selenide/tests/user/EndUserTests.java → ...lenide/tests/basictests/EndUserTests.java
@@ -1,4 +1,4 @@
-package com.evolveum.midpoint.testing.selenide.tests.user;
+package com.evolveum.midpoint.testing.selenide.tests.basictests;
 
 import com.evolveum.midpoint.testing.selenide.tests.AbstractSelenideTest;
 import org.openqa.selenium.By;

diff --git a/...int/testing/selenide/tests/LoginTest.java → .../selenide/tests/basictests/LoginTest.java b/...int/testing/selenide/tests/LoginTest.java → .../selenide/tests/basictests/LoginTest.java
@@ -1,5 +1,6 @@
- package com.evolveum.midpoint.testing.selenide.tests;
+ package com.evolveum.midpoint.testing.selenide.tests.basictests;
 
+import com.evolveum.midpoint.testing.selenide.tests.AbstractSelenideTest;
 import org.openqa.selenium.By;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -13,7 +14,7 @@
 /**
  * Created by Kate on 07.08.2015.
  */
-@Component
+//@Component
 public class LoginTest extends AbstractSelenideTest {
     /**
      * Log in to system as administrator/5ecr3t

diff --git a/...ing/selenide/tests/OrganizationTests.java → ...e/tests/basictests/OrganizationTests.java b/...ing/selenide/tests/OrganizationTests.java → ...e/tests/basictests/OrganizationTests.java
@@ -1,5 +1,6 @@
-package com.evolveum.midpoint.testing.selenide.tests;
+package com.evolveum.midpoint.testing.selenide.tests.basictests;
 
+import com.evolveum.midpoint.testing.selenide.tests.AbstractSelenideTest;
 import org.openqa.selenium.By;
 import org.testng.annotations.Test;
 

diff --git a/...int/testing/selenide/tests/RoleTests.java → .../selenide/tests/basictests/RoleTests.java b/...int/testing/selenide/tests/RoleTests.java → .../selenide/tests/basictests/RoleTests.java
@@ -1,8 +1,9 @@
-package com.evolveum.midpoint.testing.selenide.tests;
+package com.evolveum.midpoint.testing.selenide.tests.basictests;
 
 import static com.codeborne.selenide.Condition.*;
 
 import com.codeborne.selenide.SelenideElement;
+import com.evolveum.midpoint.testing.selenide.tests.AbstractSelenideTest;
 import org.openqa.selenium.By;
 import org.testng.annotations.Test;
 

diff --git a/.../selenide/tests/user/SimpleUserTests.java → ...ide/tests/basictests/SimpleUserTests.java b/.../selenide/tests/user/SimpleUserTests.java → ...ide/tests/basictests/SimpleUserTests.java
@@ -1,4 +1,4 @@
-package com.evolveum.midpoint.testing.selenide.tests.user;
+package com.evolveum.midpoint.testing.selenide.tests.basictests;
 
 import com.evolveum.midpoint.testing.selenide.tests.AbstractSelenideTest;
 import org.openqa.selenium.By;

diff --git a/...g/selenide/tests/user/SuperUserTests.java → ...nide/tests/basictests/SuperUserTests.java b/...g/selenide/tests/user/SuperUserTests.java → ...nide/tests/basictests/SuperUserTests.java
@@ -1,4 +1,4 @@
-package com.evolveum.midpoint.testing.selenide.tests.user;
+package com.evolveum.midpoint.testing.selenide.tests.basictests;
 
 import com.evolveum.midpoint.testing.selenide.tests.AbstractSelenideTest;
 import org.openqa.selenium.By;

diff --git a/testing/selenidetest/src/test/resources/spring-module.xml b/testing/selenidetest/src/test/resources/spring-module.xml
@@ -5,11 +5,11 @@
 	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
     <bean id="baseTest" class="com.evolveum.midpoint.testing.selenide.tests.AbstractSelenideTest" autowire-candidate="true">
     </bean>
-    <bean id="loginTest" class="com.evolveum.midpoint.testing.selenide.tests.LoginTest" autowire-candidate="true"/>
+    <bean id="loginTest" class="com.evolveum.midpoint.testing.selenide.tests.basictests.LoginTest" autowire-candidate="true"/>
     <bean id="createAccountTest" class="com.evolveum.midpoint.testing.selenide.tests.account.ResourceUserAccountTests"
           autowire-candidate="true"/>
-    <bean id="createUserTest" class="com.evolveum.midpoint.testing.selenide.tests.user.SuperUserTests"
+    <bean id="createUserTest" class="com.evolveum.midpoint.testing.selenide.tests.basictests.SuperUserTests"
           autowire-candidate="true"/>
-    <bean id="simpleUserTests" class="com.evolveum.midpoint.testing.selenide.tests.user.SimpleUserTests"
+    <bean id="simpleUserTests" class="com.evolveum.midpoint.testing.selenide.tests.basictests.SimpleUserTests"
           autowire-candidate="true"/>
 </beans>