loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ParsableByteArrayTest.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=112693523
This commit is contained in:
andrewlewis 2016-01-21 09:35:02 -08:00 committed by Oliver Woodman
parent bed89730a7
commit 9d89d48f56
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/src/androidTest/java/com/google/android/exoplayer/util/ParsableByteArrayTest.java
View File

@ -346,6 +346,13 @@ public class ParsableByteArrayTest extends TestCase {
assertEquals(data.length, byteArray.getPosition()); assertEquals(data.length, byteArray.getPosition());
} }
public void testReadAsciiString() {
byte[] data = new byte[] {'t', 'e', 's', 't'};
ParsableByteArray testArray = new ParsableByteArray(data);
assertEquals("test", testArray.readString(data.length, Charset.forName("US-ASCII")));
assertEquals(data.length, testArray.getPosition());
}
public void testReadStringOutOfBoundsDoesNotMovePosition() { public void testReadStringOutOfBoundsDoesNotMovePosition() {
byte[] data = { byte[] data = {
(byte) 0xC3, (byte) 0xA4, (byte) 0x20 (byte) 0xC3, (byte) 0xA4, (byte) 0x20
@ -416,11 +423,4 @@ public class ParsableByteArrayTest extends TestCase {
assertNull(parser.readLine()); assertNull(parser.readLine());
} }
public void testReadString() {
byte[] bytes = new byte[] {'t', 'e', 's', 't'};
ParsableByteArray testArray = new ParsableByteArray(bytes);
assertEquals("test", testArray.readString(bytes.length, Charset.forName("UTF-8")));
assertEquals(bytes.length, testArray.getPosition());
}
} }

32
library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java
View File

@ -310,13 +310,24 @@ public final class ParsableByteArray {
/** /**
* Reads the next {@code length} bytes as UTF-8 characters. * Reads the next {@code length} bytes as UTF-8 characters.
* *
* @param length the number of bytes to read. * @param length The number of bytes to read.
* @return the UTF-8 {@code String} read. * @return The string encoded by the bytes.
*/ */
public String readString(int length) { public String readString(int length) {
String utf8String = new String(data, position, length); return readString(length, Charset.defaultCharset());
}
/**
* Reads the next {@code length} bytes as characters in the specified {@link Charset}.
*
* @param length The number of bytes to read.
* @param charset The character set of the encoded characters.
* @return The string encoded by the bytes in the specified character set.
*/
public String readString(int length, Charset charset) {
String result = new String(data, position, length, charset);
position += length; position += length;
return utf8String; return result;
} }
/** /**
@ -359,17 +370,4 @@ public final class ParsableByteArray {
return line; return line;
} }
/**
* Reads the next {@code bytes} bytes as characters in the specified {@link Charset}.
*
* @param bytes The number of bytes to read.
* @param charset The character set of the encoded characters.
* @return The string encoded by the bytes in the specified character set.
*/
public String readString(int bytes, Charset charset) {
String result = new String(data, position, bytes, charset);
position += bytes;
return result;
}
} }