From 7e1b849155e492f4d3f7a565a4e301214889ff49 Mon Sep 17 00:00:00 2001
From: Maurizio Cucchiara <mcucchiara@apache.org>
Date: Tue, 16 Aug 2011 15:12:18 +0000
Subject: [PATCH] Added doc.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1158319 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/struts2/StrutsJUnit4TestCase.java  | 6 ++++++
 .../java/org/apache/struts2/StrutsJUnit4TestCaseTest.java   | 6 +++---
 plugins/junit/src/test/resources/struts-test.xml            | 6 +++---
 plugins/junit/src/test/resources/struts.xml                 | 2 +-
 .../src/test/resources/{template.ftl => template-1.ftl}     | 0
 plugins/junit/src/test/resources/template-2.ftl             | 1 +
 6 files changed, 14 insertions(+), 7 deletions(-)
 rename plugins/junit/src/test/resources/{template.ftl => template-1.ftl} (100%)
 create mode 100644 plugins/junit/src/test/resources/template-2.ftl

diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
index 102454158..e693f6638 100644
--- a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
+++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
@@ -228,6 +228,12 @@ public abstract class StrutsJUnit4TestCase<T> extends XWorkJUnit4TestCase {
         return du;
     }
 
+    /**
+	 * Override this method to return a comma separated list of paths to a configuration
+	 * file.
+	 * <p>The default implementation simply returns <code>null</code>.
+	 * @return a comma separated list of config locations
+	 */
     protected String getConfigPath() {
         return null;
     }
diff --git a/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java b/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java
index 4259f7a22..8111b30eb 100644
--- a/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java
+++ b/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -32,8 +32,8 @@ import org.junit.Test;
 public class StrutsJUnit4TestCaseTest extends StrutsJUnit4TestCase<JUnitTestAction>{
     @Test
     public void testExecuteActionAgainstCustomStrutsConfigFile() throws Exception {
-        String output = executeAction("/test2/testAction2.action");
-        Assert.assertEquals("Test2", output);
+        String output = executeAction("/test/testAction-2.action");
+        Assert.assertEquals("Test-2", output);
     }
 
     @Override
diff --git a/plugins/junit/src/test/resources/struts-test.xml b/plugins/junit/src/test/resources/struts-test.xml
index 82778fb14..79e6516d2 100644
--- a/plugins/junit/src/test/resources/struts-test.xml
+++ b/plugins/junit/src/test/resources/struts-test.xml
@@ -26,9 +26,9 @@
     "http://struts.apache.org/dtds/struts-2.1.dtd">
 
 <struts>
-    <package name="test2" namespace="/test2" extends="struts-default">
-        <action name="testAction2" class="org.apache.struts2.JUnitTestAction">
-            <result type="freemarker">/template2.ftl</result>
+    <package name="test" namespace="/test" extends="struts-default">
+        <action name="testAction-2" class="org.apache.struts2.JUnitTestAction">
+            <result type="freemarker">/template-2.ftl</result>
         </action>
     </package>
 </struts>
diff --git a/plugins/junit/src/test/resources/struts.xml b/plugins/junit/src/test/resources/struts.xml
index 114e92a95..104b02d61 100644
--- a/plugins/junit/src/test/resources/struts.xml
+++ b/plugins/junit/src/test/resources/struts.xml
@@ -8,7 +8,7 @@
     <constant name="struts.objectFactory" value="spring"/>
     <package name="test" namespace="/test" extends="struts-default">
         <action name="testAction" class="org.apache.struts2.JUnitTestAction">
-            <result type="freemarker">/template.ftl</result>
+            <result type="freemarker">/template-1.ftl</result>
         </action>
     </package>
 </struts>
\ No newline at end of file
diff --git a/plugins/junit/src/test/resources/template.ftl b/plugins/junit/src/test/resources/template-1.ftl
similarity index 100%
rename from plugins/junit/src/test/resources/template.ftl
rename to plugins/junit/src/test/resources/template-1.ftl
diff --git a/plugins/junit/src/test/resources/template-2.ftl b/plugins/junit/src/test/resources/template-2.ftl
new file mode 100644
index 000000000..eb4cd7ee6
--- /dev/null
+++ b/plugins/junit/src/test/resources/template-2.ftl
@@ -0,0 +1 @@
+Test-2
\ No newline at end of file