Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #594 from apache/WW-5219-move-testng

Browse Source 
WW-5219 Moves TestNG related classes into TestNG plugin
This commit is contained in:
Lukasz Lenart
2022-09-14 16:37:11 +02:00
committed by GitHub
parent 8514406142 5a3d2c4eb9
commit b40f3efc74
8 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/pom.xml
+1 -2
View File
@@ -339,8 +339,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>compile</scope>
<optional>true</optional>
<scope>test</scope>
</dependency>
<!-- SLF4J support -->
core/src/test/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequestTest.java
+20 -23
View File
@@ -18,53 +18,50 @@
*/
package org.apache.struts2.dispatcher.multipart;
import org.apache.struts2.dispatcher.LocalizedMessage;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.mock.web.DelegatingServletInputStream;
import javax.servlet.http.HttpServletRequest;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.dispatcher.LocalizedMessage;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.mock.web.DelegatingServletInputStream;
import org.testng.Assert;
public class JakartaStreamMultiPartRequestTest {
private JakartaStreamMultiPartRequest multiPart;
private Path tempDir;
@Before
public void initialize() {
multiPart = new JakartaStreamMultiPartRequest();
tempDir = Paths.get("target", "multi-part-test");
}
/**
* Number of bytes in files greater than 2GB overflow the {@code int} primative.
* The {@link HttpServletRequest#getContentLength()} returns {@literal -1}
* The {@link HttpServletRequest#getContentLength()} returns {@literal -1}
* when the header is not present or the size is greater than {@link Integer#MAX_VALUE}.
* @throws IOException
*/
@Test
public void unknownContentLength() throws IOException {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
Mockito.when(request.getContentType()).thenReturn("multipart/form-data; charset=utf-8; boundary=__X_BOUNDARY__");
Mockito.when(request.getMethod()).thenReturn("POST");
Mockito.when(request.getContentLength()).thenReturn(Integer.valueOf(-1));
StringBuilder entity = new StringBuilder();
entity.append("\r\n--__X_BOUNDARY__\r\n");
entity.append("Content-Disposition: form-data; name=\"upload\"; filename=\"test.csv\"\r\n");
entity.append("Content-Type: text/csv\r\n\r\n1,2\r\n\r\n");
entity.append("--__X_BOUNDARY__\r\n");
entity.append("Content-Disposition: form-data; name=\"upload2\"; filename=\"test2.csv\"\r\n");
entity.append("Content-Type: text/csv\r\n\r\n3,4\r\n\r\n");
entity.append("--__X_BOUNDARY__--\r\n");
Mockito.when(request.getInputStream()).thenReturn(new DelegatingServletInputStream(new ByteArrayInputStream(entity.toString().getBytes(StandardCharsets.UTF_8))));
Mockito.when(request.getContentLength()).thenReturn(-1);
String entity = "\r\n--__X_BOUNDARY__\r\n" +
"Content-Disposition: form-data; name=\"upload\"; filename=\"test.csv\"\r\n" +
"Content-Type: text/csv\r\n\r\n1,2\r\n\r\n" +
"--__X_BOUNDARY__\r\n" +
"Content-Disposition: form-data; name=\"upload2\"; filename=\"test2.csv\"\r\n" +
"Content-Type: text/csv\r\n\r\n3,4\r\n\r\n" +
"--__X_BOUNDARY__--\r\n";
Mockito.when(request.getInputStream()).thenReturn(new DelegatingServletInputStream(new ByteArrayInputStream(entity.getBytes(StandardCharsets.UTF_8))));
multiPart.setMaxSize("4");
multiPart.parse(request, tempDir.toString());
LocalizedMessage next = multiPart.getErrors().iterator().next();
plugins/testng/pom.xml
-1
View File
@@ -35,7 +35,6 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.10</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
plugins/testng/src/main/java/org/apache/struts2/StrutsTestCase.java → plugins/testng/src/main/java/org/apache/struts2/testng/StrutsTestCase.java
+2 -4
View File
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.struts2;
package org.apache.struts2.testng;
import java.util.Map;
@@ -26,8 +26,6 @@ import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.springframework.mock.web.MockServletContext;
import com.opensymphony.xwork2.TestNGXWorkTestCase;
/**
* Base test class for TestNG unit tests. Provides common Struts variables
* and performs Struts setup and teardown processes
@@ -39,7 +37,7 @@ public class StrutsTestCase extends TestNGXWorkTestCase {
super.setUp();
initDispatcher(null);
}
protected Dispatcher initDispatcher(Map<String,String> params) {
Dispatcher du = StrutsTestCaseHelper.initDispatcher(new MockServletContext(), params);
configurationManager = du.getConfigurationManager();
core/src/main/java/com/opensymphony/xwork2/TestNGXWorkTestCase.java → plugins/testng/src/main/java/org/apache/struts2/testng/TestNGXWorkTestCase.java
+2 -1
View File
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.opensymphony.xwork2;
package org.apache.struts2.testng;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.ConfigurationProvider;
plugins/testng/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java → plugins/testng/src/test/java/org/apache/struts2/testng/TestNGStrutsTestCaseTest.java
+5 -4
View File
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.struts2;
package org.apache.struts2.testng;
import junit.framework.TestCase;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.testng.StrutsTestCase;
import org.testng.TestListenerAdapter;
import org.testng.TestNG;
import org.testng.annotations.Test;
@@ -46,13 +47,13 @@ public class TestNGStrutsTestCaseTest extends TestCase {
RunTest.mgr = null;
}
}
public static class RunTest extends StrutsTestCase {
public static boolean ran = false;
public static ConfigurationManager mgr;
public static Dispatcher du;
@Test
@Test
public void testRun() {
ran = true;
mgr = this.configurationManager;
core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java → plugins/testng/src/test/java/org/apache/struts2/testng/TestNGXWorkTestCaseTest.java
+4 -3
View File
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.opensymphony.xwork2;
package org.apache.struts2.testng;
import com.opensymphony.xwork2.config.ConfigurationManager;
import junit.framework.TestCase;
import org.apache.struts2.testng.TestNGXWorkTestCase;
import org.testng.TestListenerAdapter;
import org.testng.TestNG;
import org.testng.annotations.Test;
@@ -42,12 +43,12 @@ public class TestNGXWorkTestCaseTest extends TestCase {
RunTest.mgr = null;
}
}
@Test
public static class RunTest extends TestNGXWorkTestCase {
public static boolean ran = false;
public static ConfigurationManager mgr;
public void testRun() {
ran = true;
mgr = this.configurationManager;
pom.xml
+1 -3
View File
@@ -1112,9 +1112,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.1.0</version>
<scope>compile</scope>
<optional>true</optional>
<version>7.4.0</version>
</dependency>
<dependency>