This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit 854572905e0351deaa638aaf78fe83e368be6051 Merge: b40f3efc7 980387e91 Author: Lukasz Lenart <[email protected]> AuthorDate: Wed Sep 14 16:37:34 2022 +0200 Merge pull request #595 from apache/WW-5220-move-junit WW-5220 Moves JUnit related test into the JUnit plugin .../jasperreports/JasperReportsResultTest.java | 14 +- .../apache/struts2/dispatcher/ChartResultTest.java | 17 +- .../apache/struts2/json/DefaultJSONWriterTest.java | 16 +- .../struts2/json/JSONActionRedirectResultTest.java | 13 +- .../apache/struts2/json/JSONInterceptorTest.java | 25 +- .../org/apache/struts2/json/JSONPopulatorTest.java | 2 +- .../org/apache/struts2/json/JSONResultTest.java | 42 +- .../json/JSONValidationInterceptorTest.java | 28 +- .../ConventionPluginResourceLoader.java | 2 +- .../struts2/{ => junit}/StrutsJUnit4TestCase.java | 504 ++++++++++----------- .../struts2/{ => junit}/StrutsPortletTestCase.java | 12 +- .../struts2/{ => junit}/StrutsRestTestCase.java | 3 +- .../{ => junit}/StrutsSpringJUnit4TestCase.java | 2 +- .../struts2/{ => junit}/StrutsSpringTestCase.java | 94 ++-- .../apache/struts2/{ => junit}/StrutsTestCase.java | 5 +- .../apache/struts2/junit}/XWorkJUnit4TestCase.java | 9 +- .../apache/struts2/{ => junit}/util/TestUtils.java | 2 +- .../struts2/{ => junit}/JUnitTestAction.java | 78 ++-- .../apache/struts2/{ => junit}/MySessionBean.java | 2 +- .../{ => junit}/StrutsJUnit4TestCaseTest.java | 6 +- .../StrutsSpringJUnit4TestCaseTest.java | 16 +- .../{ => junit}/StrutsSpringTestCaseTest.java | 54 +-- .../struts2/{ => junit}/StrutsTestCaseTest.java | 201 ++++---- .../StrutsJUnit4ConventionTestCaseTest.java | 4 +- .../{ => junit}/session/SessionGetAction.java | 2 +- .../{ => junit}/session/SessionSetAction.java | 2 +- .../session/StrutsJUnit4SessionTestCaseTest.java | 10 +- .../src/test/resources/applicationContext.xml | 6 +- .../test/resources/struts-session-values-test.xml | 8 +- plugins/junit/src/test/resources/struts-test.xml | 6 +- plugins/junit/src/test/resources/struts.xml | 8 +- 31 files changed, 600 insertions(+), 593 deletions(-)
