Issue #16: First draft, exclusion not working yet.

ottlinger · Feb 12, 2016 · f55b806 · f55b806
1 parent b9adf42
commit f55b806
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -239,9 +239,31 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire.version}</version>
+          <configuration>
+            <excludes>
+              <exclude>**/**UITest.java</exclude>
+            </excludes>
+            <enableAssertions>true</enableAssertions>
+            <forkCount>1</forkCount>
+            <reuseForks>true</reuseForks>
+            <!--systemProperties>
+                                    <property>
+                                        <name>java.awt.headless</name>
+                                        <value>true</value>
+                                    </property>
+                                </systemProperties-->
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+      </plugin>
       <!-- Build an executable JAR -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -275,25 +297,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- add test configuration to prevent tests from failing if no AWT can be opened -->
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <excludes>
-            <exclude>**UITest.java</exclude>
-          </excludes>
-          <enableAssertions>true</enableAssertions>
-          <forkCount>1</forkCount>
-          <reuseForks>true</reuseForks>
-          <!--systemProperties>
-                                  <property>
-                                      <name>java.awt.headless</name>
-                                      <value>true</value>
-                                  </property>
-                              </systemProperties-->
-        </configuration>
-      </plugin>
       <!-- copy Version.java out of normal resource copying to avoid eclipse errors -->
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
@@ -582,28 +585,31 @@
     <profile>
       <id>uitest</id>
       <build>
-        <plugins>
+        <pluginManagement>
+          <plugins>
             <plugin>
               <artifactId>maven-surefire-plugin</artifactId>
               <version>${surefire.version}</version>
               <configuration>
                 <includes>
-                  <include>**UITest.java</include>
+                  <include>
+                      **/*UITest.java
+                    </include>
                 </includes>
                 <enableAssertions>true</enableAssertions>
                 <forkCount>1</forkCount>
                 <reuseForks>true</reuseForks>
                 <!--systemProperties>
-                                        <property>
-                                            <name>java.awt.headless</name>
-                                            <value>true</value>
-                                        </property>
-                                    </systemProperties-->
+                                          <property>
+                                              <name>java.awt.headless</name>
+                                              <value>true</value>
+                                          </property>
+                                      </systemProperties-->
               </configuration>
             </plugin>
-        </plugins>
+          </plugins>
+        </pluginManagement>
       </build>
-
     </profile>
     <!-- Run mvn clean install -Plive-demo for a live demo of this tool -->
     <profile>

diff --git a/...pamprotector/AntiSpamApplicationTest.java → ...mprotector/AntiSpamApplicationUITest.java b/...pamprotector/AntiSpamApplicationTest.java → ...mprotector/AntiSpamApplicationUITest.java
@@ -24,8 +24,7 @@
  * @author hirsch
  * @version 2011-12-28, 13:26
  */
-@org.junit.Ignore("Not working on Travis, because VNC/X is not allowed on docker agents.")
-public class AntiSpamApplicationTest {
+public class AntiSpamApplicationUITest {
     @Test
     public final void instantiationDone() {
         AntiSpamApplication.main(null);