Simplified modules for CD demo

wakaleo · Sep 27, 2012 · c0a67fc · c0a67fc
1 parent e153c0e
commit c0a67fc
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 76 deletions.
diff --git a/gameoflife-acceptance-tests/pom.xml b/gameoflife-acceptance-tests/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>gameoflife</artifactId>

diff --git a/gameoflife-cli/pom.xml b/gameoflife-cli/pom.xml
diff --git a/...e-core/src/test/java/com/wakaleo/gameoflife/integration/WhenYouStoreGamesInADatabase.java b/...e-core/src/test/java/com/wakaleo/gameoflife/integration/WhenYouStoreGamesInADatabase.java
@@ -0,0 +1,16 @@
+package com.wakaleo.gameoflife.integration;
+
+import org.junit.Test;
+
+public class WhenYouStoreGamesInADatabase {
+
+    @Test
+    public void should_store_games() {
+
+    }
+
+    @Test
+    public void should_load_saved_games() {
+    }
+
+}
diff --git a/gameoflife-web/pom.xml b/gameoflife-web/pom.xml
@@ -25,10 +25,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>

diff --git a/gameoflife-webservice/pom.xml b/gameoflife-webservice/pom.xml
diff --git a/gameoflife-webservice/src/main/java/META-INF/MANIFEST.MF b/gameoflife-webservice/src/main/java/META-INF/MANIFEST.MF
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
         <!-- A workaround for a bug in PMD -->
         <targetJdk>1.6</targetJdk>
         <github.account>wakaleo</github.account>
-        <thucydides.version>0.9.20</thucydides.version>
+        <thucydides.version>0.9.22</thucydides.version>
     </properties>
 
     <scm>
@@ -38,14 +38,62 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.10</version>
                 <configuration>
-                    <parallel>classes</parallel>
-                    <argLine>-Xmx512m</argLine>
-                    <threadCount>4</threadCount>
-                    <includes>
-                        <include>**/When*.java</include>
-                        <include>**/*Test.java</include>
-                    </includes>
+                    <skip>true</skip>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>unit-tests</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <includes>
+                                <include>**/When*.java</include>
+                                <include>**/*Test.java</include>
+                            </includes>
+                            <excludes>
+                                <exclude>%regex[.*integration.*]</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>integration-tests</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <includes>
+                                <include>%regex[.*integration.*]</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- CODE COVERAGE -->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.5.10.201208310627</version>
+                <executions>
+                    <execution>
+                        <id>jacoco-initialize</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>
@@ -147,8 +195,6 @@
         <module>gameoflife-build</module>
         <module>gameoflife-core</module>
         <module>gameoflife-web</module>
-        <module>gameoflife-webservice</module>
-        <module>gameoflife-cli</module>
     </modules>
     <distributionManagement>
         <repository>