Changeset 1942 for trunk

Timestamp:

2011-09-01 08:46:53 (9 months ago)

Author:

mpo

Message:

refactoring common test code and bumping the debug level on jpa-tests in dbresources

Location:

trunk

Files:

• core/kauri-runtime-testfw/src/main/java/org/kauriproject/runtime/testfw/AbstractRuntimeTest.java (modified) (3 diffs)
• modules/kauri-dbresources/kauri-dbresources-impl/pom.xml (modified) (1 diff)
• modules/kauri-dbresources/kauri-dbresources-impl/src/test/java/org/kauriproject/dbresources/test/JpaTest.java (modified) (1 diff)

trunk/core/kauri-runtime-testfw/src/main/java/org/kauriproject/runtime/testfw/AbstractRuntimeTest.java

@@ -41 +41 @@
 import org.restlet.Response;
 import org.restlet.data.Method;
+import org.restlet.data.Protocol;
+import org.restlet.data.Reference;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.PatternLayout;
@@ -333 +335 @@
     protected Response assertedResponseFor(final String path, final int statusCode, final String responseText) throws IOException {
         Client client = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher();
-        Request request = new Request(Method.GET, "http://localhost:" + HTTP_TEST_PORT + path);
+        Reference ref = makeTestReference(path);
+        Request request = new Request(Method.GET, ref);
         Response response = client.handle(request);
 
@@ -350 +353 @@
         return response;
     }
+    
+    protected Reference makeTestReference(final String path) {
+        return new Reference(Protocol.HTTP.getSchemeName(), "localhost", HTTP_TEST_PORT, path, null, null);
+    }
 }

trunk/modules/kauri-dbresources/kauri-dbresources-impl/pom.xml

@@ -185 +185 @@
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <!--
+        Executes tests at the integration test phase, since we need the jar to load
+        it as module in the Kauri Runtime during testing.
+        -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+          <systemProperties>
+            <property><name>project.version</name><value>${project.version}</value></property>
+          </systemProperties>
+        </configuration>
+        <executions>
+          <execution>
+            <id>surefire-it</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <skip>${maven.test.skip}</skip>
+              <systemProperties>
+                <property><name>project.version</name><value>${project.version}</value></property>
+                <property><name>console-logging</name><value>trace</value></property>
+                <!-- 
+                <property><name>console-log-category</name><value>org.restlet</value></property>
+                -->
+              </systemProperties>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>    
+    </plugins>
+  </build>
+  
 </project>

trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/test/java/org/kauriproject/dbresources/test/JpaTest.java

@@ -357 +357 @@
     }
 
-    private Reference makeTestReference(final String dirPath) {
-        return new Reference(Protocol.HTTP.getSchemeName(), "localhost", HTTP_TEST_PORT, dirPath, null, null);
-    }
-
     private void loadStuff() throws IOException {
         Dummy dummy1 = new Dummy(12, "My Dummy", new Date(), new Date());