Fix bug in memory-based HTTP data content initialization with input stream, add test.
- Fixes #1169
This commit is contained in:
parent
a8b6756554
commit
32a783cf1b
@ -64,7 +64,7 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
|
||||
int read = inputStream.read(bytes);
|
||||
int written = 0;
|
||||
while (read > 0) {
|
||||
buffer.writeBytes(bytes);
|
||||
buffer.writeBytes(bytes, 0, read);
|
||||
written += read;
|
||||
read = inputStream.read(bytes);
|
||||
}
|
||||
|
@ -0,0 +1,84 @@
|
||||
/*
|
||||
* Copyright 2013 The Netty Project
|
||||
*
|
||||
* The Netty Project licenses this file to you under the Apache License,
|
||||
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at:
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.jboss.netty.handler.codec.http.multipart;
|
||||
|
||||
import org.jboss.netty.buffer.ChannelBuffer;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.nio.charset.Charset;
|
||||
import java.security.SecureRandom;
|
||||
import java.util.Arrays;
|
||||
import java.util.Random;
|
||||
|
||||
import static org.jboss.netty.util.CharsetUtil.UTF_8;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/** {@link AbstractMemoryHttpData} test cases. */
|
||||
public class AbstractMemoryHttpDataTest {
|
||||
/**
|
||||
* Provide content into HTTP data with input stream.
|
||||
*
|
||||
* @throws Exception In case of any exception.
|
||||
*/
|
||||
@Test
|
||||
public void testSetContentFromStream() throws Exception {
|
||||
Random random = new SecureRandom();
|
||||
|
||||
for (int i = 0; i < 20; i++) {
|
||||
// Generate input data bytes.
|
||||
int size = random.nextInt(Short.MAX_VALUE);
|
||||
byte[] bytes = new byte[size];
|
||||
|
||||
random.nextBytes(bytes);
|
||||
|
||||
// Generate parsed HTTP data block.
|
||||
TestHttpData data = new TestHttpData("name", UTF_8, 0);
|
||||
|
||||
data.setContent(new ByteArrayInputStream(bytes));
|
||||
|
||||
// Validate stored data.
|
||||
ChannelBuffer buffer = data.getChannelBuffer();
|
||||
|
||||
assertEquals(0, buffer.readerIndex());
|
||||
assertEquals(bytes.length, buffer.writerIndex());
|
||||
assertArrayEquals(bytes, Arrays.copyOf(buffer.array(), bytes.length));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** Memory-based HTTP data implementation for test purposes. */
|
||||
private static final class TestHttpData extends AbstractMemoryHttpData {
|
||||
/**
|
||||
* Constructs HTTP data for tests.
|
||||
*
|
||||
* @param name Name of parsed data block.
|
||||
* @param charset Used charset for data decoding.
|
||||
* @param size Expected data block size.
|
||||
*/
|
||||
protected TestHttpData(String name, Charset charset, long size) {
|
||||
super(name, charset, size);
|
||||
}
|
||||
|
||||
public InterfaceHttpData.HttpDataType getHttpDataType() {
|
||||
throw new UnsupportedOperationException("Should never be called.");
|
||||
}
|
||||
|
||||
public int compareTo(InterfaceHttpData o) {
|
||||
throw new UnsupportedOperationException("Should never be called.");
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user