diff --git a/core/src/test/java/org/gagravarr/opus/AbstractOpusTest.java b/core/src/test/java/org/gagravarr/opus/AbstractOpusTest.java new file mode 100644 index 0000000..8d46708 --- /dev/null +++ b/core/src/test/java/org/gagravarr/opus/AbstractOpusTest.java @@ -0,0 +1,42 @@ +/* + * Licensed 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.gagravarr.opus; + +import java.io.IOException; +import java.io.InputStream; + +import junit.framework.TestCase; + +/** + * Parent class of Opus read and write tests + */ +public class AbstractOpusTest extends TestCase { + /** Get a test file created with libopus 0.9.x */ + protected InputStream getTest09File() throws IOException { + return this.getClass().getResourceAsStream("/testOPUS_09.opus"); + } + /** Get a test file created with libopus 1.1.x */ + protected InputStream getTest11File() throws IOException { + return this.getClass().getResourceAsStream("/testOPUS_11.opus"); + } + + protected OpusFile of; + + @Override + protected void tearDown() throws IOException { + if (of != null) { + of.close(); + } + } +} diff --git a/core/src/test/java/org/gagravarr/opus/TestOpusFileRead.java b/core/src/test/java/org/gagravarr/opus/TestOpusFileRead.java index de577b3..c865fc3 100644 --- a/core/src/test/java/org/gagravarr/opus/TestOpusFileRead.java +++ b/core/src/test/java/org/gagravarr/opus/TestOpusFileRead.java @@ -14,33 +14,13 @@ package org.gagravarr.opus; import java.io.IOException; -import java.io.InputStream; - -import junit.framework.TestCase; import org.gagravarr.ogg.OggFile; /** * Tests for reading things using OpusFile */ -public class TestOpusFileRead extends TestCase { - /** Get a test file created with libopus 0.9.x */ - private InputStream getTest09File() throws IOException { - return this.getClass().getResourceAsStream("/testOPUS_09.opus"); - } - /** Get a test file created with libopus 1.1.x */ - private InputStream getTest11File() throws IOException { - return this.getClass().getResourceAsStream("/testOPUS_11.opus"); - } - - private OpusFile of; - @Override - protected void tearDown() throws IOException { - if (of != null) { - of.close(); - } - } - +public class TestOpusFileRead extends AbstractOpusTest { public void testRead09() throws IOException { OggFile ogg = new OggFile(getTest09File()); of = new OpusFile(ogg); diff --git a/core/src/test/java/org/gagravarr/opus/TestOpusFileWrite.java b/core/src/test/java/org/gagravarr/opus/TestOpusFileWrite.java index b8ee4f6..6aa9e95 100644 --- a/core/src/test/java/org/gagravarr/opus/TestOpusFileWrite.java +++ b/core/src/test/java/org/gagravarr/opus/TestOpusFileWrite.java @@ -18,21 +18,12 @@ import java.io.IOException; import java.io.InputStream; -import junit.framework.TestCase; - import org.gagravarr.ogg.OggFile; /** * Tests for round-tripping with OpusFile */ -public class TestOpusFileWrite extends TestCase { - private InputStream getTest09File() throws IOException { - return this.getClass().getResourceAsStream("/testOPUS_09.opus"); - } - private InputStream getTest11File() throws IOException { - return this.getClass().getResourceAsStream("/testOPUS_11.opus"); - } - +public class TestOpusFileWrite extends AbstractOpusTest { public void testReadWrite() throws IOException { OggFile in = new OggFile(getTest09File()); OpusFile opIN = new OpusFile(in);