andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a test failure in Windows due to newline differences

Browse Source
This commit is contained in:
Trustin Lee 2014-01-19 16:13:49 +09:00
parent f97f6b938e
commit eb4ef433c6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoderTest.java
View File

@ -22,6 +22,7 @@ import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.HttpVersion;
import io.netty.handler.codec.http.multipart.HttpPostRequestEncoder.EncoderMode; import io.netty.handler.codec.http.multipart.HttpPostRequestEncoder.EncoderMode;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import io.netty.util.internal.StringUtil;
import org.junit.Test; import org.junit.Test;
import java.io.File; import java.io.File;
@ -56,7 +57,7 @@ public class HttpPostRequestEncoderTest {
"Content-Type: text/plain" + "\r\n" + "Content-Type: text/plain" + "\r\n" +
"Content-Transfer-Encoding: binary" + "\r\n" + "Content-Transfer-Encoding: binary" + "\r\n" +
"\r\n" + "\r\n" +
"File 01\n" + "File 01" + StringUtil.NEWLINE +
"\r\n" + "\r\n" +
"--" + multipartDataBoundary + "--" + "\r\n"; "--" + multipartDataBoundary + "--" + "\r\n";
@ -95,14 +96,14 @@ public class HttpPostRequestEncoderTest {
"Content-Type: text/plain" + "\r\n" + "Content-Type: text/plain" + "\r\n" +
"Content-Transfer-Encoding: binary" + "\r\n" + "Content-Transfer-Encoding: binary" + "\r\n" +
"\r\n" + "\r\n" +
"File 01\n" + "File 01" + StringUtil.NEWLINE +
"\r\n" + "\r\n" +
"--" + multipartMixedBoundary + "\r\n" + "--" + multipartMixedBoundary + "\r\n" +
"Content-Disposition: attachment; filename=\"file-02.txt\"" + "\r\n" + "Content-Disposition: attachment; filename=\"file-02.txt\"" + "\r\n" +
"Content-Type: text/plain" + "\r\n" + "Content-Type: text/plain" + "\r\n" +
"Content-Transfer-Encoding: binary" + "\r\n" + "Content-Transfer-Encoding: binary" + "\r\n" +
"\r\n" + "\r\n" +
"File 02\n" + "File 02" + StringUtil.NEWLINE +
"\r\n" + "\r\n" +
"--" + multipartMixedBoundary + "--" + "\r\n" + "--" + multipartMixedBoundary + "--" + "\r\n" +
"--" + multipartDataBoundary + "--" + "\r\n"; "--" + multipartDataBoundary + "--" + "\r\n";
@ -138,13 +139,13 @@ public class HttpPostRequestEncoderTest {
"Content-Type: text/plain" + "\r\n" + "Content-Type: text/plain" + "\r\n" +
"Content-Transfer-Encoding: binary" + "\r\n" + "Content-Transfer-Encoding: binary" + "\r\n" +
"\r\n" + "\r\n" +
"File 01\n" + "\r\n" + "File 01" + StringUtil.NEWLINE + "\r\n" +
"--" + multipartDataBoundary + "\r\n" + "--" + multipartDataBoundary + "\r\n" +
"Content-Disposition: form-data; name=\"quux\"; filename=\"file-02.txt\"" + "\r\n" + "Content-Disposition: form-data; name=\"quux\"; filename=\"file-02.txt\"" + "\r\n" +
"Content-Type: text/plain" + "\r\n" + "Content-Type: text/plain" + "\r\n" +
"Content-Transfer-Encoding: binary" + "\r\n" + "Content-Transfer-Encoding: binary" + "\r\n" +
"\r\n" + "\r\n" +
"File 02\n" + "File 02" + StringUtil.NEWLINE +
"\r\n" + "\r\n" +
"--" + multipartDataBoundary + "--" + "\r\n"; "--" + multipartDataBoundary + "--" + "\r\n";
@ -178,7 +179,7 @@ public class HttpPostRequestEncoderTest {
"Content-Type: text/plain" + "\r\n" + "Content-Type: text/plain" + "\r\n" +
"Content-Transfer-Encoding: binary" + "\r\n" + "Content-Transfer-Encoding: binary" + "\r\n" +
"\r\n" + "\r\n" +
"File 01\n" + "File 01" + StringUtil.NEWLINE +
"\r\n" + "\r\n" +
"--" + multipartDataBoundary + "--" + "\r\n"; "--" + multipartDataBoundary + "--" + "\r\n";