Author: jbq
Date: Wed Feb 21 07:05:50 2007
New Revision: 510049

URL: http://svn.apache.org/viewvc?view=rev&rev=510049
Log:
WICKET-284 Cannot execute tests from within wicket-parent

Use "basedir" system property if available to know the path of the module being
currently tested.  Fall back to current directory if the property is not set.

See http://maven.apache.org/plugins/maven-surefire-plugin/test-mojo.html

Modified:
    
incubator/wicket/trunk/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java

Modified: 
incubator/wicket/trunk/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java?view=diff&rev=510049&r1=510048&r2=510049
==============================================================================
--- 
incubator/wicket/trunk/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java
 (original)
+++ 
incubator/wicket/trunk/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java
 Wed Feb 21 07:05:50 2007
@@ -27,6 +27,8 @@
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Node;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.meterware.httpunit.HttpUnitOptions;
 
@@ -37,6 +39,8 @@
  */
 public abstract class WicketWebTestCase extends WebTestCase
 {
+       private static final Logger logger = 
LoggerFactory.getLogger(WicketWebTestCase.class);
+
        /**
         * Suite method.
         * 
@@ -54,7 +58,15 @@
                suite.addTestSuite(clazz);
                JettyDecorator deco = new JettyDecorator(suite);
                deco.setPort(8098);
-               deco.setWebappContextRoot("src/webapp");
+
+               String basedir = System.getProperty("basedir");
+               logger.debug("basedir="+basedir);
+               String path = "";
+               if (basedir != null)
+                       path = basedir + "/";
+               path += "src/webapp";
+               deco.setWebappContextRoot(path);
+
                deco.setContextPath("/wicket-examples");
 
                return deco;


Reply via email to