From 2d38b5d9909d0a9d7144171ae67e031da4861f20 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sat, 10 Mar 2012 17:35:35 -0300
Subject: [PATCH] Configure Integration Tests.

---
 wise-webapp/pom.xml                           | 35 ++++++++++++++++---
 .../webapp/WEB-INF/classes/log4j.properties   |  2 +-
 .../wisemapping/test/export/ExportTest.java   |  1 -
 .../test/rest/RestAdminITCase.java            | 17 +++++++++
 wise-webapp/testng.xml                        | 15 --------
 5 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java
 delete mode 100644 wise-webapp/testng.xml

diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 0387d1f4..e7d13dec 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -420,21 +420,40 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <parallel>true</parallel>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
                 </configuration>
             </plugin>
 
-           <plugin>
+            <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>8.1.0.v20120127</version>
                 <configuration>
+                    <stopKey>foo</stopKey>
+                    <stopPort>9999</stopPort>
                     <war>${project.build.directory}/wisemapping.war</war>
                     <reload>automatic</reload>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>start-jetty</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>run-war</goal>
+                        </goals>
+                        <configuration>
+                            <scanIntervalSeconds>0</scanIntervalSeconds>
+                            <daemon>true</daemon>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-jetty</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>
@@ -483,6 +502,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
index 69310dd9..8abef6ba 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -1,6 +1,6 @@
 log4j.rootLogger=WARN, stdout, R
 log4j.logger.com.wisemapping=WARN,stdout,R
-log4j.logger.org.springframework=DEBUG,stdout,R
+log4j.logger.org.springframework=WARN,stdout,R
 log4j.logger.org.codehaus.jackson=WARN,stdout,R
 
 # Stdout logger �
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
index cefaa7ea..71552417 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
@@ -10,7 +10,6 @@ import com.wisemapping.model.MindMap;
 import org.apache.batik.transcoder.TranscoderException;
 import org.apache.commons.io.FileUtils;
 import org.jetbrains.annotations.NotNull;
-import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java
new file mode 100644
index 00000000..3fb43465
--- /dev/null
+++ b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java
@@ -0,0 +1,17 @@
+package com.wisemapping.test.rest;
+
+
+import org.testng.annotations.Test;
+
+
+@Test
+public class RestAdminITCase {
+
+    @Test
+    public void createNewUser() {
+        String uri = "http://localhost:9000/service/admin/user";
+
+//        RestTemplate template = new RestTemplate();
+//        location = template.postForLocation(uri);
+    }
+}
diff --git a/wise-webapp/testng.xml b/wise-webapp/testng.xml
deleted file mode 100644
index 8ad94978..00000000
--- a/wise-webapp/testng.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="WiseMapping Java Tests" verbose="1">
-    <test name="FreeMind Export Tests">
-        <packages>
-            <package name="com.wisemapping.test.freemind"/>
-            <package name="com.wisemapping.test.export"/>
-        </packages>
-    </test>
-    <test name="Model Tests">
-        <packages>
-            <package name="com.wisemapping.test.model"/>
-        </packages>
-    </test>
-</suite>