Author: mcucchiara
Date: Tue Aug 16 15:12:18 2011
New Revision: 1158319
URL: http://svn.apache.org/viewvc?rev=1158319&view=rev
Log:
Added doc.
Added:
struts/struts2/trunk/plugins/junit/src/test/resources/template-1.ftl
(props changed)
- copied unchanged from r1157396,
struts/struts2/trunk/plugins/junit/src/test/resources/template.ftl
struts/struts2/trunk/plugins/junit/src/test/resources/template-2.ftl
Removed:
struts/struts2/trunk/plugins/junit/src/test/resources/template.ftl
Modified:
struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java
(contents, props changed)
struts/struts2/trunk/plugins/junit/src/test/resources/struts-test.xml
struts/struts2/trunk/plugins/junit/src/test/resources/struts.xml
Modified:
struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java?rev=1158319&r1=1158318&r2=1158319&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
(original)
+++
struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
Tue Aug 16 15:12:18 2011
@@ -228,6 +228,12 @@ public abstract class StrutsJUnit4TestCa
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;
}
Modified:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java?rev=1158319&r1=1158318&r2=1158319&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java
(original)
+++
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java
Tue Aug 16 15:12:18 2011
@@ -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
Propchange:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsJUnit4TestCaseTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Aug 16 15:12:18 2011
@@ -0,0 +1 @@
+Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/plugins/junit/src/test/resources/struts-test.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/resources/struts-test.xml?rev=1158319&r1=1158318&r2=1158319&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/junit/src/test/resources/struts-test.xml
(original)
+++ struts/struts2/trunk/plugins/junit/src/test/resources/struts-test.xml Tue
Aug 16 15:12:18 2011
@@ -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>
Modified: struts/struts2/trunk/plugins/junit/src/test/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/resources/struts.xml?rev=1158319&r1=1158318&r2=1158319&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/junit/src/test/resources/struts.xml (original)
+++ struts/struts2/trunk/plugins/junit/src/test/resources/struts.xml Tue Aug 16
15:12:18 2011
@@ -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
Propchange: struts/struts2/trunk/plugins/junit/src/test/resources/template-1.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/plugins/junit/src/test/resources/template-2.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/resources/template-2.ftl?rev=1158319&view=auto
==============================================================================
--- struts/struts2/trunk/plugins/junit/src/test/resources/template-2.ftl (added)
+++ struts/struts2/trunk/plugins/junit/src/test/resources/template-2.ftl Tue
Aug 16 15:12:18 2011
@@ -0,0 +1 @@
+Test-2
\ No newline at end of file
