Changeset 1945

Timestamp:

2011-09-01 13:15:41 (9 months ago)

Author:

mpo

Message:

cleanup and refactoring tests
no need for output in case of 1001: body is empty
(the useful info is dumped through logging forced to trace by settings in the pom)

Location:

trunk

Files:

• core/kauri-runtime-testfw/src/main/java/org/kauriproject/runtime/testfw/AbstractRuntimeTest.java (modified) (5 diffs)
• modules/kauri-template/kauri-template-service-impl/src/test/java/org/kauriproject/template/service/test/TemplateConfTest.java (modified) (1 diff)

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

@@ -21 +21 @@
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
-import java.util.HashSet;
 
 import junit.framework.TestCase;
 
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
 import org.kauriproject.runtime.KauriRuntime;
 import org.kauriproject.runtime.KauriRuntimeSettings;
+import org.kauriproject.runtime.configuration.ConfManager;
 import org.kauriproject.runtime.configuration.ConfManagerImpl;
-import org.kauriproject.runtime.configuration.ConfManager;
+import org.kauriproject.runtime.model.KauriRuntimeModel;
 import org.kauriproject.runtime.rapi.Mode;
-import org.kauriproject.runtime.model.KauriRuntimeModel;
 import org.kauriproject.runtime.repository.ArtifactNotFoundException;
 import org.kauriproject.runtime.repository.ArtifactRepository;
@@ -43 +47 @@
 import org.restlet.data.Protocol;
 import org.restlet.data.Reference;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
 
 public abstract class AbstractRuntimeTest extends TestCase {
@@ -82 +82 @@
                     if (file.exists())
                         return new ResolvedArtifact(file, Collections.singletonList(file.getAbsolutePath()), true);
-                    else
-                        return super.tryResolve(groupId, artifactId, classifier, version);
+                    //else
+                    return super.tryResolve(groupId, artifactId, classifier, version);
                 }
             };
@@ -186 +186 @@
      * Creates a configuration dir based on a package name.
      */
-    public File createConfDir(String confName) throws IOException {
+    public File createConfDir(String confName) {
         String basedir = System.getProperty("basedir"); // This property is set by the Maven surefire:test goal
         if (basedir == null) { // we are not running in maven, assume the current working dir is the basedir:
@@ -334 +334 @@
      */
     protected Response assertedResponseFor(final String path, final int statusCode, final String responseText) throws IOException {
-        Client client = getTestClientDispatcher();
-        Reference ref = makeTestReference(path);
-        Request request = new Request(Method.GET, ref);
-        Response response = client.handle(request);
-
-        // start temp-code for checking test failures only @ci.outerthought.org
-        if (response.getStatus().getCode() != statusCode) {
-            // dump response body before assertion to retrieve some more detail in the logs on hudson
-            System.out.println("Unexpected response code. Dumping BODY:--\n" + response.getEntityAsText() + "\n--");
-        }
-        // end temp-code
+        final Client client = getTestClientDispatcher();
+        final Reference ref = makeTestReference(path);
+        final Request request = new Request(Method.GET, ref);
+        final Response response = client.handle(request);
         
         assertEquals(statusCode, response.getStatus().getCode());

trunk/modules/kauri-template/kauri-template-service-impl/src/test/java/org/kauriproject/template/service/test/TemplateConfTest.java

@@ -1 +1 @@
 package org.kauriproject.template.service.test;
 
-import org.kauriproject.runtime.testfw.AbstractRuntimeTest;
-import org.kauriproject.runtime.model.*;
+import java.io.File;
+import java.util.Collections;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
 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.kauriproject.util.xml.XPathUtils;
-import org.restlet.Request;
 import org.restlet.Response;
-import org.restlet.data.Method;
 import org.w3c.dom.Document;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.File;
-import java.util.Collections;
 
 /**