Changeset 1943

Timestamp:

2011-09-01 09:14:41 (9 months ago)

Author:

mpo

Message:

some more test code refactoring and debug level increasing

Location:

trunk

Files:

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

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

@@ -334 +334 @@
      */
     protected Response assertedResponseFor(final String path, final int statusCode, final String responseText) throws IOException {
-        Client client = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher();
+        Client client = getTestClientDispatcher();
         Reference ref = makeTestReference(path);
         Request request = new Request(Method.GET, ref);
@@ -353 +353 @@
         return response;
     }
+
+    protected Client getTestClientDispatcher() {
+        return runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher();
+    }
     
     protected Reference makeTestReference(final String path) {

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

@@ -41 +41 @@
 import org.restlet.data.Preference;
 import org.restlet.data.Protocol;
-import org.restlet.data.Reference;
 import org.restlet.data.Status;
 import org.restlet.ext.json.JsonRepresentation;

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

@@ -74 +74 @@
           <skip>true</skip>
           <systemProperties>
-            <property>
-              <name>project.version</name>
-              <value>${project.version}</value>
-            </property>
+            <property><name>project.version</name><value>${project.version}</value></property>
           </systemProperties>
         </configuration>
@@ -89 +86 @@
             <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>

trunk/modules/kauri-security/kauri-security-impl/src/test/java/org/kauriproject/security/test/SecurityTest.java

@@ -19 +19 @@
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.ArrayList;
-
-import org.kauriproject.runtime.model.*;
-import org.kauriproject.runtime.testfw.AbstractRuntimeTest;
+
 import org.kauriproject.runtime.configuration.ConfManager;
 import org.kauriproject.runtime.configuration.ConfManagerImpl;
+import org.kauriproject.runtime.model.ClientConnectorDefinition;
+import org.kauriproject.runtime.model.KauriRuntimeModel;
+import org.kauriproject.runtime.model.ModuleDefinition;
+import org.kauriproject.runtime.model.ModuleSourceType;
+import org.kauriproject.runtime.model.MountDefinition;
+import org.kauriproject.runtime.model.ServerConnectorDefinition;
+import org.kauriproject.runtime.testfw.AbstractRuntimeTest;
 import org.restlet.Client;
+import org.restlet.Request;
+import org.restlet.Response;
 import org.restlet.data.ChallengeRequest;
 import org.restlet.data.ChallengeResponse;
@@ -33 +40 @@
 import org.restlet.data.Form;
 import org.restlet.data.Method;
-import org.restlet.data.Parameter;
-import org.restlet.data.Reference;
-import org.restlet.Request;
-import org.restlet.Response;
 import org.restlet.data.Status;
-import org.restlet.ext.crypto.DigestUtils;
-import org.restlet.util.Series;
 
 public class SecurityTest extends AbstractRuntimeTest {
@@ -243 +244 @@
 
     private Response doFormRequest(String path, String user, String password) throws IOException {
-        Client cd = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher();
+        Client cd = getTestClientDispatcher();
 
         // first request:
@@ -254 +255 @@
 
         response.getEntity().exhaust();
-        request = new Request(Method.POST, createReference("/login"));
+        request = new Request(Method.POST, makeTestReference("/login"));
         Form form = new Form();
         form.add("username", user);
@@ -273 +274 @@
     }
     
-    private Reference createReference(String path) {
-        return new Reference("http://localhost:" + HTTP_TEST_PORT + path);
-    }
-
     private Response doDigestRequest(String path, String user, String password) throws IOException {
         Client cd = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher();