diff --git a/.gitignore b/.gitignore index 1422232d8..653538131 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,10 @@ target isoparser/aac-sample.mp4 isoparser/ac3-sample.mp4 +/muxer/m2.mp4 +/muxer/output2.mp4 +/streaming/output.mp4 .classpath .project .settings - diff --git a/examples/pom.xml b/examples/pom.xml index 4b37eed4f..f45df6eb2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -35,7 +35,7 @@ commons-io commons-io - 2.5 + 2.21.0 commons-lang diff --git a/isoparser/pom.xml b/isoparser/pom.xml index 3725b4c76..865289866 100644 --- a/isoparser/pom.xml +++ b/isoparser/pom.xml @@ -1,21 +1,16 @@ 4.0.0 - org.mp4parser isoparser jar ISO Parser A generic parser and writer for all ISO 14496 based files (MP4, Quicktime, DCF, PDCF, ...) - https://github.com/sannies/mp4parser - 1.9.57-SNAPSHOT + mp4parser-project org.mp4parser 1.9.57-SNAPSHOT - - UTF-8 - @@ -24,7 +19,6 @@ true - install org.apache.maven.plugins @@ -41,7 +35,6 @@ org.apache.maven.plugins maven-dependency-plugin - 3.3.0 copy-dependencies @@ -62,7 +55,6 @@ org.codehaus.mojo aspectj-maven-plugin - 1.14.0 @@ -70,27 +62,16 @@ - - - - org.aspectj - aspectjtools - 1.9.7 - - - - 9 - 9 - 9 + 1.8 + 1.8 + 1.8 --module-path - ${project.build.directory}/alternateLocation/slf4-api.jar + ${project.build.directory}/alternateLocation/slf4j-api.jar - - @@ -98,42 +79,38 @@ org.aspectj aspectjrt - 1.9.7 - org.slf4j + org.slf4j slf4j-api - 1.8.0-beta4 - org.slf4j slf4j-simple - 1.8.0-beta4 - test - junit - junit - 4.12 - provided + org.junit.jupiter + junit-jupiter + test + + + org.junit.platform + junit-platform-suite + test commons-io commons-io - 2.5 test - + commons-codec commons-codec - 1.10 test - jenkins https://sannies.ci.cloudbees.com/job/IsoParser/ @@ -150,25 +127,4 @@ github https://github.com/sannies/mp4parser/issues - - - - sannies - Sebastian.Annies@gmail.com - - - - - https://github.com/sannies/mp4parser - mp4parser-project-1.9.43 - - - - - Apache Software License - Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - + \ No newline at end of file diff --git a/isoparser/src/test/java/com/coremedia/drm/packager/isoparser/RoundTripTest.java b/isoparser/src/test/java/com/coremedia/drm/packager/isoparser/RoundTripTest.java index c7feba217..2e6d4fa75 100644 --- a/isoparser/src/test/java/com/coremedia/drm/packager/isoparser/RoundTripTest.java +++ b/isoparser/src/test/java/com/coremedia/drm/packager/isoparser/RoundTripTest.java @@ -16,7 +16,8 @@ package com.coremedia.drm.packager.isoparser; -import junit.framework.TestCase; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.support.BoxComparator; import org.mp4parser.tools.ByteBufferByteChannel; @@ -28,12 +29,12 @@ /** * Tests ISO Roundtrip. */ -public class RoundTripTest extends TestCase { +class RoundTripTest { + String defaultTestFileDir; - @Override - protected void setUp() throws Exception { - super.setUp(); + @BeforeEach + void setUp() { defaultTestFileDir = this.getClass().getProtectionDomain().getCodeSource().getLocation().getFile(); /* Logger.getLogger("").setLevel(Level.ALL); Handler[] handlers = Logger.getLogger("").getHandlers(); @@ -42,48 +43,58 @@ protected void setUp() throws Exception { }*/ } - /* public void testRoundDeleteMe() throws Exception { + /* + @Test + void testRoundDeleteMe() throws Exception { testRoundTrip_1("/suckerpunch-distantplanet_h1080p.mov"); }*/ - public void testRoundTrip_TinyExamples_Old() throws Exception { + + @Test + void testRoundTrip_TinyExamples_Old() throws Exception { testRoundTrip_1(defaultTestFileDir + "/Tiny Sample - OLD.mp4"); } - public void testRoundTrip_TinyExamples_Metaxed() throws Exception { + @Test + void testRoundTrip_TinyExamples_Metaxed() throws Exception { testRoundTrip_1(defaultTestFileDir + "/Tiny Sample - NEW - Metaxed.mp4"); } - public void testRoundTrip_TinyExamples_Untouched() throws Exception { + @Test + void testRoundTrip_TinyExamples_Untouched() throws Exception { testRoundTrip_1(defaultTestFileDir + "/Tiny Sample - NEW - Untouched.mp4"); } - - public void testRoundTrip_1a() throws Exception { + @Test + void testRoundTrip_1a() throws Exception { testRoundTrip_1(defaultTestFileDir + "/multiTrack.3gp"); } - public void testRoundTrip_1b() throws Exception { + @Test + void testRoundTrip_1b() throws Exception { testRoundTrip_1(defaultTestFileDir + "/MOV00006.3gp"); } - public void testRoundTrip_1c() throws Exception { + @Test + void testRoundTrip_1c() throws Exception { testRoundTrip_1(defaultTestFileDir + "/Beethoven - Bagatelle op.119 no.11 i.m4a"); } - public void testRoundTrip_1d() throws Exception { + @Test + void testRoundTrip_1d() throws Exception { testRoundTrip_1(defaultTestFileDir + "/test.m4p"); } - public void testRoundTrip_1e() throws Exception { + @Test + void testRoundTrip_1e() throws Exception { testRoundTrip_1(defaultTestFileDir + "/test-pod.m4a"); } - public void testRoundTrip_QuickTimeFormat() throws Exception { + @Test + void testRoundTrip_QuickTimeFormat() throws Exception { testRoundTrip_1(defaultTestFileDir + "/QuickTimeFormat.mp4"); } - - public void testRoundTrip_1(String originalFile) throws Exception { + void testRoundTrip_1(String originalFile) throws Exception { long start1 = System.currentTimeMillis(); long start2 = System.currentTimeMillis(); @@ -116,9 +127,5 @@ public void testRoundTrip_1(String originalFile) throws Exception { copyViaIsoFileReparsed.close(); // as windows cannot delete file when something is memory mapped and the garbage collector // doesn't necessarily free the Buffers quickly enough we cannot delete the file here (we could but only for linux) - - } - - } diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/AbstractTrackEncryptionBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/AbstractTrackEncryptionBoxTest.java index 82d43c33c..03776e746 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/AbstractTrackEncryptionBoxTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/AbstractTrackEncryptionBoxTest.java @@ -1,8 +1,8 @@ package com.googlecode.mp4parser.boxes; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso23001.part7.AbstractTrackEncryptionBox; import org.mp4parser.tools.UUIDConverter; @@ -31,11 +31,11 @@ public void testRoundTrip() throws IOException { fc.close(); IsoFile iso = new IsoFile(new FileInputStream(f).getChannel()); - Assert.assertTrue(iso.getBoxes().get(0) instanceof AbstractTrackEncryptionBox); + Assertions.assertInstanceOf(AbstractTrackEncryptionBox.class, iso.getBoxes().get(0)); AbstractTrackEncryptionBox tenc2 = (AbstractTrackEncryptionBox) iso.getBoxes().get(0); - Assert.assertEquals(0, tenc2.getFlags()); - Assert.assertTrue(tenc.equals(tenc2)); - Assert.assertTrue(tenc2.equals(tenc)); + Assertions.assertEquals(0, tenc2.getFlags()); + Assertions.assertEquals(tenc, tenc2); + Assertions.assertEquals(tenc2, tenc); iso.close(); } diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxRoundtripTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxRoundtripTest.java index 962bca4d7..1bdce3d37 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxRoundtripTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxRoundtripTest.java @@ -1,10 +1,9 @@ package com.googlecode.mp4parser.boxes; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.Parameter; import org.mp4parser.Box; import org.mp4parser.IsoFile; import org.mp4parser.ParsableBox; @@ -22,7 +21,6 @@ import java.util.HashMap; import java.util.Map; -@RunWith(Parameterized.class) public abstract class BoxRoundtripTest { /* @@ -56,20 +54,29 @@ public static Collection data() { "type", "userType", "version"); + String dummyParent = null; - ParsableBox parsableBoxUnderTest; - Map props; - - public BoxRoundtripTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - this.parsableBoxUnderTest = parsableBoxUnderTest; - this.props = new HashMap(); - for (Map.Entry property : properties) { - props.put(property.getKey(), property.getValue()); + + @Parameter(0) + protected ParsableBox parsableBoxUnderTest; + + @Parameter(1) + protected Map.Entry[] properties; + + protected Map props; + + @BeforeEach + void setUp() { + this.props = new HashMap<>(); + if (properties != null) { + for (Map.Entry property : properties) { + props.put(property.getKey(), property.getValue()); + } } } @Test - public void roundtrip() throws Exception { + void roundtrip() throws Exception { BeanInfo beanInfo = Introspector.getBeanInfo(parsableBoxUnderTest.getClass()); PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors(); @@ -81,23 +88,20 @@ public void roundtrip() throws Exception { try { propertyDescriptor.getWriteMethod().invoke(parsableBoxUnderTest, props.get(property)); } catch (IllegalArgumentException e) { - System.err.println(propertyDescriptor.getWriteMethod().getName() + "(" + propertyDescriptor.getWriteMethod().getParameterTypes()[0].getSimpleName() + ");"); System.err.println("Called with " + props.get(property).getClass()); - - throw e; } // do the next assertion on string level to not trap into the long vs java.lang.Long pitfall - Assert.assertEquals("The symmetry between getter/setter of " + property + " is not given.", props.get(property), propertyDescriptor.getReadMethod().invoke(parsableBoxUnderTest)); + Assertions.assertEquals(props.get(property), propertyDescriptor.getReadMethod().invoke(parsableBoxUnderTest), + "The symmetry between getter/setter of " + property + " is not given."); } } if (!found) { - Assert.fail("Could not find any property descriptor for " + property); + Assertions.fail("Could not find any property descriptor for " + property); } } - ByteArrayOutputStream baos = new ByteArrayOutputStream(); WritableByteChannel wbc = Channels.newChannel(baos); parsableBoxUnderTest.getBox(wbc); @@ -106,35 +110,42 @@ public void roundtrip() throws Exception { IsoFile singleBoxIsoFile = new IsoFile(new ByteBufferByteChannel(baos.toByteArray())); - Assert.assertEquals("Expected box and file size to be the same", parsableBoxUnderTest.getSize(), baos.size()); - Assert.assertEquals("Expected a single box in the IsoFile structure", 1, singleBoxIsoFile.getBoxes().size()); - Assert.assertEquals("Expected to find a box of different type ", parsableBoxUnderTest.getClass(), singleBoxIsoFile.getBoxes().get(0).getClass()); + Assertions.assertEquals(parsableBoxUnderTest.getSize(), baos.size(), + "Expected box and file size to be the same"); + Assertions.assertEquals(1, singleBoxIsoFile.getBoxes().size(), + "Expected a single box in the IsoFile structure"); + Assertions.assertEquals(parsableBoxUnderTest.getClass(), singleBoxIsoFile.getBoxes().get(0).getClass(), + "Expected to find a box of different type "); Box parsedBox = singleBoxIsoFile.getBoxes().get(0); - for (String property : props.keySet()) { boolean found = false; for (PropertyDescriptor propertyDescriptor : propertyDescriptors) { if (property.equals(propertyDescriptor.getName())) { found = true; if (props.get(property) instanceof int[]) { - Assert.assertArrayEquals("Writing and parsing changed the value of " + property, (int[]) props.get(property), (int[]) propertyDescriptor.getReadMethod().invoke(parsedBox)); + Assertions.assertArrayEquals((int[]) props.get(property), (int[]) propertyDescriptor.getReadMethod().invoke(parsedBox), + "Writing and parsing changed the value of " + property); } else if (props.get(property) instanceof byte[]) { - Assert.assertArrayEquals("Writing and parsing changed the value of " + property, (byte[]) props.get(property), (byte[]) propertyDescriptor.getReadMethod().invoke(parsedBox)); + Assertions.assertArrayEquals((byte[]) props.get(property), (byte[]) propertyDescriptor.getReadMethod().invoke(parsedBox), + "Writing and parsing changed the value of " + property); } else if (props.get(property) instanceof long[]) { - Assert.assertArrayEquals("Writing and parsing changed the value of " + property, (long[]) props.get(property), (long[]) propertyDescriptor.getReadMethod().invoke(parsedBox)); + Assertions.assertArrayEquals((long[]) props.get(property), (long[]) propertyDescriptor.getReadMethod().invoke(parsedBox), + "Writing and parsing changed the value of " + property); } else { - Assert.assertEquals("Writing and parsing changed the value of " + property, props.get(property), propertyDescriptor.getReadMethod().invoke(parsedBox)); + Assertions.assertEquals(props.get(property), propertyDescriptor.getReadMethod().invoke(parsedBox), + "Writing and parsing changed the value of " + property); } } } if (!found) { - Assert.fail("Could not find any property descriptor for " + property); + Assertions.fail("Could not find any property descriptor for " + property); } } - Assert.assertEquals("Writing and parsing should not change the box size.", parsableBoxUnderTest.getSize(), parsedBox.getSize()); + Assertions.assertEquals(parsableBoxUnderTest.getSize(), parsedBox.getSize(), + "Writing and parsing should not change the box size."); boolean output = false; for (PropertyDescriptor propertyDescriptor : propertyDescriptors) { @@ -148,7 +159,6 @@ public void roundtrip() throws Exception { } } } - } protected static class E implements Map.Entry { diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxWriteReadBase.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxWriteReadBase.java index 1bb0c8f71..4425eda06 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxWriteReadBase.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxWriteReadBase.java @@ -1,8 +1,7 @@ package com.googlecode.mp4parser.boxes; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.ParsableBox; import org.mp4parser.PropertyBoxParserImpl; import org.mp4parser.support.AbstractContainerBox; @@ -54,7 +53,7 @@ protected T getInstance(Class clazz) throws Exception { } @Test - public void roundtrip() throws Exception { + void roundtrip() throws Exception { Class clazz = getBoxUnderTest(); T box = getInstance(clazz); BeanInfo beanInfo = Introspector.getBeanInfo(box.getClass()); @@ -73,19 +72,18 @@ public void roundtrip() throws Exception { System.err.println(propertyDescriptor.getWriteMethod().getName() + "(" + propertyDescriptor.getWriteMethod().getParameterTypes()[0].getSimpleName() + ");"); System.err.println("Called with " + props.get(property).getClass()); - throw e; } // do the next assertion on string level to not trap into the long vs java.lang.Long pitfall - Assert.assertEquals("The symmetry between getter/setter of " + property + " is not given.", props.get(property), propertyDescriptor.getReadMethod().invoke(box)); + Assertions.assertEquals(props.get(property), propertyDescriptor.getReadMethod().invoke(box), + "The symmetry between getter/setter of " + property + " is not given."); } } if (!found) { - Assert.fail("Could not find any property descriptor for " + property); + Assertions.fail("Could not find any property descriptor for " + property); } } - ByteArrayOutputStream baos = new ByteArrayOutputStream(); WritableByteChannel wbc = Channels.newChannel(baos); box.getBox(wbc); @@ -94,35 +92,50 @@ public void roundtrip() throws Exception { DummyContainerBox singleBoxIsoFile = new DummyContainerBox(dummyParent); singleBoxIsoFile.initContainer(new ByteBufferByteChannel(baos.toByteArray()), baos.size(), new PropertyBoxParserImpl()); - Assert.assertEquals("Expected box and file size to be the same", box.getSize(), baos.size()); - Assert.assertEquals("Expected a single box in the IsoFile structure", 1, singleBoxIsoFile.getBoxes().size()); - Assert.assertEquals("Expected to find a box of different type ", clazz, singleBoxIsoFile.getBoxes().get(0).getClass()); + Assertions.assertEquals(box.getSize(), baos.size(), + "Expected box and file size to be the same"); + Assertions.assertEquals(1, singleBoxIsoFile.getBoxes().size(), + "Expected a single box in the IsoFile structure"); + Assertions.assertEquals(clazz, singleBoxIsoFile.getBoxes().get(0).getClass(), + "Expected to find a box of different type "); T parsedBox = (T) singleBoxIsoFile.getBoxes().get(0); - for (String property : props.keySet()) { boolean found = false; for (PropertyDescriptor propertyDescriptor : propertyDescriptors) { if (property.equals(propertyDescriptor.getName())) { found = true; if (props.get(property) instanceof int[]) { - Assert.assertArrayEquals("Writing and parsing changed the value of " + property, (int[]) props.get(property), (int[]) propertyDescriptor.getReadMethod().invoke(parsedBox)); + Assertions.assertArrayEquals( + (int[]) props.get(property), + (int[]) propertyDescriptor.getReadMethod().invoke(parsedBox), + "Writing and parsing changed the value of " + property); } else if (props.get(property) instanceof byte[]) { - Assert.assertArrayEquals("Writing and parsing changed the value of " + property, (byte[]) props.get(property), (byte[]) propertyDescriptor.getReadMethod().invoke(parsedBox)); + Assertions.assertArrayEquals( + (byte[]) props.get(property), + (byte[]) propertyDescriptor.getReadMethod().invoke(parsedBox), + "Writing and parsing changed the value of " + property); } else if (props.get(property) instanceof long[]) { - Assert.assertArrayEquals("Writing and parsing changed the value of " + property, (long[]) props.get(property), (long[]) propertyDescriptor.getReadMethod().invoke(parsedBox)); + Assertions.assertArrayEquals( + (long[]) props.get(property), + (long[]) propertyDescriptor.getReadMethod().invoke(parsedBox), + "Writing and parsing changed the value of " + property); } else { - Assert.assertEquals("Writing and parsing changed the value of " + property, props.get(property), (Object) propertyDescriptor.getReadMethod().invoke(parsedBox)); + Assertions.assertEquals( + props.get(property), + (Object) propertyDescriptor.getReadMethod().invoke(parsedBox), + "Writing and parsing changed the value of " + property); } } } if (!found) { - Assert.fail("Could not find any property descriptor for " + property); + Assertions.fail("Could not find any property descriptor for " + property); } } - Assert.assertEquals("Writing and parsing should not change the box size.", box.getSize(), parsedBox.getSize()); + Assertions.assertEquals(box.getSize(), parsedBox.getSize(), + "Writing and parsing should not change the box size."); boolean output = false; for (PropertyDescriptor propertyDescriptor : propertyDescriptors) { @@ -136,7 +149,6 @@ public void roundtrip() throws Exception { } } } - } class DummyContainerBox extends AbstractContainerBox { diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/basemediaformat/TrackEncryptionBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/basemediaformat/TrackEncryptionBoxTest.java index d1597f3d8..bad5d780e 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/basemediaformat/TrackEncryptionBoxTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/basemediaformat/TrackEncryptionBoxTest.java @@ -1,14 +1,14 @@ package com.googlecode.mp4parser.boxes.basemediaformat; import com.googlecode.mp4parser.boxes.AbstractTrackEncryptionBoxTest; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.mp4parser.boxes.iso23001.part7.TrackEncryptionBox; public class TrackEncryptionBoxTest extends AbstractTrackEncryptionBoxTest { - @Before + @BeforeEach public void setUp() throws Exception { tenc = new TrackEncryptionBox(); } diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/mp4/ESDescriptorBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/mp4/ESDescriptorBoxTest.java index 58d83ce4d..e28478c6b 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/mp4/ESDescriptorBoxTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/mp4/ESDescriptorBoxTest.java @@ -1,6 +1,6 @@ package com.googlecode.mp4parser.boxes.mp4; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part14.ESDescriptorBox; import org.mp4parser.tools.ByteBufferByteChannel; diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/piff/PiffSampleEncryptionBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/piff/PiffSampleEncryptionBoxTest.java index d4245bd9c..5f5949a83 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/piff/PiffSampleEncryptionBoxTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/piff/PiffSampleEncryptionBoxTest.java @@ -1,7 +1,7 @@ package com.googlecode.mp4parser.boxes.piff; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso23001.part7.AbstractSampleEncryptionBox; import org.mp4parser.boxes.iso23001.part7.CencSampleAuxiliaryDataFormat; @@ -39,17 +39,17 @@ public void testRoundTripFlagsZero() throws IOException { FileChannel fc = new FileOutputStream(f).getChannel(); senc.getBox(fc); fc.close(); - Assert.assertEquals(f.length(), senc.getSize()); + Assertions.assertEquals(f.length(), senc.getSize()); IsoFile iso = new IsoFile(new FileInputStream(f).getChannel()); - Assert.assertTrue(iso.getBoxes().get(0) instanceof AbstractSampleEncryptionBox); + Assertions.assertInstanceOf(AbstractSampleEncryptionBox.class, iso.getBoxes().get(0)); AbstractSampleEncryptionBox senc2 = (AbstractSampleEncryptionBox) iso.getBoxes().get(0); - Assert.assertEquals(0, senc2.getFlags()); - Assert.assertTrue(senc.equals(senc2)); - Assert.assertTrue(senc2.equals(senc)); + Assertions.assertEquals(0, senc2.getFlags()); + Assertions.assertEquals(senc, senc2); + Assertions.assertEquals(senc2, senc); } @@ -74,11 +74,11 @@ public void testRoundTripFlagsOne() throws IOException { IsoFile iso = new IsoFile(new FileInputStream(f).getChannel()); - Assert.assertTrue(iso.getBoxes().get(0) instanceof AbstractSampleEncryptionBox); + Assertions.assertInstanceOf(AbstractSampleEncryptionBox.class, iso.getBoxes().get(0)); AbstractSampleEncryptionBox senc2 = (AbstractSampleEncryptionBox) iso.getBoxes().get(0); - Assert.assertEquals(1, senc2.getFlags()); - Assert.assertTrue(senc.equals(senc2)); - Assert.assertTrue(senc2.equals(senc)); + Assertions.assertEquals(1, senc2.getFlags()); + Assertions.assertEquals(senc, senc2); + Assertions.assertEquals(senc2, senc); } @Test @@ -106,11 +106,11 @@ public void testRoundTripFlagsTwo() throws IOException { IsoFile iso = new IsoFile(new FileInputStream(f).getChannel()); - Assert.assertTrue(iso.getBoxes().get(0) instanceof AbstractSampleEncryptionBox); + Assertions.assertInstanceOf(AbstractSampleEncryptionBox.class, iso.getBoxes().get(0)); AbstractSampleEncryptionBox senc2 = (AbstractSampleEncryptionBox) iso.getBoxes().get(0); - Assert.assertEquals(2, senc2.getFlags()); - Assert.assertTrue(senc.equals(senc2)); - Assert.assertTrue(senc2.equals(senc)); + Assertions.assertEquals(2, senc2.getFlags()); + Assertions.assertEquals(senc, senc2); + Assertions.assertEquals(senc2, senc); } @@ -145,10 +145,10 @@ public void testRoundTripFlagsThree() throws IOException { IsoFile iso = new IsoFile(new FileInputStream(f).getChannel()); - Assert.assertTrue(iso.getBoxes().get(0) instanceof AbstractSampleEncryptionBox); + Assertions.assertInstanceOf(AbstractSampleEncryptionBox.class, iso.getBoxes().get(0)); AbstractSampleEncryptionBox senc2 = (AbstractSampleEncryptionBox) iso.getBoxes().get(0); - Assert.assertEquals(3, senc2.getFlags()); - Assert.assertTrue(senc.equals(senc2)); - Assert.assertTrue(senc2.equals(senc)); + Assertions.assertEquals(3, senc2.getFlags()); + Assertions.assertEquals(senc, senc2); + Assertions.assertEquals(senc2, senc); } } diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/piff/PiffTrackEncryptionBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/piff/PiffTrackEncryptionBoxTest.java index 6b96dcd13..7176972df 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/piff/PiffTrackEncryptionBoxTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/piff/PiffTrackEncryptionBoxTest.java @@ -1,14 +1,14 @@ package com.googlecode.mp4parser.boxes.piff; import com.googlecode.mp4parser.boxes.AbstractTrackEncryptionBoxTest; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.mp4parser.boxes.microsoft.PiffTrackEncryptionBox; public class PiffTrackEncryptionBoxTest extends AbstractTrackEncryptionBoxTest { - @Before + @BeforeEach public void setUp() throws Exception { tenc = new PiffTrackEncryptionBox(); } diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBoxTest.java index f32776d7d..469a66649 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBoxTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBoxTest.java @@ -1,22 +1,18 @@ package com.googlecode.mp4parser.boxes.ultraviolet; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.dece.AssetInformationBox; import java.util.Arrays; import java.util.Collection; import java.util.Map; - +@ParameterizedClass +@MethodSource("data") public class AssetInformationBoxTest extends BoxRoundtripTest { - public AssetInformationBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { return Arrays.asList( new Object[]{new AssetInformationBox(), diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/SampleEncryptionBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/SampleEncryptionBoxTest.java index 81aaa1849..60aaa8748 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/SampleEncryptionBoxTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/SampleEncryptionBoxTest.java @@ -1,7 +1,7 @@ package com.googlecode.mp4parser.boxes.ultraviolet; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso23001.part7.AbstractSampleEncryptionBox; import org.mp4parser.boxes.iso23001.part7.CencSampleAuxiliaryDataFormat; @@ -37,17 +37,17 @@ public void testRoundTripFlagsZero() throws IOException { FileChannel fc = new FileOutputStream(f).getChannel(); senc.getBox(fc); fc.close(); - Assert.assertEquals(f.length(), senc.getSize()); + Assertions.assertEquals(f.length(), senc.getSize()); IsoFile iso = new IsoFile(new FileInputStream(f).getChannel()); - Assert.assertTrue(iso.getBoxes().get(0) instanceof AbstractSampleEncryptionBox); + Assertions.assertInstanceOf(AbstractSampleEncryptionBox.class, iso.getBoxes().get(0)); AbstractSampleEncryptionBox senc2 = (AbstractSampleEncryptionBox) iso.getBoxes().get(0); - Assert.assertEquals(0, senc2.getFlags()); - Assert.assertTrue(senc.equals(senc2)); - Assert.assertTrue(senc2.equals(senc)); + Assertions.assertEquals(0, senc2.getFlags()); + Assertions.assertEquals(senc, senc2); + Assertions.assertEquals(senc2, senc); } @@ -76,11 +76,11 @@ public void testRoundTripFlagsTwo() throws IOException { IsoFile iso = new IsoFile(new FileInputStream(f).getChannel()); - Assert.assertTrue(iso.getBoxes().get(0) instanceof AbstractSampleEncryptionBox); + Assertions.assertInstanceOf(AbstractSampleEncryptionBox.class, iso.getBoxes().get(0)); AbstractSampleEncryptionBox senc2 = (AbstractSampleEncryptionBox) iso.getBoxes().get(0); - Assert.assertEquals(2, senc2.getFlags()); - Assert.assertTrue(senc.equals(senc2)); - Assert.assertTrue(senc2.equals(senc)); + Assertions.assertEquals(2, senc2.getFlags()); + Assertions.assertEquals(senc, senc2); + Assertions.assertEquals(senc2, senc); } diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/miscrepro/InitDataChromeCenc.java b/isoparser/src/test/java/com/googlecode/mp4parser/miscrepro/InitDataChromeCenc.java index 6a95b92b2..530976bc7 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/miscrepro/InitDataChromeCenc.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/miscrepro/InitDataChromeCenc.java @@ -2,7 +2,7 @@ import com.coremedia.drm.packager.isoparser.Walk; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.tools.ByteBufferByteChannel; import org.mp4parser.tools.Hex; diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/miscrepro/WeirdISMVTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/miscrepro/WeirdISMVTest.java index af0c9adcd..c2fcd6a81 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/miscrepro/WeirdISMVTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/miscrepro/WeirdISMVTest.java @@ -1,7 +1,7 @@ package com.googlecode.mp4parser.miscrepro; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.sampleentry.AudioSampleEntry; import org.mp4parser.tools.ByteBufferByteChannel; @@ -23,7 +23,7 @@ public void checkMikesStream() throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); isoFile.getBox(Channels.newChannel(baos)); - Assert.assertArrayEquals(data, baos.toByteArray()); + Assertions.assertArrayEquals(data, baos.toByteArray()); // List b = ((Container)isoFile.getMovieBox().getBoxes().get(1)).getBoxes().get(1).getBoxes().get(2).getBoxes().get(2).getBoxes().get(0).getBoxes(); } diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/util/RangeStartMapTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/util/RangeStartMapTest.java index 5bea3aa58..0ae7a5eb3 100644 --- a/isoparser/src/test/java/com/googlecode/mp4parser/util/RangeStartMapTest.java +++ b/isoparser/src/test/java/com/googlecode/mp4parser/util/RangeStartMapTest.java @@ -1,7 +1,7 @@ package com.googlecode.mp4parser.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.tools.RangeStartMap; public class RangeStartMapTest { @@ -14,18 +14,18 @@ public void basicTest() { a.put(20, null); a.put(30, "Dreißig"); - Assert.assertEquals("Null", a.get(0)); - Assert.assertEquals("Null", a.get(1)); - Assert.assertEquals("Null", a.get(9)); - Assert.assertEquals("Zehn", a.get(10)); - Assert.assertEquals("Zehn", a.get(11)); - Assert.assertEquals("Zehn", a.get(19)); - Assert.assertEquals(null, a.get(20)); - Assert.assertEquals(null, a.get(21)); - Assert.assertEquals(null, a.get(29)); - Assert.assertEquals("Dreißig", a.get(30)); - Assert.assertEquals("Dreißig", a.get(31)); - Assert.assertEquals("Dreißig", a.get(Integer.MAX_VALUE)); + Assertions.assertEquals("Null", a.get(0)); + Assertions.assertEquals("Null", a.get(1)); + Assertions.assertEquals("Null", a.get(9)); + Assertions.assertEquals("Zehn", a.get(10)); + Assertions.assertEquals("Zehn", a.get(11)); + Assertions.assertEquals("Zehn", a.get(19)); + Assertions.assertNull(a.get(20)); + Assertions.assertNull(a.get(21)); + Assertions.assertNull(a.get(29)); + Assertions.assertEquals("Dreißig", a.get(30)); + Assertions.assertEquals("Dreißig", a.get(31)); + Assertions.assertEquals("Dreißig", a.get(Integer.MAX_VALUE)); } } \ No newline at end of file diff --git a/isoparser/src/test/java/org/mp4parser/test/PropertyBoxParserImplTest.java b/isoparser/src/test/java/org/mp4parser/test/PropertyBoxParserImplTest.java index 3ee3ca152..8fe01f84d 100644 --- a/isoparser/src/test/java/org/mp4parser/test/PropertyBoxParserImplTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/PropertyBoxParserImplTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.PropertyBoxParserImpl; public class PropertyBoxParserImplTest { @@ -11,7 +11,7 @@ public class PropertyBoxParserImplTest { public void test_isoparser_custom_properties() { PropertyBoxParserImpl.BOX_MAP_CACHE = null; PropertyBoxParserImpl bp = new PropertyBoxParserImpl(); - Assert.assertEquals("b", bp.mapping.get("a")); + Assertions.assertEquals("b", bp.mapping.get("a")); } } diff --git a/isoparser/src/test/java/org/mp4parser/test/SkippingBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/SkippingBoxTest.java index 60000a596..b5712415d 100644 --- a/isoparser/src/test/java/org/mp4parser/test/SkippingBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/SkippingBoxTest.java @@ -1,14 +1,14 @@ package org.mp4parser.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.FileInputStream; import java.io.IOException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mp4parser.Box; import org.mp4parser.IsoFile; import org.mp4parser.PropertyBoxParserImpl; @@ -22,7 +22,7 @@ public class SkippingBoxTest { private IsoFile isoFile; - @Before + @BeforeEach public void setup() throws IOException { FileInputStream fis = new FileInputStream(PathTest.class.getProtectionDomain().getCodeSource().getLocation().getFile() + "/test.m4p"); isoFile = new IsoFile(fis.getChannel(), new PropertyBoxParserImpl().skippingBoxes("mdat", "mvhd")); diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/apple/Apple_geIDBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/apple/Apple_geIDBoxTest.java index 8ebbffd17..789f7cbaa 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/apple/Apple_geIDBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/apple/Apple_geIDBoxTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.boxes.apple; import com.googlecode.mp4parser.boxes.BoxWriteReadBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.apple.Apple_geIDBox; import org.mp4parser.tools.ByteBufferByteChannel; diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/apple/TimeCodeBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/apple/TimeCodeBoxTest.java index 97bf53d8f..b11671cc8 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/apple/TimeCodeBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/apple/TimeCodeBoxTest.java @@ -3,7 +3,7 @@ import com.googlecode.mp4parser.boxes.BoxWriteReadBase; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.apple.TimeCodeBox; diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/dece/ContentInformationBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/dece/ContentInformationBoxTest.java index 2bf8ecb76..f6d88cec7 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/dece/ContentInformationBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/dece/ContentInformationBoxTest.java @@ -1,19 +1,16 @@ package org.mp4parser.test.boxes.dece; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.dece.ContentInformationBox; import java.util.*; +@ParameterizedClass +@MethodSource("data") public class ContentInformationBoxTest extends BoxRoundtripTest { - public ContentInformationBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { Map aBrandEntries = new LinkedHashMap(); aBrandEntries.put("abcd", "561326"); diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part1/objectdescriptors/BitReaderBufferTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part1/objectdescriptors/BitReaderBufferTest.java index f01889446..a96aa87b2 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part1/objectdescriptors/BitReaderBufferTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part1/objectdescriptors/BitReaderBufferTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.boxes.iso14496.part1.objectdescriptors; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.boxes.iso14496.part1.objectdescriptors.BitReaderBuffer; import java.nio.ByteBuffer; @@ -14,48 +14,48 @@ public void readFromTheMiddle() { ByteBuffer b = ByteBuffer.wrap(new byte[]{0, -1}); b.get(); BitReaderBuffer brb = new BitReaderBuffer(b); - Assert.assertEquals(15, brb.readBits(4)); - Assert.assertEquals(15, brb.readBits(4)); + Assertions.assertEquals(15, brb.readBits(4)); + Assertions.assertEquals(15, brb.readBits(4)); } @Test public void testRead_8() { BitReaderBuffer bitReaderBuffer = new BitReaderBuffer(testSequence); - Assert.assertEquals(15, bitReaderBuffer.readBits(4)); - Assert.assertEquals(15, bitReaderBuffer.readBits(4)); - Assert.assertEquals(0, bitReaderBuffer.readBits(4)); - Assert.assertEquals(0, bitReaderBuffer.readBits(4)); + Assertions.assertEquals(15, bitReaderBuffer.readBits(4)); + Assertions.assertEquals(15, bitReaderBuffer.readBits(4)); + Assertions.assertEquals(0, bitReaderBuffer.readBits(4)); + Assertions.assertEquals(0, bitReaderBuffer.readBits(4)); } @Test public void testReadCrossByte() { BitReaderBuffer bitReaderBuffer = new BitReaderBuffer(testSequence); - Assert.assertEquals(31, bitReaderBuffer.readBits(5)); - Assert.assertEquals(14, bitReaderBuffer.readBits(4)); - Assert.assertEquals(0, bitReaderBuffer.readBits(3)); - Assert.assertEquals(0, bitReaderBuffer.readBits(4)); + Assertions.assertEquals(31, bitReaderBuffer.readBits(5)); + Assertions.assertEquals(14, bitReaderBuffer.readBits(4)); + Assertions.assertEquals(0, bitReaderBuffer.readBits(3)); + Assertions.assertEquals(0, bitReaderBuffer.readBits(4)); } @Test public void testReadMultiByte() { BitReaderBuffer bitReaderBuffer = new BitReaderBuffer(testSequence); - Assert.assertEquals(510, bitReaderBuffer.readBits(9)); + Assertions.assertEquals(510, bitReaderBuffer.readBits(9)); } @Test public void testReadMultiByte2() { BitReaderBuffer bitReaderBuffer = new BitReaderBuffer(testSequence); - Assert.assertEquals(0x1fe01, bitReaderBuffer.readBits(17)); + Assertions.assertEquals(0x1fe01, bitReaderBuffer.readBits(17)); } @Test public void testRemainingBits() { BitReaderBuffer bitReaderBuffer = new BitReaderBuffer(testSequence); - Assert.assertEquals(32, bitReaderBuffer.remainingBits()); + Assertions.assertEquals(32, bitReaderBuffer.remainingBits()); int six = 6; bitReaderBuffer.readBits(six); - Assert.assertEquals(32 - six, bitReaderBuffer.remainingBits()); + Assertions.assertEquals(32 - six, bitReaderBuffer.remainingBits()); } } diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part1/objectdescriptors/BitWriterBufferTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part1/objectdescriptors/BitWriterBufferTest.java index fb7269d0a..4c0d6a487 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part1/objectdescriptors/BitWriterBufferTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part1/objectdescriptors/BitWriterBufferTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.boxes.iso14496.part1.objectdescriptors; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.boxes.iso14496.part1.objectdescriptors.BitWriterBuffer; import org.mp4parser.tools.IsoTypeReader; @@ -37,7 +37,7 @@ public void testWriteWithinBuffer() { b.put((byte) 0); BitWriterBuffer bwb = new BitWriterBuffer(b); bwb.writeBits(15, 4); - Assert.assertEquals("0000000011110000", toString(b)); + Assertions.assertEquals("0000000011110000", toString(b)); } @@ -48,7 +48,7 @@ public void testSimple() { bitWriterBuffer.writeBits(15, 4); ((Buffer)bb).rewind(); int test = IsoTypeReader.readUInt8(bb); - Assert.assertEquals(15 << 4, test); + Assertions.assertEquals(15 << 4, test); } @Test @@ -60,9 +60,9 @@ public void testSimpleOnByteBorder() { bitWriterBuffer.writeBits(15, 4); ((Buffer)bb).rewind(); int test = IsoTypeReader.readUInt8(bb); - Assert.assertEquals(255, test); + Assertions.assertEquals(255, test); test = IsoTypeReader.readUInt8(bb); - Assert.assertEquals(15 << 4, test); + Assertions.assertEquals(15 << 4, test); } @Test @@ -74,7 +74,7 @@ public void testSimpleCrossByteBorder() { bitWriterBuffer.writeBits(1, 5); bitWriterBuffer.writeBits(1, 3); - Assert.assertEquals("0001000010010000", toString(bb)); + Assertions.assertEquals("0001000010010000", toString(bb)); } @Test @@ -85,11 +85,11 @@ public void testMultiByte() { bitWriterBuffer.writeBits(65535, 16); ((Buffer)bb).rewind(); int test = IsoTypeReader.readUInt8(bb); - Assert.assertEquals(127, test); + Assertions.assertEquals(127, test); test = IsoTypeReader.readUInt8(bb); - Assert.assertEquals(255, test); + Assertions.assertEquals(255, test); test = IsoTypeReader.readUInt8(bb); - Assert.assertEquals(1 << 7, test); + Assertions.assertEquals(1 << 7, test); } @Test @@ -101,7 +101,7 @@ public void testPattern() { bwb.writeBits(1, 3); bwb.writeBits(1, 2); - Assert.assertEquals("10100101", toString(bb)); + Assertions.assertEquals("10100101", toString(bb)); } @Test @@ -116,7 +116,7 @@ public void testWriterReaderRoundTrip() { bwb.writeBits(7, 6); ((Buffer)b).rewind(); - Assert.assertEquals("101001000100001000111000", toString(b)); + Assertions.assertEquals("101001000100001000111000", toString(b)); } diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/BitRateBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/BitRateBoxTest.java index 317307ccd..f9ed433ae 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/BitRateBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/BitRateBoxTest.java @@ -1,24 +1,19 @@ package org.mp4parser.test.boxes.iso14496.part12; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part12.BitRateBox; import java.util.Collection; import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class BitRateBoxTest extends BoxRoundtripTest { - public BitRateBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { - - return Collections.singletonList( new Object[]{new BitRateBox(), new Map.Entry[]{ diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/DegradationPriorityBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/DegradationPriorityBoxTest.java index e8ac71f6a..afeac56b7 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/DegradationPriorityBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/DegradationPriorityBoxTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.boxes.iso14496.part12; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part12.DegradationPriorityBox; import java.util.Collection; @@ -12,13 +12,10 @@ /** * Created by sannies on 06.08.2015. */ +@ParameterizedClass +@MethodSource("data") public class DegradationPriorityBoxTest extends BoxRoundtripTest { - public DegradationPriorityBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/HintSampleEntryTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/HintSampleEntryTest.java index 1230006ef..ebf53a62f 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/HintSampleEntryTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/HintSampleEntryTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.boxes.iso14496.part12; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part12.HintSampleEntry; import java.util.Collection; @@ -12,12 +12,10 @@ /** * Created by sannies on 14.07.2015. */ +@ParameterizedClass +@MethodSource("data") public class HintSampleEntryTest extends BoxRoundtripTest { - public HintSampleEntryTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/ItemLocationBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/ItemLocationBoxTest.java index 1b5600b94..0cddfd546 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/ItemLocationBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/ItemLocationBoxTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.boxes.iso14496.part12; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part12.ItemLocationBox; import org.mp4parser.tools.ByteBufferByteChannel; @@ -51,11 +51,11 @@ public void testSimpleRoundTrip(int baseOffsetSize, int indexSize, int lengthSiz ItemLocationBox iloc = (ItemLocationBox) isoFile.getBoxes().get(0); - Assert.assertEquals(ilocOrig.getBaseOffsetSize(), iloc.getBaseOffsetSize()); - Assert.assertEquals(ilocOrig.getIndexSize(), iloc.getIndexSize()); - Assert.assertEquals(ilocOrig.getLengthSize(), iloc.getLengthSize()); - Assert.assertEquals(ilocOrig.getOffsetSize(), iloc.getOffsetSize()); - Assert.assertEquals(ilocOrig.getItems(), iloc.getItems()); + Assertions.assertEquals(ilocOrig.getBaseOffsetSize(), iloc.getBaseOffsetSize()); + Assertions.assertEquals(ilocOrig.getIndexSize(), iloc.getIndexSize()); + Assertions.assertEquals(ilocOrig.getLengthSize(), iloc.getLengthSize()); + Assertions.assertEquals(ilocOrig.getOffsetSize(), iloc.getOffsetSize()); + Assertions.assertEquals(ilocOrig.getItems(), iloc.getItems()); } @@ -90,11 +90,11 @@ public void testSimpleRoundWithEntriesTrip(int baseOffsetSize, int indexSize, in ItemLocationBox iloc = (ItemLocationBox) isoFile.getBoxes().get(0); - Assert.assertEquals(ilocOrig.getBaseOffsetSize(), iloc.getBaseOffsetSize()); - Assert.assertEquals(ilocOrig.getIndexSize(), iloc.getIndexSize()); - Assert.assertEquals(ilocOrig.getLengthSize(), iloc.getLengthSize()); - Assert.assertEquals(ilocOrig.getOffsetSize(), iloc.getOffsetSize()); - Assert.assertEquals(ilocOrig.getItems(), iloc.getItems()); + Assertions.assertEquals(ilocOrig.getBaseOffsetSize(), iloc.getBaseOffsetSize()); + Assertions.assertEquals(ilocOrig.getIndexSize(), iloc.getIndexSize()); + Assertions.assertEquals(ilocOrig.getLengthSize(), iloc.getLengthSize()); + Assertions.assertEquals(ilocOrig.getOffsetSize(), iloc.getOffsetSize()); + Assertions.assertEquals(ilocOrig.getItems(), iloc.getItems()); } @@ -135,11 +135,11 @@ public void testSimpleRoundWithEntriesAndExtentsTrip(int baseOffsetSize, int ind ItemLocationBox iloc = (ItemLocationBox) isoFile.getBoxes().get(0); - Assert.assertEquals(ilocOrig.getBaseOffsetSize(), iloc.getBaseOffsetSize()); - Assert.assertEquals(ilocOrig.getIndexSize(), iloc.getIndexSize()); - Assert.assertEquals(ilocOrig.getLengthSize(), iloc.getLengthSize()); - Assert.assertEquals(ilocOrig.getOffsetSize(), iloc.getOffsetSize()); - Assert.assertEquals(ilocOrig.getItems(), iloc.getItems()); + Assertions.assertEquals(ilocOrig.getBaseOffsetSize(), iloc.getBaseOffsetSize()); + Assertions.assertEquals(ilocOrig.getIndexSize(), iloc.getIndexSize()); + Assertions.assertEquals(ilocOrig.getLengthSize(), iloc.getLengthSize()); + Assertions.assertEquals(ilocOrig.getOffsetSize(), iloc.getOffsetSize()); + Assertions.assertEquals(ilocOrig.getItems(), iloc.getItems()); } @@ -162,11 +162,11 @@ public void testExtent(int a, int b, int c, int d) throws IOException { ItemLocationBox.Extent e1 = iloc.createExtent(123, 124, 125); ByteBuffer bb = ByteBuffer.allocate(e1.getSize()); e1.getContent(bb); - Assert.assertTrue(bb.remaining() == 0); + Assertions.assertEquals(0, bb.remaining()); ((Buffer)bb).rewind(); ItemLocationBox.Extent e2 = iloc.createExtent(bb); - Assert.assertEquals(e1, e2); + Assertions.assertEquals(e1, e2); } @@ -189,11 +189,11 @@ public void testItem(int a, int b, int c, int d) throws IOException { ItemLocationBox.Item e1 = iloc.createItem(65, 1, 0, 66, Collections.emptyList()); ByteBuffer bb = ByteBuffer.allocate(e1.getSize()); e1.getContent(bb); - Assert.assertTrue(bb.remaining() == 0); + Assertions.assertEquals(0, bb.remaining()); ((Buffer)bb).rewind(); ItemLocationBox.Item e2 = iloc.createItem(bb); - Assert.assertEquals(e1, e2); + Assertions.assertEquals(e1, e2); } @@ -216,11 +216,11 @@ public void testItemVersionZero(int a, int b, int c, int d) throws IOException { ItemLocationBox.Item e1 = iloc.createItem(65, 0, 1, 66, Collections.emptyList()); ByteBuffer bb = ByteBuffer.allocate(e1.getSize()); e1.getContent(bb); - Assert.assertTrue(bb.remaining() == 0); + Assertions.assertEquals(0, bb.remaining()); ((Buffer)bb).rewind(); ItemLocationBox.Item e2 = iloc.createItem(bb); - Assert.assertEquals(e1, e2); + Assertions.assertEquals(e1, e2); } diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/SampleAuxiliaryInformationOffsetsBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/SampleAuxiliaryInformationOffsetsBoxTest.java index cbb34109f..f9c67ff44 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/SampleAuxiliaryInformationOffsetsBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/SampleAuxiliaryInformationOffsetsBoxTest.java @@ -1,20 +1,18 @@ package org.mp4parser.test.boxes.iso14496.part12; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part12.SampleAuxiliaryInformationOffsetsBox; import java.util.Arrays; import java.util.Collection; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class SampleAuxiliaryInformationOffsetsBoxTest extends BoxRoundtripTest { - public SampleAuxiliaryInformationOffsetsBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/SampleAuxiliaryInformationSizesBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/SampleAuxiliaryInformationSizesBoxTest.java index 64203ee2c..6f0476e88 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/SampleAuxiliaryInformationSizesBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part12/SampleAuxiliaryInformationSizesBoxTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.boxes.iso14496.part12; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part12.SampleAuxiliaryInformationSizesBox; @@ -25,8 +25,8 @@ public void roundTripFlags0() throws IOException { IsoFile isoFile = new IsoFile(new FileInputStream(f).getChannel()); SampleAuxiliaryInformationSizesBox saiz2 = (SampleAuxiliaryInformationSizesBox) isoFile.getBoxes().get(0); - Assert.assertEquals(saiz1.getDefaultSampleInfoSize(), saiz2.getDefaultSampleInfoSize()); - Assert.assertArrayEquals(saiz1.getSampleInfoSizes(), saiz2.getSampleInfoSizes()); + Assertions.assertEquals(saiz1.getDefaultSampleInfoSize(), saiz2.getDefaultSampleInfoSize()); + Assertions.assertArrayEquals(saiz1.getSampleInfoSizes(), saiz2.getSampleInfoSizes()); } @@ -48,10 +48,10 @@ public void roundTripFlags1() throws IOException { IsoFile isoFile = new IsoFile(new FileInputStream(f).getChannel()); SampleAuxiliaryInformationSizesBox saiz2 = (SampleAuxiliaryInformationSizesBox) isoFile.getBoxes().get(0); - Assert.assertEquals(saiz1.getDefaultSampleInfoSize(), saiz2.getDefaultSampleInfoSize()); - Assert.assertArrayEquals(saiz1.getSampleInfoSizes(), saiz2.getSampleInfoSizes()); - Assert.assertEquals(saiz1.getAuxInfoType(), saiz2.getAuxInfoType()); - Assert.assertEquals(saiz1.getAuxInfoTypeParameter(), saiz2.getAuxInfoTypeParameter()); + Assertions.assertEquals(saiz1.getDefaultSampleInfoSize(), saiz2.getDefaultSampleInfoSize()); + Assertions.assertArrayEquals(saiz1.getSampleInfoSizes(), saiz2.getSampleInfoSizes()); + Assertions.assertEquals(saiz1.getAuxInfoType(), saiz2.getAuxInfoType()); + Assertions.assertEquals(saiz1.getAuxInfoTypeParameter(), saiz2.getAuxInfoTypeParameter()); } diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/HevcConfigurationBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/HevcConfigurationBoxTest.java index 75c4626c7..870e2a043 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/HevcConfigurationBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/HevcConfigurationBoxTest.java @@ -1,6 +1,7 @@ package org.mp4parser.test.boxes.iso14496.part15; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part15.HevcConfigurationBox; import org.mp4parser.tools.ByteBufferByteChannel; @@ -10,8 +11,6 @@ import java.io.ByteArrayOutputStream; import java.nio.channels.Channels; -import static org.junit.Assert.assertArrayEquals; - public class HevcConfigurationBoxTest { byte[] in = Hex.decodeHex("000000E1687663310000000000000001000000000000000000000000000000000780043800480000004800000000000000010C0B4845564320436F64696E67000000000000000000000000000000000000000018FFFF0000008B68766343010200000001B0000000000096F000FCFDFAFA00000F03A00001002040010C01FFFF02A000000300B0000003000003009694903000003E900005DC05A10001003542010102A000000300B00000030000030096A003C08010E4D94526491B6BC040400000FA4000177018077BDF8000C95A000192B420A2000100084401C1625B6C1ED9"); @@ -24,6 +23,6 @@ public void testInOutIdent() throws Exception { hevC.parseDetails(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); isoFile.getBox(Channels.newChannel(baos)); - assertArrayEquals(in, baos.toByteArray()); + Assertions.assertArrayEquals(in, baos.toByteArray()); } } \ No newline at end of file diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/HevcDecoderConfigurationRecordTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/HevcDecoderConfigurationRecordTest.java index ca6677f54..131bdd9ff 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/HevcDecoderConfigurationRecordTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/HevcDecoderConfigurationRecordTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.boxes.iso14496.part15; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.boxes.iso14496.part15.HevcDecoderConfigurationRecord; import org.mp4parser.tools.Hex; @@ -25,8 +25,8 @@ public void roundtrip() { HevcDecoderConfigurationRecord h2 = new HevcDecoderConfigurationRecord(); h2.parse((ByteBuffer) ((Buffer)confRecordWritten).rewind()); - Assert.assertEquals(confRecordOrig, confRecordWritten); - Assert.assertEquals(h1, h2); + Assertions.assertEquals(confRecordOrig, confRecordWritten); + Assertions.assertEquals(h1, h2); } diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/Part15GroupDescriptionBoxesTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/Part15GroupDescriptionBoxesTest.java index 3d1ce43d2..57994853e 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/Part15GroupDescriptionBoxesTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/Part15GroupDescriptionBoxesTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.boxes.iso14496.part15; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part15.StepwiseTemporalLayerEntry; import org.mp4parser.boxes.iso14496.part15.SyncSampleEntry; import org.mp4parser.boxes.iso14496.part15.TemporalLayerSampleGroup; @@ -13,13 +13,10 @@ import java.util.Collection; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class Part15GroupDescriptionBoxesTest extends BoxRoundtripTest { - public Part15GroupDescriptionBoxesTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { StepwiseTemporalLayerEntry stsa = new StepwiseTemporalLayerEntry(); SyncSampleEntry sync = new SyncSampleEntry(); @@ -40,7 +37,6 @@ public static Collection data() { tscl.setTltier_flag(true); TemporalSubLayerSampleGroup tsas = new TemporalSubLayerSampleGroup(); - return Arrays.asList( new Object[]{new SampleGroupDescriptionBox(), new Map.Entry[]{ diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/PriotityRangeBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/PriotityRangeBoxTest.java index e8423d56b..40bf33d7f 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/PriotityRangeBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/PriotityRangeBoxTest.java @@ -1,21 +1,18 @@ package org.mp4parser.test.boxes.iso14496.part15; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part15.PriotityRangeBox; import java.util.Collection; import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class PriotityRangeBoxTest extends BoxRoundtripTest { - public PriotityRangeBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/TierBitRateBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/TierBitRateBoxTest.java index ac347e2ec..cd0b48cba 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/TierBitRateBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/TierBitRateBoxTest.java @@ -1,22 +1,18 @@ package org.mp4parser.test.boxes.iso14496.part15; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part15.TierBitRateBox; import java.util.Collection; import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class TierBitRateBoxTest extends BoxRoundtripTest { - - public TierBitRateBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/TierInfoBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/TierInfoBoxTest.java index ac288d4d9..0da2d8356 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/TierInfoBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part15/TierInfoBoxTest.java @@ -1,20 +1,18 @@ package org.mp4parser.test.boxes.iso14496.part15; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part15.TierInfoBox; import java.util.Collection; import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class TierInfoBoxTest extends BoxRoundtripTest { - public TierInfoBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - @Parameterized.Parameters public static Collection data() { return Collections.singletonList( new Object[]{new TierInfoBox(), diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTConfigurationBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTConfigurationBoxTest.java index 35c661108..48fff6722 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTConfigurationBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTConfigurationBoxTest.java @@ -1,22 +1,18 @@ package org.mp4parser.test.boxes.iso14496.part30; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part30.WebVTTConfigurationBox; import java.util.Collection; import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class WebVTTConfigurationBoxTest extends BoxRoundtripTest { - - public WebVTTConfigurationBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTSampleEntryTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTSampleEntryTest.java index d8dcf5c27..472d49f7a 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTSampleEntryTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTSampleEntryTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.boxes.iso14496.part30; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part30.WebVTTConfigurationBox; import org.mp4parser.boxes.iso14496.part30.WebVTTSampleEntry; import org.mp4parser.boxes.iso14496.part30.WebVTTSourceLabelBox; @@ -11,14 +11,10 @@ import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class WebVTTSampleEntryTest extends BoxRoundtripTest { - - public WebVTTSampleEntryTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { WebVTTSampleEntry wvtt = new WebVTTSampleEntry(); WebVTTConfigurationBox vttC = new WebVTTConfigurationBox(); diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTSourceLabelBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTSourceLabelBoxTest.java index 2a6ebfec3..39d8f8015 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTSourceLabelBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso14496/part30/WebVTTSourceLabelBoxTest.java @@ -1,22 +1,18 @@ package org.mp4parser.test.boxes.iso14496.part30; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part30.WebVTTSourceLabelBox; import java.util.Collection; import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class WebVTTSourceLabelBoxTest extends BoxRoundtripTest { - - public WebVTTSourceLabelBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso23001/part7/ProtectionSystemSpecificHeaderBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso23001/part7/ProtectionSystemSpecificHeaderBoxTest.java index cb17bda34..579a32a5f 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso23001/part7/ProtectionSystemSpecificHeaderBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso23001/part7/ProtectionSystemSpecificHeaderBoxTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.boxes.iso23001.part7; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso23001.part7.ProtectionSystemSpecificHeaderBox; import java.util.Arrays; @@ -10,14 +10,10 @@ import java.util.Map; import java.util.UUID; - +@ParameterizedClass +@MethodSource("data") public class ProtectionSystemSpecificHeaderBoxTest extends BoxRoundtripTest { - public ProtectionSystemSpecificHeaderBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { return Arrays.asList( new Object[]{new ProtectionSystemSpecificHeaderBox(), diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso23001/part7/TrackEncryptionBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso23001/part7/TrackEncryptionBoxTest.java index 1bf57c6be..ecd87bde8 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso23001/part7/TrackEncryptionBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso23001/part7/TrackEncryptionBoxTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.boxes.iso23001.part7; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso23001.part7.TrackEncryptionBox; import java.util.Collection; @@ -10,13 +10,10 @@ import java.util.Map; import java.util.UUID; +@ParameterizedClass +@MethodSource("data") public class TrackEncryptionBoxTest extends BoxRoundtripTest { - public TrackEncryptionBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/iso23009/part1/EventMessageBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/iso23009/part1/EventMessageBoxTest.java index 7c3e31175..8ea6d5967 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/iso23009/part1/EventMessageBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/iso23009/part1/EventMessageBoxTest.java @@ -1,22 +1,18 @@ package org.mp4parser.test.boxes.iso23009.part1; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso23009.part1.EventMessageBox; import java.util.Collection; import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class EventMessageBoxTest extends BoxRoundtripTest { - - public EventMessageBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - - @Parameterized.Parameters public static Collection data() { String schemeIdUri; String value; diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/sampleentry/TextSampleEntryTest.java b/isoparser/src/test/java/org/mp4parser/test/boxes/sampleentry/TextSampleEntryTest.java index 66745f88b..b379b749b 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/sampleentry/TextSampleEntryTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/sampleentry/TextSampleEntryTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.boxes.sampleentry; import com.googlecode.mp4parser.boxes.BoxWriteReadBase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.boxes.iso14496.part12.FreeBox; import org.mp4parser.boxes.sampleentry.TextSampleEntry; @@ -15,9 +15,9 @@ public class TextSampleEntryTest extends BoxWriteReadBase { public void testBitSetters() { TextSampleEntry tx3g = new TextSampleEntry(); tx3g.setContinuousKaraoke(true); - Assert.assertTrue(tx3g.isContinuousKaraoke()); + Assertions.assertTrue(tx3g.isContinuousKaraoke()); tx3g.setContinuousKaraoke(false); - Assert.assertFalse(tx3g.isContinuousKaraoke()); + Assertions.assertFalse(tx3g.isContinuousKaraoke()); } @Override diff --git a/isoparser/src/test/java/org/mp4parser/test/boxes/samplegrouping/SampleGroupDescriptionBoxTestSuite.java b/isoparser/src/test/java/org/mp4parser/test/boxes/samplegrouping/SampleGroupDescriptionBoxTestSuite.java index 8b682f8b0..112f3b3e8 100644 --- a/isoparser/src/test/java/org/mp4parser/test/boxes/samplegrouping/SampleGroupDescriptionBoxTestSuite.java +++ b/isoparser/src/test/java/org/mp4parser/test/boxes/samplegrouping/SampleGroupDescriptionBoxTestSuite.java @@ -2,8 +2,8 @@ import com.googlecode.mp4parser.boxes.BoxWriteReadBase; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; import org.mp4parser.boxes.samplegrouping.RateShareEntry; import org.mp4parser.boxes.samplegrouping.RollRecoveryEntry; import org.mp4parser.boxes.samplegrouping.SampleGroupDescriptionBox; @@ -14,8 +14,8 @@ import java.util.Map; -@RunWith(Suite.class) -@Suite.SuiteClasses(value = { +@Suite +@SelectClasses({ SampleGroupDescriptionBoxTestSuite.TestRateShareEntryV1.class, SampleGroupDescriptionBoxTestSuite.TestRateShareEntryV0.class, SampleGroupDescriptionBoxTestSuite.TestUnkownEntryV1.class, @@ -44,7 +44,6 @@ public void setupProperties(Map addPropsHere, SampleGroupDescrip new RateShareEntry.Entry(1000, (short) 90) )); - addPropsHere.put("defaultLength", rateShareEntry.size()); addPropsHere.put("version", 1); addPropsHere.put("groupEntries", Arrays.asList(rateShareEntry, rateShareEntry)); @@ -70,14 +69,13 @@ public void setupProperties(Map addPropsHere, SampleGroupDescrip new RateShareEntry.Entry(1000, (short) 90) )); - addPropsHere.put("defaultLength", 0); addPropsHere.put("version", 0); addPropsHere.put("groupEntries", Arrays.asList(rateShareEntry, rateShareEntry)); addPropsHere.put("groupingType", RateShareEntry.TYPE); } } - + public static class TestUnkownEntryV1 extends BoxWriteReadBase { @Override public Class getBoxUnderTest() { @@ -142,7 +140,7 @@ public Class getBoxUnderTest() { public void setupProperties(Map addPropsHere, SampleGroupDescriptionBox box) { RollRecoveryEntry entry = new RollRecoveryEntry(); entry.setRollDistance((short) 6); - + addPropsHere.put("defaultLength", 100); addPropsHere.put("version", 1); addPropsHere.put("groupEntries", Arrays.asList(entry, entry)); @@ -163,12 +161,11 @@ public void setupProperties(Map addPropsHere, SampleGroupDescrip UnknownEntry entry2 = new UnknownEntry("abcd"); entry2.setContent(ByteBuffer.wrap(new byte[]{1, 2, 3, 4, 5, 6})); - + addPropsHere.put("defaultLength", 0); addPropsHere.put("version", 1); addPropsHere.put("groupEntries", Arrays.asList(entry1, entry2)); addPropsHere.put("groupingType", "abcd"); } - } -} - + } +} \ No newline at end of file diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/IsoFileTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/IsoFileTest.java index 83b278ead..9841075cd 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/IsoFileTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/IsoFileTest.java @@ -1,13 +1,17 @@ package org.mp4parser.test.tools; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * */ -public class IsoFileTest extends TestCase { - public void testFourCC() { +class IsoFileTest { + + @Test + void testFourCC() { assertEquals("AA\0\0", IsoFile.bytesToFourCC(new byte[]{65, 65})); assertEquals("AAAA", IsoFile.bytesToFourCC(new byte[]{65, 65, 65, 65, 65, 65})); assertEquals("AAAA", new String(IsoFile.fourCCtoBytes("AAAAAAA"))); @@ -16,6 +20,5 @@ public void testFourCC() { assertEquals("\0\0\0\0", new String(IsoFile.fourCCtoBytes(""))); assertEquals("\0\0\0\0", IsoFile.bytesToFourCC(null)); assertEquals("\0\0\0\0", IsoFile.bytesToFourCC(new byte[0])); - } } diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/IsoTypeReaderTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/IsoTypeReaderTest.java index b5d63f68b..a557cc38f 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/IsoTypeReaderTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/IsoTypeReaderTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.tools; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.tools.IsoTypeReader; import org.mp4parser.tools.IsoTypeWriter; @@ -12,11 +12,10 @@ /** * Test symmetrie of IsoBufferWrapper and Iso */ -public class IsoTypeReaderTest { - +class IsoTypeReaderTest { @Test - public void testInt() throws IOException { + void testInt() throws IOException { ByteBuffer bb = ByteBuffer.allocate(20); IsoTypeWriter.writeUInt8(bb, 0); @@ -26,73 +25,68 @@ public void testInt() throws IOException { IsoTypeWriter.writeUInt24(bb, 0); IsoTypeWriter.writeUInt24(bb, (1 << 24) - 1); IsoTypeWriter.writeUInt32(bb, 0); - IsoTypeWriter.writeUInt32(bb, (1l << 32) - 1); + IsoTypeWriter.writeUInt32(bb, (1L << 32) - 1); ((Buffer)bb).rewind(); - Assert.assertEquals(0, IsoTypeReader.readUInt8(bb)); - Assert.assertEquals(255, IsoTypeReader.readUInt8(bb)); - Assert.assertEquals(0, IsoTypeReader.readUInt16(bb)); - Assert.assertEquals((1 << 16) - 1, IsoTypeReader.readUInt16(bb)); - Assert.assertEquals(0, IsoTypeReader.readUInt24(bb)); - Assert.assertEquals((1 << 24) - 1, IsoTypeReader.readUInt24(bb)); - Assert.assertEquals(0, IsoTypeReader.readUInt32(bb)); - Assert.assertEquals((1l << 32) - 1, IsoTypeReader.readUInt32(bb)); + Assertions.assertEquals(0, IsoTypeReader.readUInt8(bb)); + Assertions.assertEquals(255, IsoTypeReader.readUInt8(bb)); + Assertions.assertEquals(0, IsoTypeReader.readUInt16(bb)); + Assertions.assertEquals((1 << 16) - 1, IsoTypeReader.readUInt16(bb)); + Assertions.assertEquals(0, IsoTypeReader.readUInt24(bb)); + Assertions.assertEquals((1 << 24) - 1, IsoTypeReader.readUInt24(bb)); + Assertions.assertEquals(0, IsoTypeReader.readUInt32(bb)); + Assertions.assertEquals((1L << 32) - 1, IsoTypeReader.readUInt32(bb)); } @Test - public void testFixedPoint1616() throws IOException { + void testFixedPoint1616() throws IOException { final double fixedPointTest1 = 10.13; final double fixedPointTest2 = -10.13; - ByteBuffer bb = ByteBuffer.allocate(8); IsoTypeWriter.writeFixedPoint1616(bb, fixedPointTest1); IsoTypeWriter.writeFixedPoint1616(bb, fixedPointTest2); ((Buffer)bb).rewind(); - Assert.assertEquals("fixedPointTest1", fixedPointTest1, IsoTypeReader.readFixedPoint1616(bb), 1d / 65536); - Assert.assertEquals("fixedPointTest2", fixedPointTest2, IsoTypeReader.readFixedPoint1616(bb), 1d / 65536); + Assertions.assertEquals(fixedPointTest1, IsoTypeReader.readFixedPoint1616(bb), 1d / 65536, "fixedPointTest1"); + Assertions.assertEquals(fixedPointTest2, IsoTypeReader.readFixedPoint1616(bb), 1d / 65536, "fixedPointTest2"); } @Test - public void testFixedPoint0230() throws IOException { + void testFixedPoint0230() throws IOException { final double fixedPointTest1 = 1.13; final double fixedPointTest2 = -1.13; - ByteBuffer bb = ByteBuffer.allocate(8); IsoTypeWriter.writeFixedPoint0230(bb, fixedPointTest1); IsoTypeWriter.writeFixedPoint0230(bb, fixedPointTest2); ((Buffer)bb).rewind(); - Assert.assertEquals("fixedPointTest1", fixedPointTest1, IsoTypeReader.readFixedPoint0230(bb), 1d / 65536); - Assert.assertEquals("fixedPointTest2", fixedPointTest2, IsoTypeReader.readFixedPoint0230(bb), 1d / 65536); + Assertions.assertEquals(fixedPointTest1, IsoTypeReader.readFixedPoint0230(bb), 1d / 65536, "fixedPointTest1"); + Assertions.assertEquals(fixedPointTest2, IsoTypeReader.readFixedPoint0230(bb), 1d / 65536, "fixedPointTest2"); } @Test - public void testFixedPoint88() throws IOException { + void testFixedPoint88() throws IOException { final double fixedPointTest1 = 10.13; final double fixedPointTest2 = -10.13; ByteBuffer bb = ByteBuffer.allocate(4); - IsoTypeWriter.writeFixedPoint88(bb, fixedPointTest1); IsoTypeWriter.writeFixedPoint88(bb, fixedPointTest2); ((Buffer)bb).rewind(); - Assert.assertEquals("fixedPointTest1", fixedPointTest1, IsoTypeReader.readFixedPoint88(bb), 1d / 256); - Assert.assertEquals("fixedPointTest2", fixedPointTest2, IsoTypeReader.readFixedPoint88(bb), 1d / 256); + Assertions.assertEquals(fixedPointTest1, IsoTypeReader.readFixedPoint88(bb), 1d / 256, "fixedPointTest1"); + Assertions.assertEquals(fixedPointTest2, IsoTypeReader.readFixedPoint88(bb), 1d / 256, "fixedPointTest2"); } @Test - public void testRead4cc() throws IOException { + void testRead4cc() throws IOException { ByteBuffer bb = ByteBuffer.wrap("abcd".getBytes()); String code = IsoTypeReader.read4cc(bb); - Assert.assertEquals(4, bb.position()); - Assert.assertEquals("abcd", code); - + Assertions.assertEquals(4, bb.position()); + Assertions.assertEquals("abcd", code); } - } diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/PathTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/PathTest.java index 8a04c2779..d37782528 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/PathTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/PathTest.java @@ -1,9 +1,9 @@ package org.mp4parser.test.tools; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.tools.Path; @@ -13,7 +13,7 @@ public class PathTest { IsoFile isoFile; - @Before + @BeforeEach public void setup() throws IOException { isoFile = new IsoFile(new FileInputStream(PathTest.class.getProtectionDomain().getCodeSource().getLocation().getFile() + "/multiTrack.3gp").getChannel()); } @@ -21,9 +21,9 @@ public void setup() throws IOException { @Test public void testComponentMatcher() { - Assert.assertTrue(Path.component.matcher("abcd").matches()); - Assert.assertTrue(Path.component.matcher("xml ").matches()); - Assert.assertTrue(Path.component.matcher("xml [1]").matches()); - Assert.assertTrue(Path.component.matcher("..").matches()); + Assertions.assertTrue(Path.component.matcher("abcd").matches()); + Assertions.assertTrue(Path.component.matcher("xml ").matches()); + Assertions.assertTrue(Path.component.matcher("xml [1]").matches()); + Assertions.assertTrue(Path.component.matcher("..").matches()); } } diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/ComponsitionShiftLeastGreatestAtomTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/ComponsitionShiftLeastGreatestAtomTest.java index 4ecafe2c4..478c63ddb 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/ComponsitionShiftLeastGreatestAtomTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/ComponsitionShiftLeastGreatestAtomTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.tools.boxes; -import junit.framework.TestCase; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part12.CompositionToDecodeBox; import org.mp4parser.tools.ByteBufferByteChannel; @@ -16,10 +16,10 @@ * Time: 12:41 * To change this template use File | Settings | File Templates. */ -public class ComponsitionShiftLeastGreatestAtomTest extends TestCase { +class ComponsitionShiftLeastGreatestAtomTest { - - public void testParse() throws Exception { + @Test + void testParse() throws Exception { CompositionToDecodeBox clsg = new CompositionToDecodeBox(); clsg.setCompositionOffsetToDisplayOffsetShift(2); clsg.setDisplayEndTime(3); @@ -27,19 +27,16 @@ public void testParse() throws Exception { clsg.setGreatestDisplayOffset(-2); clsg.setLeastDisplayOffset(-4); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); clsg.getBox(Channels.newChannel(baos)); IsoFile isoFile = new IsoFile(new ByteBufferByteChannel(baos.toByteArray())); CompositionToDecodeBox clsg2 = isoFile.getBoxes(CompositionToDecodeBox.class).get(0); - Assert.assertEquals(baos.toByteArray().length, clsg2.getSize()); - Assert.assertEquals(clsg.getCompositionOffsetToDisplayOffsetShift(), clsg2.getCompositionOffsetToDisplayOffsetShift()); - Assert.assertEquals(clsg.getGreatestDisplayOffset(), clsg2.getGreatestDisplayOffset()); - Assert.assertEquals(clsg.getDisplayEndTime(), clsg2.getDisplayEndTime()); - Assert.assertEquals(clsg.getDisplayStartTime(), clsg2.getDisplayStartTime()); - Assert.assertEquals(clsg.getLeastDisplayOffset(), clsg2.getLeastDisplayOffset()); - - + Assertions.assertEquals(baos.toByteArray().length, clsg2.getSize()); + Assertions.assertEquals(clsg.getCompositionOffsetToDisplayOffsetShift(), clsg2.getCompositionOffsetToDisplayOffsetShift()); + Assertions.assertEquals(clsg.getGreatestDisplayOffset(), clsg2.getGreatestDisplayOffset()); + Assertions.assertEquals(clsg.getDisplayEndTime(), clsg2.getDisplayEndTime()); + Assertions.assertEquals(clsg.getDisplayStartTime(), clsg2.getDisplayStartTime()); + Assertions.assertEquals(clsg.getLeastDisplayOffset(), clsg2.getLeastDisplayOffset()); } } diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/FileTypeBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/FileTypeBoxTest.java index 936fca004..890710d05 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/FileTypeBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/FileTypeBoxTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.tools.boxes; import com.googlecode.mp4parser.boxes.BoxRoundtripTest; -import org.junit.runners.Parameterized; -import org.mp4parser.ParsableBox; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mp4parser.boxes.iso14496.part12.FileTypeBox; import java.util.Arrays; @@ -10,12 +10,10 @@ import java.util.Collections; import java.util.Map; +@ParameterizedClass +@MethodSource("data") public class FileTypeBoxTest extends BoxRoundtripTest { - public FileTypeBoxTest(ParsableBox parsableBoxUnderTest, Map.Entry... properties) { - super(parsableBoxUnderTest, properties); - } - @Parameterized.Parameters public static Collection data() { diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/FreeBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/FreeBoxTest.java index be113af68..f64681a6a 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/FreeBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/FreeBoxTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.tools.boxes; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part12.FreeBox; import org.mp4parser.boxes.iso14496.part12.FreeSpaceBox; @@ -21,10 +21,10 @@ public void testInOutNoChange() throws IOException { ((Buffer)data).rewind(); data.put(new byte[]{1, 2, 3, 4, 5, 6}); fb.getBox(Channels.newChannel(baos)); - Assert.assertEquals(baos.toByteArray()[8], 1); - Assert.assertEquals(baos.toByteArray()[9], 2); - Assert.assertEquals(baos.toByteArray()[10], 3); - Assert.assertEquals(baos.toByteArray()[11], 4); + Assertions.assertEquals(1, baos.toByteArray()[8]); + Assertions.assertEquals(2, baos.toByteArray()[9]); + Assertions.assertEquals(3, baos.toByteArray()[10]); + Assertions.assertEquals(4, baos.toByteArray()[11]); } @Test @@ -45,9 +45,9 @@ public void tesAddAndReplace() throws IOException { fc.close(); IsoFile isoFile = new IsoFile(new FileInputStream(f).getChannel()); - Assert.assertEquals(2, isoFile.getBoxes().size()); - Assert.assertEquals(FreeSpaceBox.TYPE, isoFile.getBoxes().get(0).getType()); - Assert.assertEquals(FreeBox.TYPE, isoFile.getBoxes().get(1).getType()); - Assert.assertEquals(startSize, isoFile.getBoxes().get(0).getSize() + isoFile.getBoxes().get(1).getSize()); + Assertions.assertEquals(2, isoFile.getBoxes().size()); + Assertions.assertEquals(FreeSpaceBox.TYPE, isoFile.getBoxes().get(0).getType()); + Assertions.assertEquals(FreeBox.TYPE, isoFile.getBoxes().get(1).getType()); + Assertions.assertEquals(startSize, isoFile.getBoxes().get(0).getSize() + isoFile.getBoxes().get(1).getSize()); } } diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/MetaBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/MetaBoxTest.java index 6d8b95b1d..760d03ec0 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/MetaBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/MetaBoxTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.tools.boxes; import org.apache.commons.codec.binary.Base64; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import java.io.*; @@ -68,6 +68,6 @@ public void testRooundTrip() throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); isoFile.getBox(Channels.newChannel(baos)); - Assert.assertArrayEquals(metaBox, baos.toByteArray()); + Assertions.assertArrayEquals(metaBox, baos.toByteArray()); } } diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/SampleFlagsTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/SampleFlagsTest.java index c742e2fd2..75a5b4f00 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/SampleFlagsTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/SampleFlagsTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.tools.boxes.fragment; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.boxes.iso14496.part12.SampleFlags; import org.mp4parser.tools.IsoTypeReader; @@ -20,7 +20,7 @@ public void testSimple() throws IOException { ByteBuffer b = ByteBuffer.allocate(4); sf.getContent(b); ((Buffer)b).rewind(); - Assert.assertEquals(l, IsoTypeReader.readUInt32(b)); + Assertions.assertEquals(l, IsoTypeReader.readUInt32(b)); } @Test @@ -40,14 +40,14 @@ public void testSetterGetterRoundTrip() throws IOException { SampleFlags sf2 = new SampleFlags(bb); - Assert.assertEquals(sf.getReserved(), sf2.getReserved()); - Assert.assertEquals(sf.getSampleDependsOn(), sf2.getSampleDependsOn()); - Assert.assertEquals(sf.isSampleIsDifferenceSample(), sf2.isSampleIsDifferenceSample()); - Assert.assertEquals(sf.getSamplePaddingValue(), sf2.getSamplePaddingValue()); + Assertions.assertEquals(sf.getReserved(), sf2.getReserved()); + Assertions.assertEquals(sf.getSampleDependsOn(), sf2.getSampleDependsOn()); + Assertions.assertEquals(sf.isSampleIsDifferenceSample(), sf2.isSampleIsDifferenceSample()); + Assertions.assertEquals(sf.getSamplePaddingValue(), sf2.getSamplePaddingValue()); - Assert.assertEquals(sf.getSampleDegradationPriority(), sf2.getSampleDegradationPriority()); - Assert.assertEquals(sf.getSampleHasRedundancy(), sf2.getSampleHasRedundancy()); - Assert.assertEquals(sf.getSampleIsDependedOn(), sf2.getSampleIsDependedOn()); + Assertions.assertEquals(sf.getSampleDegradationPriority(), sf2.getSampleDegradationPriority()); + Assertions.assertEquals(sf.getSampleHasRedundancy(), sf2.getSampleHasRedundancy()); + Assertions.assertEquals(sf.getSampleIsDependedOn(), sf2.getSampleIsDependedOn()); } diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/TrackFragmentRandomAccessBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/TrackFragmentRandomAccessBoxTest.java index 5597f6930..13f3ab211 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/TrackFragmentRandomAccessBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/TrackFragmentRandomAccessBoxTest.java @@ -1,8 +1,8 @@ package org.mp4parser.test.tools.boxes.fragment; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part12.TrackFragmentRandomAccessBox; @@ -67,11 +67,11 @@ public void testRoundtrip(int sizeOfSampleNum, int lengthSizeOfTrafNum, int leng IsoFile isoFile = new IsoFile(new FileInputStream(f).getChannel()); TrackFragmentRandomAccessBox traf2 = (TrackFragmentRandomAccessBox) isoFile.getBoxes().get(0); - Assert.assertEquals(traf.getNumberOfEntries(), traf2.getNumberOfEntries()); - Assert.assertEquals(traf.getReserved(), traf2.getReserved()); - Assert.assertEquals(traf.getTrackId(), traf2.getTrackId()); + Assertions.assertEquals(traf.getNumberOfEntries(), traf2.getNumberOfEntries()); + Assertions.assertEquals(traf.getReserved(), traf2.getReserved()); + Assertions.assertEquals(traf.getTrackId(), traf2.getTrackId()); //System.err.println("" + sizeOfSampleNum + " " + lengthSizeOfTrafNum + " " + lengthSizeOfTrunNum); - Assert.assertEquals(traf.getEntries(), traf2.getEntries()); + Assertions.assertEquals(traf.getEntries(), traf2.getEntries()); } diff --git a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/TrackRunBoxTest.java b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/TrackRunBoxTest.java index 46e18dc9c..6bf6ac298 100644 --- a/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/TrackRunBoxTest.java +++ b/isoparser/src/test/java/org/mp4parser/test/tools/boxes/fragment/TrackRunBoxTest.java @@ -1,7 +1,7 @@ package org.mp4parser.test.tools.boxes.fragment; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part12.SampleFlags; import org.mp4parser.boxes.iso14496.part12.TrackRunBox; @@ -68,15 +68,15 @@ public void simpleRoundTrip(boolean isSampleSizePresent, IsoFile isoFile = new IsoFile(new FileInputStream(f).getChannel()); TrackRunBox trun2 = (TrackRunBox) isoFile.getBoxes().get(0); - Assert.assertEquals(trun.isDataOffsetPresent(), trun2.isDataOffsetPresent()); - Assert.assertEquals(trun.isSampleCompositionTimeOffsetPresent(), trun2.isSampleCompositionTimeOffsetPresent()); - Assert.assertEquals(trun.isSampleDurationPresent(), trun2.isSampleDurationPresent()); - Assert.assertEquals(trun.isSampleFlagsPresent(), trun2.isSampleFlagsPresent()); - Assert.assertEquals(trun.isSampleSizePresent(), trun2.isSampleSizePresent()); - Assert.assertEquals(trun.getDataOffset(), trun2.getDataOffset()); + Assertions.assertEquals(trun.isDataOffsetPresent(), trun2.isDataOffsetPresent()); + Assertions.assertEquals(trun.isSampleCompositionTimeOffsetPresent(), trun2.isSampleCompositionTimeOffsetPresent()); + Assertions.assertEquals(trun.isSampleDurationPresent(), trun2.isSampleDurationPresent()); + Assertions.assertEquals(trun.isSampleFlagsPresent(), trun2.isSampleFlagsPresent()); + Assertions.assertEquals(trun.isSampleSizePresent(), trun2.isSampleSizePresent()); + Assertions.assertEquals(trun.getDataOffset(), trun2.getDataOffset()); - Assert.assertEquals(trun.getDataOffset(), trun2.getDataOffset()); - Assert.assertEquals(trun.getFirstSampleFlags(), trun2.getFirstSampleFlags()); + Assertions.assertEquals(trun.getDataOffset(), trun2.getDataOffset()); + Assertions.assertEquals(trun.getFirstSampleFlags(), trun2.getFirstSampleFlags()); } diff --git a/muxer/pom.xml b/muxer/pom.xml index 94ccb426a..06db7701f 100644 --- a/muxer/pom.xml +++ b/muxer/pom.xml @@ -2,39 +2,35 @@ 4.0.0 - org.mp4parser - 1.9.57-SNAPSHOT muxer File Muxer - https://github.com/sannies/mp4parser This package has a focus on file operation. It can read A/V data from Random Access Datasources + mp4parser-project org.mp4parser 1.9.57-SNAPSHOT - - UTF-8 - + org.mp4parser isoparser - 1.9.57-SNAPSHOT + ${project.version} - junit - junit - 4.12 + org.junit.jupiter + junit-jupiter + test org.slf4j slf4j-simple - 1.8.0-beta4 test + @@ -51,22 +47,4 @@ - - - Apache Software License - Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - - sannies - Sebastian.Annies@gmail.com - - - - https://github.com/sannies/mp4parser - mp4parser-project-1.9.43 - \ No newline at end of file diff --git a/muxer/src/test/java/org/mp4parser/muxer/CencFileRoundtripTest.java b/muxer/src/test/java/org/mp4parser/muxer/CencFileRoundtripTest.java index dd18aead4..457aa6a4a 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/CencFileRoundtripTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/CencFileRoundtripTest.java @@ -1,8 +1,8 @@ package org.mp4parser.muxer; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mp4parser.Container; import org.mp4parser.muxer.builder.DefaultMp4Builder; import org.mp4parser.muxer.builder.FragmentedMp4Builder; @@ -30,7 +30,7 @@ public class CencFileRoundtripTest { private RangeStartMap keyRotation3; - @Before + @BeforeEach public void setUp() throws Exception { UUID uuid1 = UUID.randomUUID(); UUID uuid2 = UUID.randomUUID(); @@ -185,7 +185,7 @@ public void verifySampleEquality(List orig, List roundtripped) t ByteArrayOutputStream baos2 = new ByteArrayOutputStream(); origIter.next().writeTo(Channels.newChannel(baos1)); roundTrippedIter.next().writeTo(Channels.newChannel(baos2)); - Assert.assertArrayEquals("Sample " + i + " differs", baos1.toByteArray(), baos2.toByteArray()); + Assertions.assertArrayEquals(baos1.toByteArray(), baos2.toByteArray(), "Sample " + i + " differs"); i++; } diff --git a/muxer/src/test/java/org/mp4parser/muxer/FragmentedMp4BuilderTest.java b/muxer/src/test/java/org/mp4parser/muxer/FragmentedMp4BuilderTest.java index 9cbd3d8f7..6666dd54d 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/FragmentedMp4BuilderTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/FragmentedMp4BuilderTest.java @@ -1,6 +1,6 @@ package org.mp4parser.muxer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.Container; import org.mp4parser.muxer.builder.DefaultFragmenterImpl; import org.mp4parser.muxer.builder.FragmentedMp4Builder; diff --git a/muxer/src/test/java/org/mp4parser/muxer/MultiFileDataSourceImplTest.java b/muxer/src/test/java/org/mp4parser/muxer/MultiFileDataSourceImplTest.java index 32eb97524..79c52d042 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/MultiFileDataSourceImplTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/MultiFileDataSourceImplTest.java @@ -1,9 +1,9 @@ package org.mp4parser.muxer; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.io.File; @@ -16,7 +16,7 @@ public class MultiFileDataSourceImplTest { File b; File c; - @Before + @BeforeEach public void setUp() throws Exception { a = File.createTempFile("MultiFileDataSourceImplTest", "aaa"); write(a, "aaaaaaaaaa"); @@ -30,14 +30,14 @@ public void setUp() throws Exception { public void testWithIn() throws Exception { DataSource ds = new MultiFileDataSourceImpl(a, b, c); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - Assert.assertEquals("a", check(ds, 0, 1)); - Assert.assertEquals("aa", check(ds, 0, 2)); - Assert.assertEquals("a", check(ds, 1, 1)); - Assert.assertEquals("aa", check(ds, 1, 2)); - Assert.assertEquals("aaaaaaaaaa", check(ds, 0, 10)); - Assert.assertEquals("aaaaaaaaaab", check(ds, 0, 11)); - Assert.assertEquals("aaaaaaab", check(ds, 3, 8)); - Assert.assertEquals("aaaaabbbbbbbbbbccccc", check(ds, 5, 20)); + Assertions.assertEquals("a", check(ds, 0, 1)); + Assertions.assertEquals("aa", check(ds, 0, 2)); + Assertions.assertEquals("a", check(ds, 1, 1)); + Assertions.assertEquals("aa", check(ds, 1, 2)); + Assertions.assertEquals("aaaaaaaaaa", check(ds, 0, 10)); + Assertions.assertEquals("aaaaaaaaaab", check(ds, 0, 11)); + Assertions.assertEquals("aaaaaaab", check(ds, 3, 8)); + Assertions.assertEquals("aaaaabbbbbbbbbbccccc", check(ds, 5, 20)); } public String check(DataSource ds, int a, int b) throws IOException { @@ -48,7 +48,7 @@ public String check(DataSource ds, int a, int b) throws IOException { return result; } - @After + @AfterEach public void tearDown() throws Exception { a.deleteOnExit(); b.deleteOnExit(); diff --git a/muxer/src/test/java/org/mp4parser/muxer/builder/DefaultFragmenterTest.java b/muxer/src/test/java/org/mp4parser/muxer/builder/DefaultFragmenterTest.java index 148927276..2a3aa657b 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/builder/DefaultFragmenterTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/builder/DefaultFragmenterTest.java @@ -1,7 +1,7 @@ package org.mp4parser.muxer.builder; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.muxer.Movie; import org.mp4parser.muxer.container.mp4.MovieCreator; @@ -22,6 +22,6 @@ public void testSampleNumbers() throws Exception { sss += l + ", "; } System.err.println(sss); - Assert.assertArrayEquals(samples, s); + Assertions.assertArrayEquals(samples, s); } } diff --git a/muxer/src/test/java/org/mp4parser/muxer/builder/SyncSampleIntersectFinderImplTest.java b/muxer/src/test/java/org/mp4parser/muxer/builder/SyncSampleIntersectFinderImplTest.java index 40f723df7..1081d1d04 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/builder/SyncSampleIntersectFinderImplTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/builder/SyncSampleIntersectFinderImplTest.java @@ -1,8 +1,8 @@ package org.mp4parser.muxer.builder; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.muxer.InTestMovieCreator; import org.mp4parser.muxer.Movie; import org.mp4parser.muxer.Track; @@ -21,14 +21,14 @@ public void testFindSameFrameRate() throws IOException { SyncSampleIntersectFinderImpl syncSampleIntersectFinder = new SyncSampleIntersectFinderImpl(m, null, -1); long[] fragmentStartSamplesRef = null; - Assert.assertTrue(m.getTracks().size() > 1); + Assertions.assertTrue(m.getTracks().size() > 1); for (Track track : m.getTracks()) { long[] fragmentStartSamples = syncSampleIntersectFinder.sampleNumbers(track); - Assert.assertNotNull(fragmentStartSamples); + Assertions.assertNotNull(fragmentStartSamples); if (fragmentStartSamplesRef == null) { fragmentStartSamplesRef = fragmentStartSamples; } else { - Assert.assertArrayEquals(fragmentStartSamplesRef, fragmentStartSamples); + Assertions.assertArrayEquals(fragmentStartSamplesRef, fragmentStartSamples); } } @@ -47,7 +47,7 @@ public void testGetIndicesToBeRemoved() { // long[] b_1 = new long[]{10, 20, 26, 30, 40, 80}; // long[] b_2 = new long[]{10, 20, 25, 30, 40, 80}; // long[] a_2 = SyncSampleIntersectFinderImpl.getCommonIndices(a_sample, a_times, 10, b_1, b_2); - Assert.assertArrayEquals(new long[]{20, 40, 60, 80}, a_2); + Assertions.assertArrayEquals(new long[]{20, 40, 60, 80}, a_2); } @Test @@ -58,7 +58,7 @@ public void testGetIndicesToBeRemovedMinTwoSecondsFragments() { long[] b_1 = new long[]{10, 20, 26, 30, 40, 80, 81, 100}; long[] b_2 = new long[]{10, 20, 25, 30, 40, 80, 90, 100}; long[] a_2 = syncSampleIntersectFinder.getCommonIndices(a_sample, a_times, 10, b_1, b_2); - Assert.assertArrayEquals(new long[]{20, 60, 90}, a_2); + Assertions.assertArrayEquals(new long[]{20, 60, 90}, a_2); } @Test @@ -82,13 +82,13 @@ public void testFindDifferentFrameRates() throws IOException { long[] fragmentStartSamplesRef = null; for (Track track : m.getTracks()) { long[] fragmentStartSamples = syncSampleIntersectFinder.sampleNumbers(track); - Assert.assertNotNull(fragmentStartSamples); + Assertions.assertNotNull(fragmentStartSamples); if (fragmentStartSamplesRef == null) { fragmentStartSamplesRef = fragmentStartSamples; } else { // this is all I can do here now. // we should verify that all samples in the array are at the same times. - Assert.assertEquals(fragmentStartSamplesRef.length, fragmentStartSamples.length); + Assertions.assertEquals(fragmentStartSamplesRef.length, fragmentStartSamples.length); } } diff --git a/muxer/src/test/java/org/mp4parser/muxer/samples/CencSampleListsTest.java b/muxer/src/test/java/org/mp4parser/muxer/samples/CencSampleListsTest.java index 554718ac8..6a9492322 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/samples/CencSampleListsTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/samples/CencSampleListsTest.java @@ -1,7 +1,7 @@ package org.mp4parser.muxer.samples; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part12.*; import org.mp4parser.boxes.iso23001.part7.CencSampleAuxiliaryDataFormat; @@ -139,12 +139,12 @@ public void test() throws IOException { clearSamples, Collections.singletonList(cencSampleAuxiliaryDataFormat)); - Assert.assertEquals(1, cencSamples.size()); + Assertions.assertEquals(1, cencSamples.size()); Sample encSample = cencSamples.get(0); ByteArrayOutputStream baos = new ByteArrayOutputStream(); encSample.writeTo(Channels.newChannel(baos)); - Assert.assertEquals(encryptedWorking, Hex.encodeHex(baos.toByteArray())); - Assert.assertEquals(encryptedWorking, Hex.encodeHex(encSample.asByteBuffer().array())); + Assertions.assertEquals(encryptedWorking, Hex.encodeHex(baos.toByteArray())); + Assertions.assertEquals(encryptedWorking, Hex.encodeHex(encSample.asByteBuffer().array())); } @@ -217,7 +217,7 @@ public void testMultipleKeys(String encAlgo, boolean subSampleEncryption) throws CencEncryptingSampleList cencSamples = new CencEncryptingSampleList(keys, encSampleEntries, clearSamples, auxInfos); - Assert.assertEquals(9, cencSamples.size()); + Assertions.assertEquals(9, cencSamples.size()); LinkedHashSet ses = new LinkedHashSet<>(); for (int i = 0; i < cencSamples.size(); i++) { @@ -229,7 +229,7 @@ public void testMultipleKeys(String encAlgo, boolean subSampleEncryption) throws ses.add(cencSamples.get(i).getSampleEntry()); ByteArrayOutputStream baos = new ByteArrayOutputStream(); dec.get(0).writeTo(Channels.newChannel(baos)); - Assert.assertArrayEquals("Sample " + i + " can not be reconstructed", new byte[1230], baos.toByteArray()); + Assertions.assertArrayEquals(new byte[1230], baos.toByteArray(), "Sample " + i + " can not be reconstructed"); } RangeStartMap keys4Decrypt = new RangeStartMap<>(); @@ -246,7 +246,7 @@ public void testMultipleKeys(String encAlgo, boolean subSampleEncryption) throws for (int i = 0; i < cencSamples.size(); i++) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); decryptingSampleList.get(i).writeTo(Channels.newChannel(baos)); - Assert.assertArrayEquals("Sample " + i + " can not be reconstructed", new byte[1230], baos.toByteArray()); + Assertions.assertArrayEquals(new byte[1230], baos.toByteArray(), "Sample " + i + " can not be reconstructed"); } diff --git a/muxer/src/test/java/org/mp4parser/muxer/samples/DefaultMp4SampleListTest.java b/muxer/src/test/java/org/mp4parser/muxer/samples/DefaultMp4SampleListTest.java index 7b9f29c46..544271800 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/samples/DefaultMp4SampleListTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/samples/DefaultMp4SampleListTest.java @@ -1,7 +1,7 @@ package org.mp4parser.muxer.samples; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.muxer.FileRandomAccessSourceImpl; import org.mp4parser.muxer.container.mp4.Mp4SampleList; @@ -159,7 +159,7 @@ public void checkSampleList() throws IOException, NoSuchAlgorithmException { //System.err.println("\"" + Hex.encodeHex(md5.digest(sl.get(i).asByteBuffer().array())) + "\","); byte[] sampleBytes = new byte[(int) sl.get(i).getSize()]; sl.get(i).asByteBuffer().get(sampleBytes); - Assert.assertEquals(sampleChecksum.get(i), Hex.encodeHex(md5.digest(sampleBytes))); + Assertions.assertEquals(sampleChecksum.get(i), Hex.encodeHex(md5.digest(sampleBytes))); } } } diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/AACTrackImplTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/AACTrackImplTest.java index d1892ba0d..5b2e74a5b 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/AACTrackImplTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/AACTrackImplTest.java @@ -15,7 +15,7 @@ */ package org.mp4parser.muxer.tracks; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.Container; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part14.ESDescriptorBox; diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/AC3TrackImplTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/AC3TrackImplTest.java index 22646716f..b63bcc85a 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/AC3TrackImplTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/AC3TrackImplTest.java @@ -1,6 +1,6 @@ package org.mp4parser.muxer.tracks; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.Container; import org.mp4parser.IsoFile; import org.mp4parser.muxer.FileDataSourceImpl; diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/CencTracksImplTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/CencTracksImplTest.java index 29bc946ed..5bf1bdbd8 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/CencTracksImplTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/CencTracksImplTest.java @@ -1,6 +1,6 @@ package org.mp4parser.muxer.tracks; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.Container; import org.mp4parser.muxer.InMemRandomAccessSourceImpl; import org.mp4parser.muxer.Movie; diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/ClippedTrackTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/ClippedTrackTest.java index 6f4dbe466..662918fa3 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/ClippedTrackTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/ClippedTrackTest.java @@ -1,7 +1,7 @@ package org.mp4parser.muxer.tracks; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.boxes.iso14496.part12.CompositionTimeToSample; import org.mp4parser.boxes.iso14496.part12.TimeToSampleBox; @@ -24,47 +24,47 @@ public void testGetDecodingTimeEntries() throws Exception { e.add(new TimeToSampleBox.Entry(3, 5)); e.add(new TimeToSampleBox.Entry(2, 6)); List r = ClippedTrack.getDecodingTimeEntries(e, 0, 1); - Assert.assertEquals(1, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getDelta()); + Assertions.assertEquals(1, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getDelta()); r = ClippedTrack.getDecodingTimeEntries(e, 0, 2); - Assert.assertEquals(1, r.size()); - Assert.assertEquals(2, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getDelta()); + Assertions.assertEquals(1, r.size()); + Assertions.assertEquals(2, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getDelta()); r = ClippedTrack.getDecodingTimeEntries(e, 1, 2); - Assert.assertEquals(1, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getDelta()); + Assertions.assertEquals(1, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getDelta()); r = ClippedTrack.getDecodingTimeEntries(e, 1, 3); - Assert.assertEquals(2, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getDelta()); - Assert.assertEquals(1, r.get(1).getCount()); - Assert.assertEquals(4, r.get(1).getDelta()); + Assertions.assertEquals(2, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getDelta()); + Assertions.assertEquals(1, r.get(1).getCount()); + Assertions.assertEquals(4, r.get(1).getDelta()); r = ClippedTrack.getDecodingTimeEntries(e, 3, 4); - Assert.assertEquals(1, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(4, r.get(0).getDelta()); + Assertions.assertEquals(1, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(4, r.get(0).getDelta()); r = ClippedTrack.getDecodingTimeEntries(e, 1, 6); - Assert.assertEquals(3, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getDelta()); - Assert.assertEquals(3, r.get(1).getCount()); - Assert.assertEquals(4, r.get(1).getDelta()); - Assert.assertEquals(1, r.get(2).getCount()); - Assert.assertEquals(5, r.get(2).getDelta()); + Assertions.assertEquals(3, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getDelta()); + Assertions.assertEquals(3, r.get(1).getCount()); + Assertions.assertEquals(4, r.get(1).getDelta()); + Assertions.assertEquals(1, r.get(2).getCount()); + Assertions.assertEquals(5, r.get(2).getDelta()); r = ClippedTrack.getDecodingTimeEntries(e, 2, 6); - Assert.assertEquals(2, r.size()); - Assert.assertEquals(3, r.get(0).getCount()); - Assert.assertEquals(4, r.get(0).getDelta()); - Assert.assertEquals(1, r.get(1).getCount()); - Assert.assertEquals(5, r.get(1).getDelta()); + Assertions.assertEquals(2, r.size()); + Assertions.assertEquals(3, r.get(0).getCount()); + Assertions.assertEquals(4, r.get(0).getDelta()); + Assertions.assertEquals(1, r.get(1).getCount()); + Assertions.assertEquals(5, r.get(1).getDelta()); r = ClippedTrack.getDecodingTimeEntries(e, 2, 8); - Assert.assertEquals(2, r.size()); - Assert.assertEquals(3, r.get(0).getCount()); - Assert.assertEquals(4, r.get(0).getDelta()); - Assert.assertEquals(3, r.get(1).getCount()); - Assert.assertEquals(5, r.get(1).getDelta()); + Assertions.assertEquals(2, r.size()); + Assertions.assertEquals(3, r.get(0).getCount()); + Assertions.assertEquals(4, r.get(0).getDelta()); + Assertions.assertEquals(3, r.get(1).getCount()); + Assertions.assertEquals(5, r.get(1).getDelta()); } @@ -76,46 +76,46 @@ public void testGetCompositionTimes() throws Exception { e.add(new CompositionTimeToSample.Entry(3, 5)); e.add(new CompositionTimeToSample.Entry(2, 6)); List r = ClippedTrack.getCompositionTimeEntries(e, 0, 1); - Assert.assertEquals(1, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getOffset()); + Assertions.assertEquals(1, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getOffset()); r = ClippedTrack.getCompositionTimeEntries(e, 0, 2); - Assert.assertEquals(1, r.size()); - Assert.assertEquals(2, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getOffset()); + Assertions.assertEquals(1, r.size()); + Assertions.assertEquals(2, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getOffset()); r = ClippedTrack.getCompositionTimeEntries(e, 1, 2); - Assert.assertEquals(1, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getOffset()); + Assertions.assertEquals(1, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getOffset()); r = ClippedTrack.getCompositionTimeEntries(e, 1, 3); - Assert.assertEquals(2, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getOffset()); - Assert.assertEquals(1, r.get(1).getCount()); - Assert.assertEquals(4, r.get(1).getOffset()); + Assertions.assertEquals(2, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getOffset()); + Assertions.assertEquals(1, r.get(1).getCount()); + Assertions.assertEquals(4, r.get(1).getOffset()); r = ClippedTrack.getCompositionTimeEntries(e, 3, 4); - Assert.assertEquals(1, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(4, r.get(0).getOffset()); + Assertions.assertEquals(1, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(4, r.get(0).getOffset()); r = ClippedTrack.getCompositionTimeEntries(e, 1, 6); - Assert.assertEquals(3, r.size()); - Assert.assertEquals(1, r.get(0).getCount()); - Assert.assertEquals(3, r.get(0).getOffset()); - Assert.assertEquals(3, r.get(1).getCount()); - Assert.assertEquals(4, r.get(1).getOffset()); - Assert.assertEquals(1, r.get(2).getCount()); - Assert.assertEquals(5, r.get(2).getOffset()); + Assertions.assertEquals(3, r.size()); + Assertions.assertEquals(1, r.get(0).getCount()); + Assertions.assertEquals(3, r.get(0).getOffset()); + Assertions.assertEquals(3, r.get(1).getCount()); + Assertions.assertEquals(4, r.get(1).getOffset()); + Assertions.assertEquals(1, r.get(2).getCount()); + Assertions.assertEquals(5, r.get(2).getOffset()); r = ClippedTrack.getCompositionTimeEntries(e, 2, 6); - Assert.assertEquals(2, r.size()); - Assert.assertEquals(3, r.get(0).getCount()); - Assert.assertEquals(4, r.get(0).getOffset()); - Assert.assertEquals(1, r.get(1).getCount()); - Assert.assertEquals(5, r.get(1).getOffset()); + Assertions.assertEquals(2, r.size()); + Assertions.assertEquals(3, r.get(0).getCount()); + Assertions.assertEquals(4, r.get(0).getOffset()); + Assertions.assertEquals(1, r.get(1).getCount()); + Assertions.assertEquals(5, r.get(1).getOffset()); r = ClippedTrack.getCompositionTimeEntries(e, 2, 8); - Assert.assertEquals(2, r.size()); - Assert.assertEquals(3, r.get(0).getCount()); - Assert.assertEquals(4, r.get(0).getOffset()); - Assert.assertEquals(3, r.get(1).getCount()); - Assert.assertEquals(5, r.get(1).getOffset()); + Assertions.assertEquals(2, r.size()); + Assertions.assertEquals(3, r.get(0).getCount()); + Assertions.assertEquals(4, r.get(0).getOffset()); + Assertions.assertEquals(3, r.get(1).getCount()); + Assertions.assertEquals(5, r.get(1).getOffset()); } } diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/DTSTrackImplTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/DTSTrackImplTest.java index c49ad33ab..392d066c2 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/DTSTrackImplTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/DTSTrackImplTest.java @@ -1,6 +1,6 @@ package org.mp4parser.muxer.tracks; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.Container; import org.mp4parser.IsoFile; import org.mp4parser.muxer.FileDataSourceImpl; diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/H264TrackImplTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/H264TrackImplTest.java index b3d1d3e51..10cbc6f74 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/H264TrackImplTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/H264TrackImplTest.java @@ -15,7 +15,7 @@ */ package org.mp4parser.muxer.tracks; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.Container; import org.mp4parser.IsoFile; import org.mp4parser.muxer.DataSource; diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/h265/SequenceParameterSetRbspTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/h265/SequenceParameterSetRbspTest.java index f2856fb5d..cc6327278 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/h265/SequenceParameterSetRbspTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/h265/SequenceParameterSetRbspTest.java @@ -1,7 +1,7 @@ package org.mp4parser.muxer.tracks.h265; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.boxes.iso14496.part15.HevcConfigurationBox; import org.mp4parser.boxes.iso14496.part15.HevcDecoderConfigurationRecord; @@ -25,10 +25,10 @@ public void test1() throws IOException { bais.read(); // nal unit header bais.read(); // nal unit header SequenceParameterSetRbsp sps = new SequenceParameterSetRbsp(bais); - Assert.assertTrue(sps.vuiParameters.colour_description_present_flag); - Assert.assertEquals(9,sps.vuiParameters.colour_primaries); - Assert.assertEquals(16,sps.vuiParameters.transfer_characteristics); - Assert.assertEquals(9,sps.vuiParameters.matrix_coeffs); + Assertions.assertTrue(sps.vuiParameters.colour_description_present_flag); + Assertions.assertEquals(9,sps.vuiParameters.colour_primaries); + Assertions.assertEquals(16,sps.vuiParameters.transfer_characteristics); + Assertions.assertEquals(9,sps.vuiParameters.matrix_coeffs); } } } diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/ttml/TtmlHelpersTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/ttml/TtmlHelpersTest.java index bf70ef51e..b4dbf38ef 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/ttml/TtmlHelpersTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/ttml/TtmlHelpersTest.java @@ -1,7 +1,7 @@ package org.mp4parser.muxer.tracks.ttml; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -26,14 +26,14 @@ public class TtmlHelpersTest { @Test public void testToTime() throws Exception { - Assert.assertEquals(-3599000, toTime("-00:59:59.000")); - Assert.assertEquals(3599000, toTime("00:59:59.000")); + Assertions.assertEquals(-3599000, toTime("-00:59:59.000")); + Assertions.assertEquals(3599000, toTime("00:59:59.000")); } @Test public void testToTimeExpression() throws Exception { - Assert.assertEquals("-00:59:59.009", toTimeExpression(-3599009)); - Assert.assertEquals("00:59:59.010", toTimeExpression(3599010)); + Assertions.assertEquals("-00:59:59.009", toTimeExpression(-3599009)); + Assertions.assertEquals("00:59:59.010", toTimeExpression(3599010)); } @Test @@ -64,13 +64,13 @@ public void testDeepCopyDocument() throws IOException, ParserConfigurationExcept Node backgroundImage = nl.item(i); URI backgroundImageUri = URI.create(backgroundImage.getNodeValue()); File bgImg = new File(new URI(copy.getDocumentURI()).resolve(backgroundImageUri)); - Assert.assertTrue(bgImg.exists()); - Assert.assertTrue(bgImg.delete()); + Assertions.assertTrue(bgImg.exists()); + Assertions.assertTrue(bgImg.delete()); bgImg.getParentFile().delete(); } - Assert.assertTrue(targetFile.delete()); - Assert.assertTrue(f.delete()); - Assert.assertTrue(master.delete()); + Assertions.assertTrue(targetFile.delete()); + Assertions.assertTrue(f.delete()); + Assertions.assertTrue(master.delete()); } diff --git a/muxer/src/test/java/org/mp4parser/muxer/tracks/webvtt/WebVttTrackTest.java b/muxer/src/test/java/org/mp4parser/muxer/tracks/webvtt/WebVttTrackTest.java index 6b2b25220..8c240f87b 100644 --- a/muxer/src/test/java/org/mp4parser/muxer/tracks/webvtt/WebVttTrackTest.java +++ b/muxer/src/test/java/org/mp4parser/muxer/tracks/webvtt/WebVttTrackTest.java @@ -1,10 +1,10 @@ package org.mp4parser.muxer.tracks.webvtt; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Locale; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Created by sannies on 27.08.2015. diff --git a/pom.xml b/pom.xml index ca555f665..223c96af8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,34 +5,64 @@ pom 1.9.57-SNAPSHOT MP4 Parser Project - MP4 Parser Project (parent) - - - Sebastian Annies - Sebastian.Annies@gmail.com - - + MP4 Parser Project (parent) https://github.com/sannies/mp4parser + Apache License Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt + + + + Sebastian Annies + Sebastian.Annies@gmail.com + + + + + https://github.com/sannies/mp4parser + scm:git:git@github.com:sannies/mp4parser.git + HEAD + + + + isoparser + muxer + streaming + + ossrh https://oss.sonatype.org/content/repositories/snapshots/ - - isoparser - muxer - streaming - - - 3.0 - + + + UTF-8 + + + 5.14.1 + 2.0.17 + 1.9.7 + 2.21.0 + 1.20.0 + + + 3.3.1 + 3.2.8 + 3.3.1 + 3.14.1 + 3.12.0 + 3.1.1 + 3.8.1 + 1.7.0 + 1.15.0 + + android @@ -41,7 +71,6 @@ - release @@ -63,7 +92,6 @@ org.apache.maven.plugins maven-javadoc-plugin - attach-javadocs @@ -77,7 +105,6 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 sign-artifacts @@ -92,58 +119,90 @@ - - - UTF-8 - + + + + + + org.junit + junit-bom + ${junit.version} + pom + import + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + + + commons-io + commons-io + ${commons-io.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + + install + org.apache.maven.plugins maven-source-plugin - 3.0.1 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.1 - - 8 - false - + ${maven-source-plugin.version} org.apache.maven.plugins maven-gpg-plugin - 1.6 + ${maven-gpg-plugin.version} org.apache.maven.plugins maven-resources-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 + ${maven-resources-plugin.version} org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + ${maven-compiler-plugin.version} - 8 - 8 - 8 + 1.8 + 1.8 org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + ${maven-javadoc-plugin.version} 8 false @@ -152,7 +211,7 @@ org.apache.maven.plugins maven-release-plugin - 3.0.0-M5 + ${maven-release-plugin.version} true true @@ -166,10 +225,15 @@ true + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + ${nexus-staging-maven-plugin.version} true @@ -186,8 +250,21 @@ true + + org.codehaus.mojo + aspectj-maven-plugin + ${aspectj-maven-plugin.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + + org.sonatype.plugins @@ -199,9 +276,4 @@ - - https://github.com/sannies/mp4parser - scm:git:git@github.com:sannies/mp4parser.git - mp4parser-project-1.9.43 - - + \ No newline at end of file diff --git a/streaming/pom.xml b/streaming/pom.xml index dc14f3fba..5281fc5d5 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -1,86 +1,40 @@ 4.0.0 - org.mp4parser streaming - 1.9.57-SNAPSHOT + Stream Muxer + This package has a focus on streams. It can read A/V data from e.g. a network source. + + + mp4parser-project + org.mp4parser + 1.9.57-SNAPSHOT + + org.mp4parser isoparser - 1.9.57-SNAPSHOT + ${project.version} - junit - junit - 4.12 + org.junit.jupiter + junit-jupiter test org.mp4parser muxer - 1.9.57-SNAPSHOT + ${project.version} test org.slf4j slf4j-simple - 1.8.0-beta4 test - Stream Muxer - This package has a focus on streams. It can read A/V data from e.g. a network source. - https://github.com/sannies/mp4parser - - UTF-8 - - - mp4parser-project - org.mp4parser - 1.9.57-SNAPSHOT - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - + @@ -95,33 +49,10 @@ org.apache.maven.plugins maven-source-plugin - - org.apache.maven.plugins - maven-javadoc-plugin - org.apache.maven.plugins maven-gpg-plugin - - - - Apache Software License - Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - - sannies - Sebastian.Annies@gmail.com - - - - https://github.com/sannies/mp4parser - mp4parser-project-1.9.43 - \ No newline at end of file diff --git a/streaming/src/test/java/org/mp4parser/streaming/containersource/DiscardingByteArrayOutputStreamTest.java b/streaming/src/test/java/org/mp4parser/streaming/containersource/DiscardingByteArrayOutputStreamTest.java index 418fdde82..f4ae02ac2 100644 --- a/streaming/src/test/java/org/mp4parser/streaming/containersource/DiscardingByteArrayOutputStreamTest.java +++ b/streaming/src/test/java/org/mp4parser/streaming/containersource/DiscardingByteArrayOutputStreamTest.java @@ -1,7 +1,7 @@ package org.mp4parser.streaming.containersource; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mp4parser.streaming.input.mp4.DiscardingByteArrayOutputStream; /** @@ -21,17 +21,17 @@ public void testSimple() throws Exception { dbaos.write(6); dbaos.write(7); byte[] b = dbaos.get(3, 3); - Assert.assertArrayEquals(new byte[]{3, 4, 5}, b); + Assertions.assertArrayEquals(new byte[]{3, 4, 5}, b); dbaos.discardTo(3); b = dbaos.get(3, 3); - Assert.assertArrayEquals(new byte[]{3, 4, 5}, b); + Assertions.assertArrayEquals(new byte[]{3, 4, 5}, b); dbaos.discardTo(3); b = dbaos.get(3, 3); - Assert.assertArrayEquals(new byte[]{3, 4, 5}, b); + Assertions.assertArrayEquals(new byte[]{3, 4, 5}, b); dbaos.discardTo(4); b = dbaos.get(4, 3); - Assert.assertArrayEquals(new byte[]{4, 5, 6}, b); + Assertions.assertArrayEquals(new byte[]{4, 5, 6}, b); } } \ No newline at end of file diff --git a/streaming/src/test/java/org/mp4parser/streaming/input/aac/AdtsAacStreamingTrackTest.java b/streaming/src/test/java/org/mp4parser/streaming/input/aac/AdtsAacStreamingTrackTest.java index 1a7ec0809..b05c50f24 100644 --- a/streaming/src/test/java/org/mp4parser/streaming/input/aac/AdtsAacStreamingTrackTest.java +++ b/streaming/src/test/java/org/mp4parser/streaming/input/aac/AdtsAacStreamingTrackTest.java @@ -1,6 +1,6 @@ package org.mp4parser.streaming.input.aac; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.muxer.InMemRandomAccessSourceImpl; import org.mp4parser.muxer.Sample; diff --git a/streaming/src/test/java/org/mp4parser/streaming/input/h264/H264AnnexBTrackTest.java b/streaming/src/test/java/org/mp4parser/streaming/input/h264/H264AnnexBTrackTest.java index 63f02e7f5..6658bba54 100644 --- a/streaming/src/test/java/org/mp4parser/streaming/input/h264/H264AnnexBTrackTest.java +++ b/streaming/src/test/java/org/mp4parser/streaming/input/h264/H264AnnexBTrackTest.java @@ -1,6 +1,6 @@ package org.mp4parser.streaming.input.h264; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.IsoFile; import org.mp4parser.muxer.InMemRandomAccessSourceImpl; import org.mp4parser.muxer.Sample; diff --git a/streaming/src/test/java/org/mp4parser/streaming/input/h264/NalStreamTokenizerTest.java b/streaming/src/test/java/org/mp4parser/streaming/input/h264/NalStreamTokenizerTest.java index b951698f6..17932c6a3 100644 --- a/streaming/src/test/java/org/mp4parser/streaming/input/h264/NalStreamTokenizerTest.java +++ b/streaming/src/test/java/org/mp4parser/streaming/input/h264/NalStreamTokenizerTest.java @@ -1,7 +1,7 @@ package org.mp4parser.streaming.input.h264; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Created by sannies on 15.08.2015. @@ -22,7 +22,7 @@ public void testTokenize() throws Exception { //System.err.println(Hex.encodeHex(nal)); i++; } - Assert.assertEquals(1019, i); + Assertions.assertEquals(1019, i); // not much of a test but hey ... better than nothing } } \ No newline at end of file diff --git a/streaming/src/test/java/org/mp4parser/streaming/output/mp4/StandardMp4WriterTest.java b/streaming/src/test/java/org/mp4parser/streaming/output/mp4/StandardMp4WriterTest.java index 8ac79f57a..4a9dd273b 100644 --- a/streaming/src/test/java/org/mp4parser/streaming/output/mp4/StandardMp4WriterTest.java +++ b/streaming/src/test/java/org/mp4parser/streaming/output/mp4/StandardMp4WriterTest.java @@ -1,6 +1,6 @@ package org.mp4parser.streaming.output.mp4; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mp4parser.streaming.StreamingTrack; import org.mp4parser.streaming.input.h264.H264AnnexBTrack;