Author: mcucchiara
Date: Sun Aug 14 20:57:58 2011
New Revision: 1157665
URL: http://svn.apache.org/viewvc?rev=1157665&view=rev
Log:
WW-3671 - Two TestAction classes confuse eclipse (sometimes)
Added:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/JunitTestAction.java
(contents, props changed)
- copied, changed from r1157396,
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/TestAction.java
Removed:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/TestAction.java
Modified:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringTestCaseTest.java
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java
struts/struts2/trunk/plugins/junit/src/test/resources/applicationContext.xml
struts/struts2/trunk/plugins/junit/src/test/resources/struts.xml
Copied:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/JunitTestAction.java
(from r1157396,
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/TestAction.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/JunitTestAction.java?p2=struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/JunitTestAction.java&p1=struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/TestAction.java&r1=1157396&r2=1157665&rev=1157665&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/TestAction.java
(original)
+++
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/JunitTestAction.java
Sun Aug 14 20:57:58 2011
@@ -22,7 +22,7 @@ package org.apache.struts2;
import com.opensymphony.xwork2.ActionSupport;
-public class TestAction extends ActionSupport {
+public class JunitTestAction extends ActionSupport {
private String name;
public String getName() {
Propchange:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/JunitTestAction.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java?rev=1157665&r1=1157664&r2=1157665&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java
(original)
+++
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java
Sun Aug 14 20:57:58 2011
@@ -34,7 +34,7 @@ import java.io.UnsupportedEncodingExcept
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations={"classpath*:applicationContext.xml"})
-public class StrutsSpringJUnit4TestCaseTest extends
StrutsSpringJUnit4TestCase<TestAction> {
+public class StrutsSpringJUnit4TestCaseTest extends
StrutsSpringJUnit4TestCase<JunitTestAction> {
@Test
public void getActionMapping() {
@@ -52,7 +52,7 @@ public class StrutsSpringJUnit4TestCaseT
ActionProxy proxy = getActionProxy("/test/testAction.action");
Assert.assertNotNull(proxy);
- TestAction action = (TestAction) proxy.getAction();
+ JunitTestAction action = (JunitTestAction) proxy.getAction();
Assert.assertNotNull(action);
String result = proxy.execute();
Modified:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringTestCaseTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringTestCaseTest.java?rev=1157665&r1=1157664&r2=1157665&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringTestCaseTest.java
(original)
+++
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringTestCaseTest.java
Sun Aug 14 20:57:58 2011
@@ -23,7 +23,7 @@ package org.apache.struts2;
public class StrutsSpringTestCaseTest extends StrutsSpringTestCase {
public void testApplicationContext() {
assertNotNull(applicationContext);
- TestAction action = (TestAction)
applicationContext.getBean("testAction");
+ JunitTestAction action = (JunitTestAction)
applicationContext.getBean("testAction");
assertNotNull(action);
}
}
Modified:
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java?rev=1157665&r1=1157664&r2=1157665&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java
(original)
+++
struts/struts2/trunk/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java
Sun Aug 14 20:57:58 2011
@@ -42,7 +42,7 @@ public class StrutsTestCaseTest extends
ActionProxy proxy = getActionProxy("/test/testAction.action");
assertNotNull(proxy);
- TestAction action = (TestAction) proxy.getAction();
+ JunitTestAction action = (JunitTestAction) proxy.getAction();
assertNotNull(action);
String result = proxy.execute();
Modified:
struts/struts2/trunk/plugins/junit/src/test/resources/applicationContext.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/test/resources/applicationContext.xml?rev=1157665&r1=1157664&r2=1157665&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/junit/src/test/resources/applicationContext.xml
(original)
+++
struts/struts2/trunk/plugins/junit/src/test/resources/applicationContext.xml
Sun Aug 14 20:57:58 2011
@@ -2,5 +2,5 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean id="testAction" class="org.apache.struts2.TestAction"/>
+ <bean id="testAction" class="org.apache.struts2.JunitTestAction"/>
</beans>
\ No newline at end of file
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=1157665&r1=1157664&r2=1157665&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/junit/src/test/resources/struts.xml (original)
+++ struts/struts2/trunk/plugins/junit/src/test/resources/struts.xml Sun Aug 14
20:57:58 2011
@@ -7,7 +7,7 @@
<struts>
<constant name="struts.objectFactory" value="spring"/>
<package name="test" namespace="/test" extends="struts-default">
- <action name="testAction" class="org.apache.struts2.TestAction">
+ <action name="testAction" class="org.apache.struts2.JunitTestAction">
<result type="freemarker">/template.ftl</result>
</action>
</package>
