Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed test 

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2018-03-27 10:32:13 +11:00
parent 585f03464b
commit 6ac5970680
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParsingTest.java → jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java
View File

@ -33,7 +33,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.security.DigestOutputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@ -56,10 +55,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.openjdk.jmh.runner.RunnerException;
@RunWith(Parameterized.class)
public class MultiPartParsingTest
public class MultiPartCaptureTest
{
public static final int MAX_FILE_SIZE = 60 * 1024;
@ -148,7 +146,7 @@ public class MultiPartParsingTest
private final Path multipartRawFile;
private final MultipartExpectations multipartExpectations;
public MultiPartParsingTest(String rawPrefix) throws IOException
public MultiPartCaptureTest(String rawPrefix) throws IOException
{
multipartRawFile = MavenTestingUtils.getTestResourcePathFile("multipart/" + rawPrefix + ".raw");
Path expectationPath = MavenTestingUtils.getTestResourcePathFile("multipart/" + rawPrefix + ".expected.txt");
@ -185,7 +183,7 @@ public class MultiPartParsingTest
MultipartConfigElement config = newMultipartConfigElement(outputDir);
try (InputStream in = Files.newInputStream(multipartRawFile))
{
MultiPartInputStreamParser parser = new MultiPartInputStreamParser(in, multipartExpectations.contentType, config, outputDir.toFile());
MultiPartFormInputStream parser = new MultiPartFormInputStream(in, multipartExpectations.contentType, config, outputDir.toFile());
checkParts(parser.getParts(),s->
{
@ -233,9 +231,10 @@ public class MultiPartParsingTest
// Evaluate expected contents checksums
for (NameValue expected : multipartExpectations.partSha1sums)
{
System.err.println(expected.name);
Part part = getPart.apply(expected.name);
assertThat("Part[" + expected.name + "]", part, is(notNullValue()));
// System.err.println(BufferUtil.toDetailString(BufferUtil.toBuffer(IO.readBytes(part.getInputStream()))));
System.err.println(BufferUtil.toDetailString(BufferUtil.toBuffer(IO.readBytes(part.getInputStream()))));
MessageDigest digest = MessageDigest.getInstance("SHA1");
try (InputStream partInputStream = part.getInputStream();
NoOpOutputStream noop = new NoOpOutputStream();