You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2018/10/03 15:34:31 UTC
svn commit: r1842732 - in /turbine/fulcrum/trunk/parser: pom.xml
src/test/org/apache/fulcrum/parser/ParserServiceTest.java
Author: painter
Date: Wed Oct 3 15:34:31 2018
New Revision: 1842732
URL: http://svn.apache.org/viewvc?rev=1842732&view=rev
Log:
Fix test case for multi-part, update to snapshots
Modified:
turbine/fulcrum/trunk/parser/pom.xml
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParserServiceTest.java
Modified: turbine/fulcrum/trunk/parser/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/pom.xml?rev=1842732&r1=1842731&r2=1842732&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/pom.xml (original)
+++ turbine/fulcrum/trunk/parser/pom.xml Wed Oct 3 15:34:31 2018
@@ -88,32 +88,31 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.7</version>
+ <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-pool</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</dependency>
<!-- testing dependencies -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.18.3</version>
- <scope>test</scope>
+ <version>2.22.0</version>
</dependency>
</dependencies>
@@ -128,4 +127,4 @@
<turbine.site.path>fulcrum/fulcrum-parser</turbine.site.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParserServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParserServiceTest.java?rev=1842732&r1=1842731&r2=1842732&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParserServiceTest.java (original)
+++ turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParserServiceTest.java Wed Oct 3 15:34:31 2018
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -160,10 +161,12 @@ public class ParserServiceTest extends B
HttpServletRequest request = getMockRequest();
// TODO check
when(request.getContentType()).thenReturn("multipart/form-data; boundary=boundary");
- when(request.getMethod()).thenReturn("post");
- ((DefaultParameterParser) parameterParser).add(test.getName(), test);
+ when(request.getMethod()).thenReturn("POST");
+ parameterParser.add(test.getName(), test);
Part secondPart = getPart("second-field");
- ((DefaultParameterParser) parameterParser).add(secondPart.getName(), secondPart);
+ parameterParser.add(secondPart.getName(), secondPart);
+
+ when(request.getParts()).thenReturn(Arrays.asList(test, secondPart));
List<Part> parts = parserService.parseUpload( request );
assertTrue( !parts.isEmpty() );
@@ -179,35 +182,4 @@ public class ParserServiceTest extends B
assertTrue( parts.isEmpty() );
//assertTrue( parts.size() == 2 );
}
-
- // from Turbine org.apache.turbine.test.BaseTestCase, should be later in Fulcrum Testcontainer BaseUnit4Test
- protected HttpServletRequest getMockRequest() throws Exception
- {
- HttpServletRequest request = mock(HttpServletRequest.class);
- when(request.getHeader("Content-type")).thenReturn("html/text");
- when(request.getHeader("Accept-Language")).thenReturn("en-US");
-
- Vector<String> v = new Vector<String>();
- when(request.getParameterNames()).thenReturn(v.elements());
-
- when(request.getPart(anyString())).thenAnswer( new Answer<Object>()
- {
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable
- {
- String name = (String) invocation.getArguments()[0];
- return parameterParser.getPart(name);
- }
- } );
- when(request.getParts()).thenAnswer( new Answer<Object>()
- {
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable
- {
- return ((DefaultParameterParser)parameterParser).getParts();
- }
- } );
- return request;
- }
-
}