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

Fix warnings in OggVorbisExtractorTest and VorbisBitArrayTest.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=112699244
This commit is contained in:
andrewlewis 2016-01-21 10:32:00 -08:00 committed by Oliver Woodman
parent 9d89d48f56
commit 4bea0b184f
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OggVorbisExtractorTest.java
View File

@ -21,8 +21,6 @@ import android.util.Log;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.io.IOException;
/** /**
* Unit test for {@link OggVorbisExtractor}. * Unit test for {@link OggVorbisExtractor}.
*/ */
@ -62,7 +60,7 @@ public final class OggVorbisExtractorTest extends TestCase {
assertEquals(0x01, buffer.data[3]); assertEquals(0x01, buffer.data[3]);
} }
public void testReadSetupHeadersWithIOExceptions() throws IOException, InterruptedException { public void testReadSetupHeadersWithIOExceptions() {
extractorInput.doThrowExceptionsAtRead(true); extractorInput.doThrowExceptionsAtRead(true);
extractorInput.doThrowExceptionsAtPeek(true); extractorInput.doThrowExceptionsAtPeek(true);

19
library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/VorbisBitArrayTest.java
View File

@ -15,7 +15,6 @@
*/ */
package com.google.android.exoplayer.extractor.ogg; package com.google.android.exoplayer.extractor.ogg;
import com.google.android.exoplayer.ParserException;
import com.google.android.exoplayer.util.ParsableBitArray; import com.google.android.exoplayer.util.ParsableBitArray;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -25,7 +24,7 @@ import junit.framework.TestCase;
*/ */
public final class VorbisBitArrayTest extends TestCase { public final class VorbisBitArrayTest extends TestCase {
public void testReadBit() throws ParserException { public void testReadBit() {
VorbisBitArray bitArray = new VorbisBitArray(new byte[]{ VorbisBitArray bitArray = new VorbisBitArray(new byte[]{
(byte) 0x5c, 0x50 (byte) 0x5c, 0x50
}); });
@ -56,7 +55,7 @@ public final class VorbisBitArrayTest extends TestCase {
} catch (IllegalStateException e) {/* ignored */} } catch (IllegalStateException e) {/* ignored */}
} }
public void testSkipBits() throws ParserException { public void testSkipBits() {
VorbisBitArray bitArray = new VorbisBitArray(new byte[]{ VorbisBitArray bitArray = new VorbisBitArray(new byte[]{
(byte) 0xF0, 0x0F (byte) 0xF0, 0x0F
}); });
@ -79,7 +78,7 @@ public final class VorbisBitArrayTest extends TestCase {
} }
public void testSkipBitsThrowsErrorIfEOB() throws ParserException { public void testSkipBitsThrowsErrorIfEOB() {
VorbisBitArray bitArray = new VorbisBitArray(new byte[]{ VorbisBitArray bitArray = new VorbisBitArray(new byte[]{
(byte) 0xF0, 0x0F (byte) 0xF0, 0x0F
}); });
@ -141,7 +140,7 @@ public final class VorbisBitArrayTest extends TestCase {
} }
} }
public void testReadInt32() throws ParserException { public void testReadInt32() {
byte[] data = {(byte) 0xF0, 0x0F, (byte) 0xF0, 0x0F}; byte[] data = {(byte) 0xF0, 0x0F, (byte) 0xF0, 0x0F};
VorbisBitArray lsb = new VorbisBitArray(data); VorbisBitArray lsb = new VorbisBitArray(data);
assertEquals(0x0FF00FF0, lsb.readBits(32)); assertEquals(0x0FF00FF0, lsb.readBits(32));
@ -222,7 +221,7 @@ public final class VorbisBitArrayTest extends TestCase {
} }
} }
public void testLimit() throws ParserException { public void testLimit() {
VorbisBitArray bitArray = new VorbisBitArray(new byte[]{ VorbisBitArray bitArray = new VorbisBitArray(new byte[]{
(byte) 0xc0, 0x02 (byte) 0xc0, 0x02
}, 1); }, 1);
@ -251,7 +250,7 @@ public final class VorbisBitArrayTest extends TestCase {
} }
} }
public void testBitsLeft() throws ParserException { public void testBitsLeft() {
VorbisBitArray bitArray = new VorbisBitArray(new byte[]{ VorbisBitArray bitArray = new VorbisBitArray(new byte[]{
(byte) 0xc0, 0x02 (byte) 0xc0, 0x02
}); });
@ -294,7 +293,7 @@ public final class VorbisBitArrayTest extends TestCase {
} }
} }
public void testReadBitCompareWithMSb() throws ParserException { public void testReadBitCompareWithMSb() {
byte[] data = {0x0F}; byte[] data = {0x0F};
VorbisBitArray lsb = new VorbisBitArray(data); VorbisBitArray lsb = new VorbisBitArray(data);
ParsableBitArray msb = new ParsableBitArray(data); ParsableBitArray msb = new ParsableBitArray(data);
@ -309,7 +308,7 @@ public final class VorbisBitArrayTest extends TestCase {
assertEquals(lsb.readBit(), !msb.readBit()); assertEquals(lsb.readBit(), !msb.readBit());
} }
public void testReadBitsCompareWithMSb() throws ParserException { public void testReadBitsCompareWithMSb() {
byte[] data = {0x0F}; byte[] data = {0x0F};
VorbisBitArray lsb = new VorbisBitArray(data); VorbisBitArray lsb = new VorbisBitArray(data);
ParsableBitArray msb = new ParsableBitArray(data); ParsableBitArray msb = new ParsableBitArray(data);
@ -319,7 +318,7 @@ public final class VorbisBitArrayTest extends TestCase {
assertEquals(15, msb.readBits(4)); assertEquals(15, msb.readBits(4));
} }
public void testReadBitsCompareWithMSbBeyondByteBoundary() throws ParserException { public void testReadBitsCompareWithMSbBeyondByteBoundary() {
byte[] data = {(byte) 0xF0, 0x0F}; byte[] data = {(byte) 0xF0, 0x0F};
VorbisBitArray lsb = new VorbisBitArray(data); VorbisBitArray lsb = new VorbisBitArray(data);
ParsableBitArray msb = new ParsableBitArray(data); ParsableBitArray msb = new ParsableBitArray(data);