diff --git a/.run/java in jaudiotagger.run.xml b/.run/java in jaudiotagger.run.xml
new file mode 100644
index 0000000..a86e063
--- /dev/null
+++ b/.run/java in jaudiotagger.run.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 448ccbf..c0f13ef 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
This is a maintained fork of [Kaned1as/jaudiotagger](https://github.com/Kaned1as/jaudiotagger).
+# Status
+
+[](https://github.com/sknull/jaudiotagger/actions/workflows/build.yml)
+
# Jaudiotagger
Jaudiotagger is a Java library for reading and writing audio metadata. It supports a wide range of audio formats,
diff --git a/pom.xml b/pom.xml
index 45d29f3..65f5f5b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,20 @@
2.0.17
+
+
+ ch.qos.logback
+ logback-classic
+ 1.5.13
+ test
+
+
+ ch.qos.logback
+ logback-core
+ 1.5.13
+ test
+
+
org.junit.jupiter
@@ -77,7 +91,6 @@
3.27.6
test
-
@@ -121,6 +134,40 @@
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.14.1
+
+
+ default-compile
+ none
+
+
+ default-testCompile
+ none
+
+
+ compile
+ compile
+
+ compile
+
+
+
+ testCompile
+ test-compile
+
+ testCompile
+
+
+
+
+ UTF-8
+ ${java.version}
+ ${java.version}
+
+
diff --git a/src/test/java/org/jaudiotagger/AbstractBaseTestCase.java b/src/test/java/org/jaudiotagger/AbstractBaseTestCase.java
new file mode 100644
index 0000000..22d1ce2
--- /dev/null
+++ b/src/test/java/org/jaudiotagger/AbstractBaseTestCase.java
@@ -0,0 +1,197 @@
+package org.jaudiotagger;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class AbstractBaseTestCase {
+
+ private static File tempDirectory;
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
+ @BeforeAll
+ public static void setUpOnce() throws Exception {
+ tempDirectory = Files.createTempDirectory("jaudiotagger_").toFile();
+ }
+
+ public boolean executeAlsoWithMissingResources() {
+ return false;
+ }
+
+ /**
+ * Copy audiofile to processing dir ready for use in test
+ *
+ * @param fileName
+ * @return
+ */
+ public File copyAudioToTmp(String fileName) {
+ File inputFile = fileResource("testdata", fileName);
+ if (inputFile.exists()) {
+ File outputFile = tempFileResource(fileName);
+ if (!outputFile.getParentFile().exists()) {
+ outputFile.getParentFile().mkdirs();
+ }
+ boolean result = copy(inputFile, outputFile);
+ assertTrue(result);
+ return outputFile;
+ } else {
+ log.warn("Sourcefile does not exist '" + inputFile + "'");
+ return null;
+ }
+ }
+
+ /**
+ * Copy a File
+ *
+ * @param fromFile The existing File
+ * @param toFile The new File
+ * @return true if and only if the renaming succeeded;
+ * false otherwise
+ */
+ public boolean copy(File fromFile, File toFile) {
+ try (
+ FileInputStream fins = new FileInputStream((fromFile));
+ FileOutputStream fouts = new FileOutputStream((toFile))
+ ) {
+ fins.transferTo(fouts);
+ fouts.flush();
+
+ // cleanupif files are not the same length
+ long length1 = fromFile.length();
+ long length2 = toFile.length();
+ if (length1 != length2) {
+ toFile.delete();
+
+ return false;
+ }
+
+ return true;
+ } catch (IOException e) {
+ return false;
+ }
+ }
+
+ public File tempFileResource(String fileName) {
+ File file;
+ if (fileName == null) {
+ file = tempDirectory;
+ } else {
+ file = new File(tempDirectory, fileName);
+ }
+ return file;
+ }
+
+ public File fileResource(String directory, String fileName) {
+ String dir;
+ if (!directory.endsWith("/")) {
+ dir = directory + "/";
+ } else {
+ dir = directory;
+ }
+ File file = null;
+ try {
+ URI resource;
+ if (fileName == null) {
+ resource = ClassLoader.getSystemResource(dir).toURI();
+ } else {
+ resource = ClassLoader.getSystemResource(dir + fileName).toURI();
+ }
+ file = new File(resource);
+ } catch (Exception e) {
+ log.error("Could not open resource '" + dir + fileName + "'");
+ }
+ return file;
+ }
+
+ /**
+ * Copy audiofile to processing dir ready for use in test, use this if using
+ * same file in multiple tests because with junit multithreading can have
+ * problems otherwise
+ *
+ * @param fileName
+ * @return
+ */
+ public File copyAudioToTmp(String fileName, String newFileName) {
+ File inputFile = fileResource("testdata", fileName);
+ File outputFile = tempFileResource(newFileName);
+ if (!outputFile.getParentFile().exists()) {
+ outputFile.getParentFile().mkdirs();
+ }
+ boolean result = copy(inputFile, outputFile);
+ assertTrue(result);
+ return outputFile;
+ }
+
+ /**
+ * Prepends file with tag file in order to create an mp3 with a valid id3
+ *
+ * @param tagfile
+ * @param fileName
+ * @return
+ */
+ public File prependAudioToTmp(String tagfile, String fileName) {
+ File inputTagFile = fileResource("testtagdata", tagfile);
+ File inputFile = fileResource("testdata", fileName);
+ File outputFile = tempFileResource(fileName);
+ if (!outputFile.getParentFile().exists()) {
+ outputFile.getParentFile().mkdirs();
+ }
+ boolean result = append(inputTagFile, inputFile, outputFile);
+ assertTrue(result);
+ return outputFile;
+ }
+
+ private boolean append(File fromFile1, File fromFile2, File toFile) {
+ try {
+ FileInputStream in = new FileInputStream(fromFile1);
+ FileInputStream in2 = new FileInputStream(fromFile2);
+ FileOutputStream out = new FileOutputStream(toFile);
+ BufferedInputStream inBuffer = new BufferedInputStream(in);
+ BufferedInputStream inBuffer2 = new BufferedInputStream(in2);
+ BufferedOutputStream outBuffer = new BufferedOutputStream(out);
+
+ int theByte;
+
+ while ((theByte = inBuffer.read()) > -1) {
+ outBuffer.write(theByte);
+ }
+
+ while ((theByte = inBuffer2.read()) > -1) {
+ outBuffer.write(theByte);
+ }
+
+ outBuffer.close();
+ inBuffer.close();
+ inBuffer2.close();
+ out.close();
+ in.close();
+ in2.close();
+
+ // cleanupif files are not the same length
+ if ((fromFile1.length() + fromFile2.length()) != toFile.length()) {
+ toFile.delete();
+
+ return false;
+ }
+
+ return true;
+ } catch (IOException e) {
+ return false;
+ }
+ }
+
+ public File fileResource(String directory) {
+ return fileResource(directory, null);
+ }
+}
diff --git a/src/test/java/org/jaudiotagger/AbstractTestCase.java b/src/test/java/org/jaudiotagger/AbstractTestCase.java
index 76f305a..0a51277 100755
--- a/src/test/java/org/jaudiotagger/AbstractTestCase.java
+++ b/src/test/java/org/jaudiotagger/AbstractTestCase.java
@@ -27,7 +27,7 @@
/**
*
*/
-public abstract class AbstractTestCase {
+public abstract class AbstractTestCase extends AbstractBaseTestCase {
@BeforeEach
public void setUp() {
@@ -42,7 +42,7 @@ public void setUp() {
private static final EnumMap ERROR_PATTERNS;
static {
- ERROR_PATTERNS = new EnumMap(ErrorMessage.class);
+ ERROR_PATTERNS = new EnumMap<>(ErrorMessage.class);
for (ErrorMessage curr : ErrorMessage.values()) {
final String regex = curr.getMsg().replaceAll("\\{\\d+\\}", ".*");
ERROR_PATTERNS.put(
@@ -51,136 +51,4 @@ public void setUp() {
);
}
}
-
- private static boolean append(File fromFile1, File fromFile2, File toFile) {
- try {
- FileInputStream in = new FileInputStream(fromFile1);
- FileInputStream in2 = new FileInputStream(fromFile2);
- FileOutputStream out = new FileOutputStream(toFile);
- BufferedInputStream inBuffer = new BufferedInputStream(in);
- BufferedInputStream inBuffer2 = new BufferedInputStream(in2);
- BufferedOutputStream outBuffer = new BufferedOutputStream(out);
-
- int theByte;
-
- while ((theByte = inBuffer.read()) > -1) {
- outBuffer.write(theByte);
- }
-
- while ((theByte = inBuffer2.read()) > -1) {
- outBuffer.write(theByte);
- }
-
- outBuffer.close();
- inBuffer.close();
- inBuffer2.close();
- out.close();
- in.close();
- in2.close();
-
- // cleanupif files are not the same length
- if ((fromFile1.length() + fromFile2.length()) != toFile.length()) {
- toFile.delete();
-
- return false;
- }
-
- return true;
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- }
- }
-
- /**
- * Copy a File
- *
- * @param fromFile The existing File
- * @param toFile The new File
- * @return true if and only if the renaming succeeded;
- * false otherwise
- */
- public static boolean copy(File fromFile, File toFile) {
- try {
- FileInputStream in = new FileInputStream(fromFile);
- FileOutputStream out = new FileOutputStream(toFile);
- byte[] buf = new byte[8192];
-
- int len;
-
- while ((len = in.read(buf)) > -1) {
- out.write(buf, 0, len);
- }
-
- in.close();
- out.close();
-
- // cleanupif files are not the same length
- if (fromFile.length() != toFile.length()) {
- toFile.delete();
-
- return false;
- }
-
- return true;
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- }
- }
-
- /**
- * Copy audiofile to processing dir ready for use in test
- *
- * @param fileName
- * @return
- */
- public static File copyAudioToTmp(String fileName) {
- File inputFile = new File("testdata", fileName);
- File outputFile = new File("testdatatmp", fileName);
- if (!outputFile.getParentFile().exists()) {
- outputFile.getParentFile().mkdirs();
- }
- boolean result = copy(inputFile, outputFile);
- assertTrue(result);
- return outputFile;
- }
-
- /**
- * Copy audiofile to processing dir ready for use in test, use this if using
- * same file in multiple tests because with junit multithreading can have
- * problems otherwise
- *
- * @param fileName
- * @return
- */
- public static File copyAudioToTmp(String fileName, File newFileName) {
- File inputFile = new File("testdata", fileName);
- File outputFile = new File("testdatatmp", newFileName.getName());
- if (!outputFile.getParentFile().exists()) {
- outputFile.getParentFile().mkdirs();
- }
- boolean result = copy(inputFile, outputFile);
- assertTrue(result);
- return outputFile;
- }
-
- /**
- * Prepends file with tag file in order to create an mp3 with a valid id3
- *
- * @param tagfile
- * @param fileName
- * @return
- */
- public static File copyAudioToTmp(String tagfile, String fileName) {
- File inputTagFile = new File("testtagdata", tagfile);
- File inputFile = new File("testdata", fileName);
- File outputFile = new File("testdatatmp", fileName);
- if (!outputFile.getParentFile().exists()) {
- outputFile.getParentFile().mkdirs();
- }
- boolean result = append(inputTagFile, inputFile, outputFile);
- assertTrue(result);
- return outputFile;
- }
}
diff --git a/src/test/java/org/jaudiotagger/FilePermissionsTest.java b/src/test/java/org/jaudiotagger/FilePermissionsTest.java
index 071dadf..7d7afba 100755
--- a/src/test/java/org/jaudiotagger/FilePermissionsTest.java
+++ b/src/test/java/org/jaudiotagger/FilePermissionsTest.java
@@ -12,9 +12,9 @@
import org.jaudiotagger.tag.TagException;
import org.jaudiotagger.tag.TagOptionSingleton;
-public class FilePermissionsTest {
+public class FilePermissionsTest extends AbstractBaseTestCase {
- public static void runWriteWriteProtectedFileWithCheckDisabled(
+ public void runWriteWriteProtectedFileWithCheckDisabled(
String sourceFile
) throws Exception {
File testFile = createFile(sourceFile);
@@ -37,7 +37,7 @@ public static void runWriteWriteProtectedFileWithCheckDisabled(
}
}
- public static void runWriteWriteProtectedFileWithCheckEnabled(
+ public void runWriteWriteProtectedFileWithCheckEnabled(
String sourceFile
) throws Exception {
File testFile = createFile(sourceFile);
@@ -60,7 +60,7 @@ public static void runWriteWriteProtectedFileWithCheckEnabled(
}
}
- public static void runWriteReadOnlyFileWithCheckDisabled(String sourceFile)
+ public void runWriteReadOnlyFileWithCheckDisabled(String sourceFile)
throws Exception {
File testFile = createFile(sourceFile);
assertTrue(testFile.exists(), "Test file must exist");
@@ -83,11 +83,11 @@ public static void runWriteReadOnlyFileWithCheckDisabled(String sourceFile)
}
}
- private static File createFile(String sourceFile) {
+ private File createFile(String sourceFile) {
String[] baseNameAndExt = sourceFile.split("\\.(?=[^\\.]+$)");
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
sourceFile,
- new File(baseNameAndExt[0] + "WriteProtected." + baseNameAndExt[1])
+ baseNameAndExt[0] + "WriteProtected." + baseNameAndExt[1]
);
return testFile;
}
diff --git a/src/test/java/org/jaudiotagger/TestFileTypeMagic.java b/src/test/java/org/jaudiotagger/TestFileTypeMagic.java
index a12b8c4..cd45e4b 100755
--- a/src/test/java/org/jaudiotagger/TestFileTypeMagic.java
+++ b/src/test/java/org/jaudiotagger/TestFileTypeMagic.java
@@ -1,24 +1,23 @@
package org.jaudiotagger;
-import java.io.File;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
-public class TestFileTypeMagic {
+public class TestFileTypeMagic extends AbstractBaseTestCase {
- public static void testMagic() throws Exception {
- File testFileLoc = new File("testdata", "test.m4a");
- if (!testFileLoc.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
+ @Test
+ public void testMagic() throws Exception {
+ File testFileLoc = fileResource("testdata", "test.m4a");
- testFileLoc = AbstractTestCase.copyAudioToTmp("test.m4a");
+ testFileLoc = copyAudioToTmp("test.m4a");
AudioFile f = AudioFileIO.readMagic(testFileLoc);
Tag audioTag = f.getTag();
- System.err.println("audiotag:" + audioTag.toString());
+ log.error("audiotag:" + audioTag.toString());
audioTag.setField(FieldKey.ALBUM, "TestAsPass");
AudioFileIO.write(f);
}
diff --git a/src/test/java/org/jaudiotagger/audio/AudioFileWriteAsTest.java b/src/test/java/org/jaudiotagger/audio/AudioFileWriteAsTest.java
index ff841b0..4b38249 100755
--- a/src/test/java/org/jaudiotagger/audio/AudioFileWriteAsTest.java
+++ b/src/test/java/org/jaudiotagger/audio/AudioFileWriteAsTest.java
@@ -21,9 +21,9 @@ public class AudioFileWriteAsTest extends AbstractTestCase {
@BeforeEach
public void setUp() {
super.setUp();
- File orig = new File("testdata", "01.mp3");
+ File orig = fileResource("testdata", "01.mp3");
try {
- sourceFile = AbstractTestCase.copyAudioToTmp(orig.getName());
+ sourceFile = copyAudioToTmp(orig.getName());
af = AudioFileIO.read(sourceFile);
} catch (Throwable e) {
throw new RuntimeException("Can't setUp test.", e);
@@ -36,7 +36,7 @@ public void testWriteAs() throws Exception {
af.commit();
final String parent = sourceFile.getParent();
- File destinationNoExtension = new File(parent, DESTINATION_FILE_NAME);
+ File destinationNoExtension = tempFileResource(DESTINATION_FILE_NAME);
AudioFileIO.writeAs(af, destinationNoExtension.getPath());
assertEquals(
diff --git a/src/test/java/org/jaudiotagger/audio/GenericTest.java b/src/test/java/org/jaudiotagger/audio/GenericTest.java
index 4a08592..13b933d 100755
--- a/src/test/java/org/jaudiotagger/audio/GenericTest.java
+++ b/src/test/java/org/jaudiotagger/audio/GenericTest.java
@@ -4,33 +4,35 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.junit.jupiter.api.Test;
-public class GenericTest {
+public class GenericTest extends AbstractBaseTestCase {
/**
* Test File filter, postive and negative tests
*/
@Test
public void testReadFileUnsupportedFormat() {
- File nonAudioFile = new File("testdata", "coverart.bmp");
+ File nonAudioFile = fileResource("testdata", "coverart.bmp");
AudioFileFilter aff = new AudioFileFilter();
aff.accept(nonAudioFile);
assertFalse(aff.accept(nonAudioFile));
- File audioFile = new File("testdata", "test.m4a");
+ File audioFile = fileResource("testdata", "test.m4a");
aff.accept(audioFile);
assertTrue(aff.accept(audioFile));
- audioFile = new File("testdata", "test.flac");
+ audioFile = fileResource("testdata", "test.flac");
aff.accept(audioFile);
assertTrue(aff.accept(audioFile));
- audioFile = new File("testdata", "test.ogg");
+ audioFile = fileResource("testdata", "test.ogg");
aff.accept(audioFile);
assertTrue(aff.accept(audioFile));
- audioFile = new File("testdata", "testV1.mp3");
+ audioFile = fileResource("testdata", "testV1.mp3");
aff.accept(audioFile);
assertTrue(aff.accept(audioFile));
}
diff --git a/src/test/java/org/jaudiotagger/audio/aiff/AiffAudioFileTest.java b/src/test/java/org/jaudiotagger/audio/aiff/AiffAudioFileTest.java
index 9ba9b75..c7d24b1 100755
--- a/src/test/java/org/jaudiotagger/audio/aiff/AiffAudioFileTest.java
+++ b/src/test/java/org/jaudiotagger/audio/aiff/AiffAudioFileTest.java
@@ -3,30 +3,25 @@
import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.AudioHeader;
import org.junit.jupiter.api.Test;
-public class AiffAudioFileTest {
+public class AiffAudioFileTest extends AbstractBaseTestCase {
@Test
public void testReadAifcNotCompressed() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test119.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test119.aif");
+ File testFile = copyAudioToTmp("test119.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
- System.out.println(ah);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
assertEquals("128", ah.getBitRate());
assertEquals(128, ah.getBitRateAsNumber());
@@ -43,7 +38,6 @@ public void testReadAifcNotCompressed() {
assertEquals(1, aah.getAnnotations().size());
//assertEquals("AFspdate: 2003-01-30 03:28:35 UTC\u0000user: kabal@CAPELLA\u0000program: CopyAudio ", aah.getAnnotations().get(0));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -53,20 +47,14 @@ public void testReadAifcNotCompressed() {
public void testReadAiff2() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test120.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test120.aif");
+ File testFile = copyAudioToTmp("test120.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
- System.out.println(ah);
assertEquals("1411", ah.getBitRate());
assertEquals(1411, ah.getBitRateAsNumber());
@@ -82,7 +70,6 @@ public void testReadAiff2() {
assertTrue(aah.getComments().isEmpty());
assertTrue(aah.getAnnotations().isEmpty());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -92,20 +79,14 @@ public void testReadAiff2() {
public void testReadAiff3() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test121.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test121.aif");
+ File testFile = copyAudioToTmp("test121.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
- System.out.println(ah);
assertEquals("1411", ah.getBitRate());
assertEquals(1411, ah.getBitRateAsNumber());
@@ -121,7 +102,6 @@ public void testReadAiff3() {
assertTrue(aah.getComments().isEmpty());
assertTrue(aah.getAnnotations().isEmpty());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -131,18 +111,12 @@ public void testReadAiff3() {
public void testReadAifcCompressedAlaw() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test132.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test132.aif");
+ File testFile = copyAudioToTmp("test132.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
- System.out.println(ah);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
assertEquals("128", ah.getBitRate());
assertEquals(128, ah.getBitRateAsNumber());
@@ -159,7 +133,6 @@ public void testReadAifcCompressedAlaw() {
assertEquals(1, aah.getAnnotations().size());
//assertEquals("AFspdate: 2003-01-30 03:28:35 UTC\u0000user: kabal@CAPELLA\u0000program: CopyAudio ", aah.getAnnotations().get(0));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -169,18 +142,12 @@ public void testReadAifcCompressedAlaw() {
public void testReadAifcCompressedUlaw() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test133.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test133.aif");
+ File testFile = copyAudioToTmp("test133.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
- System.out.println(ah);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
assertEquals("128", ah.getBitRate());
assertEquals(128, ah.getBitRateAsNumber());
@@ -197,7 +164,6 @@ public void testReadAifcCompressedUlaw() {
assertEquals(1, aah.getAnnotations().size());
//assertEquals("AFspdate: 2003-01-30 03:28:35 UTC\u0000user: kabal@CAPELLA\u0000program: CopyAudio ", aah.getAnnotations().get(0));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -207,18 +173,12 @@ public void testReadAifcCompressedUlaw() {
public void testReadAifcFloating64() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test134.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test134.aif");
+ File testFile = copyAudioToTmp("test134.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
- System.out.println(ah);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
assertEquals("1024", ah.getBitRate());
assertEquals(1024, ah.getBitRateAsNumber());
@@ -235,7 +195,6 @@ public void testReadAifcFloating64() {
assertEquals(1, aah.getAnnotations().size());
//assertEquals("AFspdate: 2003-01-30 03:28:35 UTC\u0000user: kabal@CAPELLA\u0000program: CopyAudio ", aah.getAnnotations().get(0));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -245,18 +204,12 @@ public void testReadAifcFloating64() {
public void testReadAifcSSNDBeforeCOMMChunk() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test135.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test135.aif");
+ File testFile = copyAudioToTmp("test135.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
- System.out.println(ah);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
assertEquals("199", ah.getBitRate());
assertEquals(199, ah.getBitRateAsNumber());
@@ -272,7 +225,6 @@ public void testReadAifcSSNDBeforeCOMMChunk() {
assertTrue(aah.getComments().isEmpty());
assertEquals(0, aah.getAnnotations().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -282,18 +234,12 @@ public void testReadAifcSSNDBeforeCOMMChunk() {
public void testReadAifcWithOddChunk() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test136.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test136.aif");
+ File testFile = copyAudioToTmp("test136.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
- System.out.println(ah);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
assertEquals("199", ah.getBitRate());
assertEquals(199, ah.getBitRateAsNumber());
@@ -309,7 +255,6 @@ public void testReadAifcWithOddChunk() {
assertTrue(aah.getComments().isEmpty());
assertEquals(0, aah.getAnnotations().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -319,18 +264,12 @@ public void testReadAifcWithOddChunk() {
public void testReadAifcWithJunk() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test137.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test137.aif");
+ File testFile = copyAudioToTmp("test137.aif");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
- System.out.println(ah);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
assertEquals("199", ah.getBitRate());
assertEquals(199, ah.getBitRateAsNumber());
@@ -346,7 +285,6 @@ public void testReadAifcWithJunk() {
assertTrue(aah.getComments().isEmpty());
assertEquals(0, aah.getAnnotations().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -356,18 +294,12 @@ public void testReadAifcWithJunk() {
public void testReadAiffUnknownCompressionAndNameChunkAndCopyrightChunks() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test138.aiff");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test138.aiff");
+ File testFile = copyAudioToTmp("test138.aiff");
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
- System.out.println(ah);
+ assertInstanceOf(AiffAudioHeader.class, ah);
AiffAudioHeader aah = (AiffAudioHeader) ah;
assertEquals("19", ah.getBitRate());
assertEquals(19, ah.getBitRateAsNumber());
@@ -383,7 +315,6 @@ public void testReadAiffUnknownCompressionAndNameChunkAndCopyrightChunks() {
assertTrue(aah.getComments().isEmpty());
assertEquals(0, aah.getAnnotations().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/audio/aiff/AiffInfoReaderTest.java b/src/test/java/org/jaudiotagger/audio/aiff/AiffInfoReaderTest.java
index 5b48b5a..5954fc8 100755
--- a/src/test/java/org/jaudiotagger/audio/aiff/AiffInfoReaderTest.java
+++ b/src/test/java/org/jaudiotagger/audio/aiff/AiffInfoReaderTest.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.audio.aiff;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.*;
import java.nio.channels.FileChannel;
import java.nio.charset.StandardCharsets;
@@ -10,6 +7,8 @@
import org.jaudiotagger.audio.generic.GenericAudioHeader;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class AiffInfoReaderTest {
@Test
@@ -35,7 +34,7 @@ public void testWithSomeLocalChunks()
fc,
aiff.getAbsolutePath()
);
- assertTrue(audioHeader instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, audioHeader);
final AiffAudioHeader aiffAudioHeader = (AiffAudioHeader) audioHeader;
assertEquals(author, aiffAudioHeader.getAuthor());
assertEquals(name, aiffAudioHeader.getName());
@@ -127,4 +126,5 @@ private static File createAIFF(
}
return tempFile;
}
+
}
diff --git a/src/test/java/org/jaudiotagger/audio/asf/data/AbstractChunk.java b/src/test/java/org/jaudiotagger/audio/asf/data/AbstractChunk.java
index 4389c24..972f52f 100755
--- a/src/test/java/org/jaudiotagger/audio/asf/data/AbstractChunk.java
+++ b/src/test/java/org/jaudiotagger/audio/asf/data/AbstractChunk.java
@@ -95,14 +95,10 @@ public void testBasicChunkMethods() {
*/
@Test
public void testChunkCreation() {
- assertTrue(failOn(-1, null) instanceof IllegalArgumentException);
- assertTrue(failOn(0, null) instanceof IllegalArgumentException);
- assertTrue(
- failOn(0, BigInteger.TEN.negate()) instanceof IllegalArgumentException
- );
- assertTrue(
- failOn(0, BigInteger.ONE.negate()) instanceof IllegalArgumentException
- );
+ assertInstanceOf(IllegalArgumentException.class, failOn(-1, null));
+ assertInstanceOf(IllegalArgumentException.class, failOn(0, null));
+ assertInstanceOf(IllegalArgumentException.class, failOn(0, BigInteger.TEN.negate()));
+ assertInstanceOf(IllegalArgumentException.class, failOn(0, BigInteger.ONE.negate()));
assertNull(failOn(0, BigInteger.ZERO));
assertNull(failOn(0, BigInteger.TEN));
assertNull(failOn(100, BigInteger.TEN));
diff --git a/src/test/java/org/jaudiotagger/audio/asf/data/MetadataContainerTest.java b/src/test/java/org/jaudiotagger/audio/asf/data/MetadataContainerTest.java
index 6c58d4d..0da4517 100755
--- a/src/test/java/org/jaudiotagger/audio/asf/data/MetadataContainerTest.java
+++ b/src/test/java/org/jaudiotagger/audio/asf/data/MetadataContainerTest.java
@@ -1,12 +1,13 @@
package org.jaudiotagger.audio.asf.data;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
public class MetadataContainerTest
extends AbstractMetadataContainer {
@@ -32,7 +33,7 @@ protected MetadataDescriptor[] createSupportedDescriptors(
) {
assertTrue(
Arrays.asList(
- new ContainerType[] {
+ new ContainerType[]{
ContainerType.EXTENDED_CONTENT,
ContainerType.METADATA_LIBRARY_OBJECT,
ContainerType.METADATA_OBJECT,
@@ -41,7 +42,7 @@ protected MetadataDescriptor[] createSupportedDescriptors(
);
final List supported = new ArrayList<
MetadataDescriptor
- >();
+ >();
for (int nameCount = 0; nameCount < 5; nameCount++) {
int typeCount = container.getContainerType().isGuidEnabled() ? 6 : 5; // 6 is the GUID
for (int type = 0; type <= typeCount; type++) {
@@ -51,7 +52,7 @@ protected MetadataDescriptor[] createSupportedDescriptors(
String descName = "name" + nameCount + "type" + type;
final List tmp = new ArrayList<
MetadataDescriptor
- >();
+ >();
tmp.add(
new MetadataDescriptor(
container.getContainerType(),
@@ -108,18 +109,6 @@ protected MetadataDescriptor[] createSupportedDescriptors(
return supported.toArray(new MetadataDescriptor[supported.size()]);
}
- /**
- * {@inheritDoc}
- */
- @Override
- protected MetadataContainer[] createTestContainers() {
- return new MetadataContainer[] {
- new MetadataContainer(ContainerType.EXTENDED_CONTENT),
- new MetadataContainer(ContainerType.METADATA_OBJECT),
- new MetadataContainer(ContainerType.METADATA_LIBRARY_OBJECT),
- };
- }
-
/**
* Test method for
* {@link org.jaudiotagger.audio.asf.data.MetadataContainer#assertDescriptor(java.lang.String)}
@@ -133,6 +122,18 @@ public void testAssertDescriptorString() {
}
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected MetadataContainer[] createTestContainers() {
+ return new MetadataContainer[]{
+ new MetadataContainer(ContainerType.EXTENDED_CONTENT),
+ new MetadataContainer(ContainerType.METADATA_OBJECT),
+ new MetadataContainer(ContainerType.METADATA_LIBRARY_OBJECT),
+ };
+ }
+
/**
* Test method for
* {@link org.jaudiotagger.audio.asf.data.MetadataContainer#assertDescriptor(java.lang.String, int)}
diff --git a/src/test/java/org/jaudiotagger/audio/asf/tag/AsfKeyMappingTest.java b/src/test/java/org/jaudiotagger/audio/asf/tag/AsfKeyMappingTest.java
index e8ad8d7..70e8557 100755
--- a/src/test/java/org/jaudiotagger/audio/asf/tag/AsfKeyMappingTest.java
+++ b/src/test/java/org/jaudiotagger/audio/asf/tag/AsfKeyMappingTest.java
@@ -15,18 +15,11 @@ public class AsfKeyMappingTest {
*/
@Test
public void testTagFieldKeyMappingComplete() {
- Exception exceptionCaught = null;
Tag tag = new AsfTag();
- try {
- for (FieldKey curr : FieldKey.values()) {
- if (curr != FieldKey.ITUNES_GROUPING) {
- tag.getFields(curr);
- }
+ for (FieldKey curr : FieldKey.values()) {
+ if (curr != FieldKey.ITUNES_GROUPING) {
+ tag.getFields(curr);
}
- } catch (Exception e) {
- e.printStackTrace();
- exceptionCaught = e;
}
- assertNull(exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/audio/dsf/DsfAudioFileTest.java b/src/test/java/org/jaudiotagger/audio/dsf/DsfAudioFileTest.java
index 38d872e..9c5864f 100755
--- a/src/test/java/org/jaudiotagger/audio/dsf/DsfAudioFileTest.java
+++ b/src/test/java/org/jaudiotagger/audio/dsf/DsfAudioFileTest.java
@@ -3,7 +3,8 @@
import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.AudioHeader;
@@ -16,21 +17,16 @@
import org.jaudiotagger.tag.reference.ID3V2Version;
import org.junit.jupiter.api.Test;
-public class DsfAudioFileTest {
+public class DsfAudioFileTest extends AbstractBaseTestCase {
@Test
public void testReadDsfTag() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test122.dsf");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test122.dsf",
- new File("test122read.dsf")
+ "test122read.dsf"
);
try {
AudioFile f = AudioFileIO.read(testFile);
@@ -52,7 +48,6 @@ public void testReadDsfTag() {
assertEquals("comments", tag.getFirst(FieldKey.COMMENT));
assertEquals("Publisher", tag.getFirst(FieldKey.RECORD_LABEL));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -62,15 +57,10 @@ public void testReadDsfTag() {
public void testWriteDsfTag() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test122.dsf");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test122.dsf",
- new File("test122write.dsf")
+ "test122write.dsf"
);
try {
AudioFile f = AudioFileIO.read(testFile);
@@ -91,7 +81,6 @@ public void testWriteDsfTag() {
assertEquals("comments", tag.getFirst(FieldKey.COMMENT));
assertEquals("Publisher", tag.getFirst(FieldKey.RECORD_LABEL));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -101,15 +90,10 @@ public void testWriteDsfTag() {
public void testDeleteDsfTag() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test122.dsf");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test122.dsf",
- new File("test122delete.dsf")
+ "test122delete.dsf"
);
try {
AudioFile f = AudioFileIO.read(testFile);
@@ -122,7 +106,6 @@ public void testDeleteDsfTag() {
tag = f.getTag();
System.out.println(tag);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -132,15 +115,10 @@ public void testDeleteDsfTag() {
public void testReadDsfNoTag() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test156.dsf");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test156.dsf",
- new File("test156read.dsf")
+ "test156read.dsf"
);
try {
AudioFile f = AudioFileIO.read(testFile);
@@ -155,7 +133,6 @@ public void testReadDsfNoTag() {
Tag tag = f.getTag();
assertNull(tag);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -165,15 +142,10 @@ public void testReadDsfNoTag() {
public void testWriteDsfNoTag() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test156.dsf");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test156.dsf",
- new File("test156write.dsf")
+ "test156write.dsf"
);
try {
AudioFile f = AudioFileIO.read(testFile);
@@ -189,7 +161,6 @@ public void testWriteDsfNoTag() {
System.out.println(tag);
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -199,15 +170,10 @@ public void testWriteDsfNoTag() {
public void testDeleteDsfNoTag() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test156.dsf");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test156.dsf",
- new File("test156delete.dsf")
+ "test156delete.dsf"
);
try {
AudioFile f = AudioFileIO.read(testFile);
@@ -221,7 +187,6 @@ public void testDeleteDsfNoTag() {
tag = f.getTag();
System.out.println(tag);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -229,43 +194,32 @@ public void testDeleteDsfNoTag() {
@Test
public void testCreateDefaultTag() throws Exception {
- File orig = new File("testdata", "test122.dsf");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
{
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V24);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test122.dsf",
- new File("test122read.dsf")
- );
- assertTrue(
- AudioFileIO.read(testFile).createDefaultTag() instanceof ID3v24Tag
+ "test122read.dsf"
);
+ assertInstanceOf(ID3v24Tag.class, AudioFileIO.read(testFile).createDefaultTag());
}
{
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test122.dsf",
- new File("test122read.dsf")
- );
- assertTrue(
- AudioFileIO.read(testFile).createDefaultTag() instanceof ID3v23Tag
+ "test122read.dsf"
);
+ assertInstanceOf(ID3v23Tag.class, AudioFileIO.read(testFile).createDefaultTag());
}
{
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V22);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test122.dsf",
- new File("test122read.dsf")
- );
- assertTrue(
- AudioFileIO.read(testFile).createDefaultTag() instanceof ID3v22Tag
+ "test122read.dsf"
);
+ assertInstanceOf(ID3v22Tag.class, AudioFileIO.read(testFile).createDefaultTag());
}
TagOptionSingleton.getInstance().setToDefault();
@@ -275,7 +229,7 @@ public void testCreateDefaultTag() throws Exception {
@Test
public void testRemoveTagData() throws Exception
{
- File dir = new File("C:\\Users\\Paul\\Music\\1983 - David Bowie - Let's Dance [SACD DSF][2003]");
+ File dir = "C:\\Users\\Paul\\Music\\1983 - David Bowie - Let's Dance [SACD DSF][2003]";
for(File file:dir.listFiles())
{
AudioFile af = AudioFileIO.read(file);
diff --git a/src/test/java/org/jaudiotagger/audio/flac/FlacHeaderTest.java b/src/test/java/org/jaudiotagger/audio/flac/FlacHeaderTest.java
index 4910acc..dbdc8d5 100755
--- a/src/test/java/org/jaudiotagger/audio/flac/FlacHeaderTest.java
+++ b/src/test/java/org/jaudiotagger/audio/flac/FlacHeaderTest.java
@@ -6,7 +6,8 @@
import java.io.File;
import java.nio.charset.StandardCharsets;
import javax.imageio.ImageIO;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.flac.metadatablock.MetadataBlockDataPicture;
@@ -14,14 +15,15 @@
import org.jaudiotagger.tag.flac.FlacTag;
import org.jaudiotagger.tag.reference.PictureTypes;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class FlacHeaderTest {
+public class FlacHeaderTest extends AbstractBaseTestCase {
@Test
public void testReadFileWithVorbisComment() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -31,7 +33,7 @@ public void testReadFileWithVorbisComment() {
assertEquals("44100", f.getAudioHeader().getSampleRate());
assertEquals(5, f.getAudioHeader().getTrackLength());
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
FlacTag tag = (FlacTag) f.getTag();
FlacInfoReader infoReader = new FlacInfoReader();
assertEquals(6, infoReader.countMetaBlocks(f.getFile()));
@@ -105,13 +107,12 @@ public void testReadFileWithVorbisComment() {
//Can we actually createField Buffered Image from the url of course remember url is relative to the audio file
//not where we run the program from
- File file = new File("testdatatmp", image.getImageUrl());
+ File file = fileResource("testdatatmp", image.getImageUrl());
assertTrue(file.exists());
BufferedImage bi = ImageIO.read(file);
assertEquals(200, bi.getWidth());
assertEquals(200, bi.getHeight());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -124,7 +125,7 @@ public void testReadFileWithVorbisComment() {
public void testReadFileWithOnlyVorbisCommentEncoder() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test2.flac");
+ File testFile = copyAudioToTmp("test2.flac");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -134,30 +135,25 @@ public void testReadFileWithOnlyVorbisCommentEncoder() {
assertEquals("44100", f.getAudioHeader().getSampleRate());
assertEquals(5, f.getAudioHeader().getTrackLength());
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
FlacTag tag = (FlacTag) f.getTag();
FlacInfoReader infoReader = new FlacInfoReader();
assertEquals(4, infoReader.countMetaBlocks(f.getFile()));
//No Images
assertEquals(0, tag.getImages().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFile2() {
- File orig = new File("testdata", "test102.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test102.flac");
+ File testFile = copyAudioToTmp("test102.flac");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -167,30 +163,25 @@ public void testReadFile2() {
assertEquals("44100", f.getAudioHeader().getSampleRate());
assertEquals(10, f.getAudioHeader().getTrackLength());
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
FlacTag tag = (FlacTag) f.getTag();
FlacInfoReader infoReader = new FlacInfoReader();
assertEquals(2, infoReader.countMetaBlocks(f.getFile()));
//No Images
assertEquals(0, tag.getImages().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadWithID3Header() {
- File orig = new File("testdata", "test158.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test158.flac");
+ File testFile = copyAudioToTmp("test158.flac");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -200,32 +191,27 @@ public void testReadWithID3Header() {
assertEquals("44100", f.getAudioHeader().getSampleRate());
assertEquals(289, f.getAudioHeader().getTrackLength());
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
FlacTag tag = (FlacTag) f.getTag();
FlacInfoReader infoReader = new FlacInfoReader();
assertEquals(5, infoReader.countMetaBlocks(f.getFile()));
//No Images
assertEquals(1, tag.getImages().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadWriteWithID3Header() {
- File orig = new File("testdata", "test158.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test158.flac",
- new File("test158write.flac")
+ "test158write.flac"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f);
@@ -237,7 +223,6 @@ public void testReadWriteWithID3Header() {
f = AudioFileIO.read(testFile);
System.out.println(f);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/audio/mp3/LoggingTest.java b/src/test/java/org/jaudiotagger/audio/mp3/LoggingTest.java
index 81636a6..7dd0127 100755
--- a/src/test/java/org/jaudiotagger/audio/mp3/LoggingTest.java
+++ b/src/test/java/org/jaudiotagger/audio/mp3/LoggingTest.java
@@ -11,12 +11,15 @@
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathFactory;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
-public class LoggingTest {
+public class LoggingTest extends AbstractBaseTestCase {
+
+ public static int count = 0;
/**
* Check that xml is in xml format, and cleared out for each file
@@ -27,7 +30,7 @@ public void testDisplayAsXml() throws Exception {
XPath path = xpf.newXPath();
XPathExpression xpath1 = path.compile("/file/tag/body/frame/@id");
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue92.id3",
"testV1.mp3"
);
@@ -40,7 +43,7 @@ public void testDisplayAsXml() throws Exception {
)
);
- File testFile2 = AbstractTestCase.copyAudioToTmp(
+ File testFile2 = prependAudioToTmp(
"Issue96-1.id3",
"testV1.mp3"
);
@@ -100,8 +103,6 @@ public void testDateParsing() throws Exception {
assertEquals("59:32", timeOutFormat.format(timeIn));
}
- public static int count = 0;
-
@Test
public void testMultiThreadedSimpleDataAccess() {
final SimpleDateFormat timeInFormat = new SimpleDateFormat("ss");
@@ -117,10 +118,8 @@ public void run() {
Date timeIn = timeInFormat.parse(String.valueOf(-28.05122222d));
}
} catch (RuntimeException e) {
- e.printStackTrace();
count++;
} catch (Exception e) {
- e.printStackTrace();
count++;
}
}
diff --git a/src/test/java/org/jaudiotagger/audio/mp3/MP3AudioHeaderTest.java b/src/test/java/org/jaudiotagger/audio/mp3/MP3AudioHeaderTest.java
index c380608..0706b2b 100755
--- a/src/test/java/org/jaudiotagger/audio/mp3/MP3AudioHeaderTest.java
+++ b/src/test/java/org/jaudiotagger/audio/mp3/MP3AudioHeaderTest.java
@@ -20,18 +20,20 @@
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException;
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.TagOptionSingleton;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class MP3AudioHeaderTest {
+public class MP3AudioHeaderTest extends AbstractBaseTestCase {
@Test
public void testReadV1L3VbrOld() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrOld0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrOld0.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -70,7 +72,7 @@ public void testReadV1L3VbrOld() {
@Test
public void testReadV1L3VbrNew() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -109,7 +111,7 @@ public void testReadV1L3VbrNew() {
@Test
public void testReadV1L3Cbr128() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -148,7 +150,7 @@ public void testReadV1L3Cbr128() {
@Test
public void testReadV1L3Cbr192() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr192.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr192.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -187,7 +189,7 @@ public void testReadV1L3Cbr192() {
@Test
public void testReadV2L3VbrOld() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV2vbrOld0.mp3");
+ File testFile = copyAudioToTmp("testV2vbrOld0.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -226,7 +228,7 @@ public void testReadV2L3VbrOld() {
@Test
public void testReadV2L3MonoVbrNew() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV2vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV2vbrNew0.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -265,7 +267,7 @@ public void testReadV2L3MonoVbrNew() {
@Test
public void testReadV1L2Stereo() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1L2stereo.mp3");
+ File testFile = copyAudioToTmp("testV1L2stereo.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -304,7 +306,7 @@ public void testReadV1L2Stereo() {
@Test
public void testReadV1L2Mono() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1L2mono.mp3");
+ File testFile = copyAudioToTmp("testV1L2mono.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -343,7 +345,7 @@ public void testReadV1L2Mono() {
@Test
public void testReadV25L3VbrOld() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV25vbrOld0.mp3");
+ File testFile = copyAudioToTmp("testV25vbrOld0.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -382,7 +384,7 @@ public void testReadV25L3VbrOld() {
@Test
public void testReadV25L3() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -421,7 +423,7 @@ public void testReadV25L3() {
@Test
public void testReadV25L3VbrNew() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV25vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV25vbrNew0.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -460,7 +462,7 @@ public void testReadV25L3VbrNew() {
@Test
public void testReadV2L2() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV2L2.mp3");
+ File testFile = copyAudioToTmp("testV2L2.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -502,7 +504,7 @@ public void testReadV2L2() {
@Test
public void testReadV2L3Stereo() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV2L3Stereo.mp3");
+ File testFile = copyAudioToTmp("testV2L3Stereo.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
@@ -547,14 +549,14 @@ public void testReadV2L3Stereo() {
@Test
public void testIssue79() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("Issue79.mp3");
+ File testFile = copyAudioToTmp("Issue79.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
} catch (Exception e) {
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof InvalidAudioFrameException);
+ assertInstanceOf(InvalidAudioFrameException.class, exceptionCaught);
}
/**
@@ -564,14 +566,14 @@ public void testIssue79() {
@Test
public void testIssue81() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("Issue81.mp3");
+ File testFile = copyAudioToTmp("Issue81.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
} catch (Exception e) {
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof InvalidAudioFrameException);
+ assertInstanceOf(InvalidAudioFrameException.class, exceptionCaught);
}
/**
@@ -580,12 +582,11 @@ public void testIssue81() {
@Test
public void testIssue199() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV2L2.mp3");
+ File testFile = copyAudioToTmp("testV2L2.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -617,7 +618,6 @@ public void testIssue85() {
timeIn = timeInFormat.parse(String.valueOf(lengthMoreThanHour));
assertEquals("01:06:40", timeOutOverAnHourFormat.format(timeIn));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -629,19 +629,14 @@ public void testIssue85() {
* read incorrectly
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue110() {
- File orig = new File("testdata", "test28.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test28.mp3");
+ File testFile = copyAudioToTmp("test28.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -666,19 +661,14 @@ public void testIssue110() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadVRBIFrame() {
- File orig = new File("testdata", "test30.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test30.mp3");
+ File testFile = copyAudioToTmp("test30.mp3");
MP3AudioHeader mp3AudioHeader = null;
try {
mp3AudioHeader = new MP3File(testFile).getMP3AudioHeader();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -704,14 +694,10 @@ public void testReadVRBIFrame() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteToFileWithVRBIFrame() {
- File orig = new File("testdata", "test30.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test30.mp3");
+ File testFile = copyAudioToTmp("test30.mp3");
MP3AudioHeader mp3AudioHeader = null;
MP3File mp3file = null;
try {
@@ -730,7 +716,6 @@ public void testWriteToFileWithVRBIFrame() {
mp3file = new MP3File(testFile);
mp3AudioHeader = mp3file.getMP3AudioHeader();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
//change has been made and VBRI Frame is left intact
diff --git a/src/test/java/org/jaudiotagger/audio/ogg/OggPageTest.java b/src/test/java/org/jaudiotagger/audio/ogg/OggPageTest.java
index 613bbea..09112b5 100755
--- a/src/test/java/org/jaudiotagger/audio/ogg/OggPageTest.java
+++ b/src/test/java/org/jaudiotagger/audio/ogg/OggPageTest.java
@@ -7,11 +7,12 @@
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.util.Date;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.ogg.util.OggPageHeader;
import org.junit.jupiter.api.Test;
-public class OggPageTest {
+public class OggPageTest extends AbstractBaseTestCase {
@Test
public void testReadOggPagesNew() {
@@ -19,9 +20,9 @@ public void testReadOggPagesNew() {
Exception exceptionCaught = null;
int count = 0;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testReadAllOggPages.ogg")
+ "testReadAllOggPages.ogg"
);
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
OggPageHeader lastPageHeader = null;
@@ -52,7 +53,6 @@ public void testReadOggPagesNew() {
System.out.println(raf.length() + ":" + raf.getFilePointer());
assertEquals(raf.length(), raf.getFilePointer());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -69,9 +69,9 @@ public void testReadAllOggPages() {
Exception exceptionCaught = null;
int count = 0;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testReadAllOggPages.ogg")
+ "testReadAllOggPages.ogg"
);
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
@@ -98,7 +98,6 @@ public void testReadAllOggPages() {
}
assertEquals(raf.length(), raf.getFilePointer());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -114,9 +113,9 @@ public void testReadAllOggPagesLargeFile() {
Exception exceptionCaught = null;
int count = 0;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testlargeimage.ogg",
- new File("testReadAllOggPagesLargeFile.ogg")
+ "testReadAllOggPagesLargeFile.ogg"
);
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
@@ -130,7 +129,6 @@ public void testReadAllOggPagesLargeFile() {
}
assertEquals(raf.length(), raf.getFilePointer());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -145,9 +143,9 @@ public void testReadAllOggPagesLargeFileNew() {
Exception exceptionCaught = null;
int count = 0;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testlargeimage.ogg",
- new File("testReadAllOggPagesLargeFile.ogg")
+ "testReadAllOggPagesLargeFile.ogg"
);
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
OggPageHeader lastPageHeader = null;
@@ -165,7 +163,6 @@ public void testReadAllOggPagesLargeFileNew() {
}
assertEquals(raf.length(), raf.getFilePointer());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/audio/ogg/OggVorbisHeaderTest.java b/src/test/java/org/jaudiotagger/audio/ogg/OggVorbisHeaderTest.java
index a0d4b05..3875839 100755
--- a/src/test/java/org/jaudiotagger/audio/ogg/OggVorbisHeaderTest.java
+++ b/src/test/java/org/jaudiotagger/audio/ogg/OggVorbisHeaderTest.java
@@ -4,7 +4,8 @@
import java.io.File;
import java.io.RandomAccessFile;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.ogg.util.OggPageHeader;
@@ -12,8 +13,9 @@
import org.jaudiotagger.tag.vorbiscomment.VorbisCommentFieldKey;
import org.jaudiotagger.tag.vorbiscomment.VorbisCommentTag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class OggVorbisHeaderTest {
+public class OggVorbisHeaderTest extends AbstractBaseTestCase {
/**
* Testing reading of vorbis audio header info
@@ -22,9 +24,9 @@ public class OggVorbisHeaderTest {
public void testReadFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testReadFile.ogg")
+ "testReadFile.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -33,9 +35,8 @@ public void testReadFile() {
//assertEquals("2",f.getAudioHeader().getChannels());
//assertEquals("44100",f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -47,17 +48,13 @@ public void testReadFile() {
* TODO, need to replace with file that is not copyrighted
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadPaddedFile() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test2.ogg");
- if (!orig.isFile()) {
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test2.ogg",
- new File("test2.ogg")
+ "test2.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -71,7 +68,6 @@ public void testReadPaddedFile() {
//assertTrue(f.getTag() instanceof VorbisCommentTag);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -84,19 +80,19 @@ public void testReadPaddedFile() {
public void testWriteFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWriteTagToFile.ogg")
+ "testWriteTagToFile.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
//Size of VorbisComment should increase
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
f.getTag().setField(FieldKey.ALBUM, "bbbbbbb");
f.commit();
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
assertEquals("bbbbbbb", f.getTag().getFirst(FieldKey.ALBUM));
OggFileReader ofr = new OggFileReader();
@@ -115,7 +111,6 @@ public void testWriteFile() {
assertEquals(559748870, oph.getSerialNumber());
assertEquals(233133993, oph.getCheckSum());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -129,14 +124,14 @@ public void testWriteFile() {
public void testWritePreviouslyLargeFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testlargeimage.ogg",
- new File("testWritePreviouslyLargeFile.ogg")
+ "testWritePreviouslyLargeFile.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
//Size of VorbisComment should decrease just setting a nonsical but muuch smaller value for image
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag vorbisTag = (VorbisCommentTag) f.getTag();
vorbisTag.setField(
vorbisTag.createField(VorbisCommentFieldKey.COVERART, "ccc")
@@ -144,7 +139,7 @@ public void testWritePreviouslyLargeFile() {
f.commit();
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
OggFileReader ofr = new OggFileReader();
OggPageHeader oph = ofr.readOggPageHeader(
@@ -172,7 +167,6 @@ public void testWritePreviouslyLargeFile() {
assertEquals(1176378771, oph.getCheckSum());
assertEquals(0, oph.getHeaderType());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -185,19 +179,19 @@ public void testWritePreviouslyLargeFile() {
public void testLargeWriteFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testlargeimage.ogg",
- new File("testLargeWriteFile.ogg")
+ "testLargeWriteFile.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
//Size of VorbisComment should increase
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
f.getTag().setField(FieldKey.ALBUM, "bbbbbbb");
f.commit();
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
assertEquals("bbbbbbb", f.getTag().getFirst(FieldKey.ALBUM));
OggFileReader ofr = new OggFileReader();
@@ -218,7 +212,6 @@ public void testLargeWriteFile() {
assertEquals(-1172108515, oph.getCheckSum());
assertEquals(0, oph.getHeaderType());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -233,15 +226,15 @@ public void testLargeWriteFileWithSplitSetupHeader() {
Exception exceptionCaught = null;
int count = 0;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testlargeimage.ogg",
- new File("testAwkwardSizeWriteFile.ogg")
+ "testAwkwardSizeWriteFile.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
//Size of VorbisComment should increase and to a level that the setupheader cant fit completely
//in last page pf comment header so has to be split over two pages
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
StringBuffer sb = new StringBuffer();
for (int i = 0; i < 24000; i++) {
sb.append("z");
@@ -251,7 +244,7 @@ public void testLargeWriteFileWithSplitSetupHeader() {
f.commit();
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
assertEquals("bbbbbbb", f.getTag().getFirst(FieldKey.ALBUM));
assertEquals(sb.toString(), f.getTag().getFirst(FieldKey.TITLE));
@@ -301,7 +294,6 @@ public void testLargeWriteFileWithSplitSetupHeader() {
}
assertEquals(raf.length(), raf.getFilePointer());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/audio/wav/WavSimpleTest.java b/src/test/java/org/jaudiotagger/audio/wav/WavSimpleTest.java
index 3949298..a197b64 100755
--- a/src/test/java/org/jaudiotagger/audio/wav/WavSimpleTest.java
+++ b/src/test/java/org/jaudiotagger/audio/wav/WavSimpleTest.java
@@ -11,6 +11,7 @@
import org.jaudiotagger.logging.Hex;
import org.jaudiotagger.tag.wav.WavTag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class WavSimpleTest extends AbstractTestCase {
@@ -18,7 +19,7 @@ public class WavSimpleTest extends AbstractTestCase {
public void testRead8bitMonoFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.wav");
+ File testFile = copyAudioToTmp("test.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -30,25 +31,20 @@ public void testRead8bitMonoFile() {
assertEquals("22050", f.getAudioHeader().getSampleRate());
assertEquals(8, f.getAudioHeader().getBitsPerSample());
assertEquals(14, f.getAudioHeader().getTrackLength());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testRead24BitMonoFile() {
- File orig = new File("testdata", "test105.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test105.wav");
+ File testFile = copyAudioToTmp("test105.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -61,7 +57,6 @@ public void testRead24BitMonoFile() {
assertEquals(24, f.getAudioHeader().getBitsPerSample());
assertEquals(14, f.getAudioHeader().getTrackLength());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -96,7 +91,7 @@ public void testReadingOfShort() {
public void testRead8bitStereoFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test127.wav");
+ File testFile = copyAudioToTmp("test127.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -109,9 +104,8 @@ public void testRead8bitStereoFile() {
assertEquals("8000", f.getAudioHeader().getSampleRate());
assertEquals(8, f.getAudioHeader().getBitsPerSample());
assertEquals(3, f.getAudioHeader().getTrackLength());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -121,7 +115,7 @@ public void testRead8bitStereoFile() {
public void testGoldstarCompressedStereoFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test129.wav");
+ File testFile = copyAudioToTmp("test129.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -134,9 +128,8 @@ public void testGoldstarCompressedStereoFile() {
assertEquals("8000", f.getAudioHeader().getSampleRate());
assertEquals(0, f.getAudioHeader().getBitsPerSample());
assertEquals(3, f.getAudioHeader().getTrackLength());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -146,7 +139,7 @@ public void testGoldstarCompressedStereoFile() {
public void testRead8bitStereoFileExtensible() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test128.wav");
+ File testFile = copyAudioToTmp("test128.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -159,9 +152,8 @@ public void testRead8bitStereoFileExtensible() {
assertEquals("8000", f.getAudioHeader().getSampleRate());
assertEquals(8, f.getAudioHeader().getBitsPerSample());
assertEquals(3, f.getAudioHeader().getTrackLength());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -171,7 +163,7 @@ public void testRead8bitStereoFileExtensible() {
public void testReadStereoFloatingPointFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test130.wav");
+ File testFile = copyAudioToTmp("test130.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -191,9 +183,8 @@ public void testReadStereoFloatingPointFile() {
0.32897958159446716d,
f.getAudioHeader().getPreciseTrackLength()
);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -203,7 +194,7 @@ public void testReadStereoFloatingPointFile() {
public void testReadQuadChannelFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test131.wav");
+ File testFile = copyAudioToTmp("test131.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -220,9 +211,8 @@ public void testReadQuadChannelFile() {
4.784897804260254d,
f.getAudioHeader().getPreciseTrackLength()
);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue001Test.java b/src/test/java/org/jaudiotagger/issues/Issue001Test.java
index 24a6e81..2d1d696 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue001Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue001Test.java
@@ -18,9 +18,9 @@ public class Issue001Test extends AbstractTestCase {
public void testHandlingOfUnmappedChars() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1001.mp3")
+ "test1001.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -37,7 +37,6 @@ public void testHandlingOfUnmappedChars() {
mp3File.setID3v2Tag(tag);
mp3File.save();
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -47,9 +46,9 @@ public void testHandlingOfUnmappedChars() {
public void testHandlingOfUnmappedChars2() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1001.mp3")
+ "test1001.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -65,7 +64,6 @@ public void testHandlingOfUnmappedChars2() {
mp3File.setID3v2Tag(tag);
mp3File.save();
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue005Test.java b/src/test/java/org/jaudiotagger/issues/Issue005Test.java
index 8734610..fa36a0e 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue005Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue005Test.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.io.FileNotFoundException;
import org.jaudiotagger.AbstractTestCase;
@@ -11,99 +8,101 @@
import org.jaudiotagger.audio.mp3.MP3File;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class Issue005Test extends AbstractTestCase {
@Test
public void testReadingNonExistentFile() {
Exception e = null;
try {
- File orig = new File("testdata", "testNonExistent.mp3");
+ File orig = new File("src/test/resources/testdata", "testNonExistent.mp3");
MP3File f = (MP3File) AudioFileIO.read(orig);
} catch (Exception ex) {
e = ex;
}
- assertTrue(e instanceof FileNotFoundException);
+ assertInstanceOf(FileNotFoundException.class, e);
}
@Test
public void testReadingNonExistentFileMp3() {
Exception e = null;
try {
- File orig = new File("testdata", "testNonExistent.mp3");
+ File orig = new File("src/test/resources/testdata", "testNonExistent.mp3");
MP3File f = new MP3File(orig);
} catch (Exception ex) {
e = ex;
}
- assertTrue(e instanceof FileNotFoundException);
+ assertInstanceOf(FileNotFoundException.class, e);
}
@Test
public void testReadingNonExistentFileFlac() {
Exception e = null;
try {
- File orig = new File("testdata", "testNonExistent.flac");
+ File orig = new File("src/test/resources/testdata", "testNonExistent.flac");
AudioFile af = AudioFileIO.read(orig);
af.getTag();
} catch (Exception ex) {
e = ex;
}
assertNotNull(e);
- assertTrue(e instanceof FileNotFoundException);
+ assertInstanceOf(FileNotFoundException.class, e);
}
@Test
public void testReadingNonExistentFileOgg() {
Exception e = null;
try {
- File orig = new File("testdata", "testNonExistent.ogg");
+ File orig = new File("src/test/resources/testdata", "testNonExistent.ogg");
AudioFile af = AudioFileIO.read(orig);
af.getTag();
} catch (Exception ex) {
e = ex;
}
assertNotNull(e);
- assertTrue(e instanceof FileNotFoundException);
+ assertInstanceOf(FileNotFoundException.class, e);
}
@Test
public void testReadingNonExistentFileM4a() {
Exception e = null;
try {
- File orig = new File("testdata", "testNonExistent.m4a");
+ File orig = new File("src/test/resources/testdata", "testNonExistent.m4a");
AudioFile af = AudioFileIO.read(orig);
af.getTag();
} catch (Exception ex) {
e = ex;
}
assertNotNull(e);
- assertTrue(e instanceof FileNotFoundException);
+ assertInstanceOf(FileNotFoundException.class, e);
}
@Test
public void testReadingNonExistentFileWma() {
Exception e = null;
try {
- File orig = new File("testdata", "testNonExistent.wma");
+ File orig = new File("src/test/resources/testdata", "testNonExistent.wma");
AudioFile af = AudioFileIO.read(orig);
af.getTag();
} catch (Exception ex) {
e = ex;
}
assertNotNull(e);
- assertTrue(e instanceof FileNotFoundException);
+ assertInstanceOf(FileNotFoundException.class, e);
}
@Test
public void testReadingNonExistentFileWav() {
Exception e = null;
try {
- File orig = new File("testdata", "testNonExistent.wav");
+ File orig = new File("src/test/resources/testdata", "testNonExistent.wav");
AudioFile af = AudioFileIO.read(orig);
af.getTag();
} catch (Exception ex) {
e = ex;
}
assertNotNull(e);
- assertTrue(e instanceof FileNotFoundException);
+ assertInstanceOf(FileNotFoundException.class, e);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue052Test.java b/src/test/java/org/jaudiotagger/issues/Issue052Test.java
index b567010..298dd2f 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue052Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue052Test.java
@@ -17,9 +17,9 @@ public class Issue052Test extends AbstractTestCase {
public void testOutOfMemory() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"issue52.mp3",
- new File("issue52.mp3")
+ "issue52.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -36,7 +36,6 @@ public void testOutOfMemory() {
mp3File.setID3v2Tag(tag);
mp3File.save();
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue055Test.java b/src/test/java/org/jaudiotagger/issues/Issue055Test.java
index 48c06a8..1a0172c 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue055Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue055Test.java
@@ -21,9 +21,9 @@ public class Issue055Test extends AbstractTestCase {
public void testId3v23GenreWritingDefault() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"01.mp3",
- new File("issue55.mp3")
+ "issue55.mp3"
);
MP3File mp3File = new MP3File(testFile);
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
@@ -32,20 +32,19 @@ public void testId3v23GenreWritingDefault() {
//Create and Save Genre passing text value
mp3File.getTagOrCreateAndSetDefault().addField(FieldKey.GENRE, "Rock");
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getID3v2Tag());
FrameBodyTCON tconbody = (FrameBodyTCON) ((ID3v23Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("(17)", tconbody.getFirstTextValue());
mp3File.save();
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getID3v2Tag());
tconbody = (FrameBodyTCON) ((ID3v23Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("(17)", tconbody.getFirstTextValue());
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -55,9 +54,9 @@ public void testId3v23GenreWritingDefault() {
public void testId3v23GenreWritingDefaultcaseInsensitive() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"01.mp3",
- new File("issue55.mp3")
+ "issue55.mp3"
);
MP3File mp3File = new MP3File(testFile);
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
@@ -66,20 +65,19 @@ public void testId3v23GenreWritingDefaultcaseInsensitive() {
//Create and Save Genre passing text value
mp3File.getTagOrCreateAndSetDefault().addField(FieldKey.GENRE, "rock");
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getID3v2Tag());
FrameBodyTCON tconbody = (FrameBodyTCON) ((ID3v23Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("(17)", tconbody.getFirstTextValue());
mp3File.save();
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getID3v2Tag());
tconbody = (FrameBodyTCON) ((ID3v23Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("(17)", tconbody.getFirstTextValue());
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -89,9 +87,9 @@ public void testId3v23GenreWritingDefaultcaseInsensitive() {
public void testId3v23GenreWritingTextAlways() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"01.mp3",
- new File("issue55.mp3")
+ "issue55.mp3"
);
MP3File mp3File = new MP3File(testFile);
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(true);
@@ -100,20 +98,19 @@ public void testId3v23GenreWritingTextAlways() {
//Create and Save Genre passing text value
mp3File.getTagOrCreateAndSetDefault().addField(FieldKey.GENRE, "Rock");
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getID3v2Tag());
FrameBodyTCON tconbody = (FrameBodyTCON) ((ID3v23Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("Rock", tconbody.getFirstTextValue());
mp3File.save();
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getID3v2Tag());
tconbody = (FrameBodyTCON) ((ID3v23Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("Rock", tconbody.getFirstTextValue());
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -123,9 +120,9 @@ public void testId3v23GenreWritingTextAlways() {
public void testId3v24GenreWritingDefault() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"01.mp3",
- new File("issue55.mp3")
+ "issue55.mp3"
);
MP3File mp3File = new MP3File(testFile);
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
@@ -134,20 +131,19 @@ public void testId3v24GenreWritingDefault() {
//Create and Save Genre passing text value
mp3File.getTagOrCreateAndSetDefault().addField(FieldKey.GENRE, "Rock");
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getID3v2Tag());
FrameBodyTCON tconbody = (FrameBodyTCON) ((ID3v24Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("17", tconbody.getFirstTextValue());
mp3File.save();
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getID3v2Tag());
tconbody = (FrameBodyTCON) ((ID3v24Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("17", tconbody.getFirstTextValue());
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -157,9 +153,9 @@ public void testId3v24GenreWritingDefault() {
public void testId3v24GenreWritingDefaultcaseInsensitive() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"01.mp3",
- new File("issue55.mp3")
+ "issue55.mp3"
);
MP3File mp3File = new MP3File(testFile);
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
@@ -168,20 +164,19 @@ public void testId3v24GenreWritingDefaultcaseInsensitive() {
//Create and Save Genre passing text value
mp3File.getTagOrCreateAndSetDefault().addField(FieldKey.GENRE, "rock");
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getID3v2Tag());
FrameBodyTCON tconbody = (FrameBodyTCON) ((ID3v24Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("17", tconbody.getFirstTextValue());
mp3File.save();
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getID3v2Tag());
tconbody = (FrameBodyTCON) ((ID3v24Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("17", tconbody.getFirstTextValue());
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -191,9 +186,9 @@ public void testId3v24GenreWritingDefaultcaseInsensitive() {
public void testId3v24GenreWritingTextAlways() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"01.mp3",
- new File("issue55.mp3")
+ "issue55.mp3"
);
MP3File mp3File = new MP3File(testFile);
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(true);
@@ -202,20 +197,19 @@ public void testId3v24GenreWritingTextAlways() {
//Create and Save Genre passing text value
mp3File.getTagOrCreateAndSetDefault().addField(FieldKey.GENRE, "Rock");
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getID3v2Tag());
FrameBodyTCON tconbody = (FrameBodyTCON) ((ID3v24Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("Rock", tconbody.getFirstTextValue());
mp3File.save();
assertEquals("Rock", mp3File.getID3v2Tag().getFirst(FieldKey.GENRE));
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getID3v2Tag());
tconbody = (FrameBodyTCON) ((ID3v24Frame) mp3File
- .getID3v2Tag()
- .getFrame("TCON")).getBody();
+ .getID3v2Tag()
+ .getFrame("TCON")).getBody();
assertEquals("Rock", tconbody.getFirstTextValue());
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue061Test.java b/src/test/java/org/jaudiotagger/issues/Issue061Test.java
index 1864686..a795b28 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue061Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue061Test.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.wav.WavOptions;
import org.jaudiotagger.tag.FieldKey;
@@ -17,6 +14,8 @@
import org.jaudiotagger.tag.wav.WavTag;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class Issue061Test extends AbstractTestCase {
@Test
@@ -26,10 +25,9 @@ public void testMp3SetNull1() {
Tag tag = new ID3v23Tag();
tag.setField(FieldKey.ARTIST, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
@Test
@@ -39,10 +37,9 @@ public void testMp3SetNull2() {
Tag tag = new ID3v23Tag();
tag.setField(FieldKey.GENRE, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
@Test
@@ -52,10 +49,9 @@ public void testSetMp4Null() {
Tag tag = new Mp4Tag();
tag.setField(FieldKey.ARTIST, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
@Test
@@ -65,10 +61,9 @@ public void testSetFlacNull() {
Tag tag = new FlacTag();
tag.setField(FieldKey.ARTIST, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
@Test
@@ -78,10 +73,9 @@ public void testSetOggNull() {
Tag tag = new VorbisCommentTag();
tag.setField(FieldKey.ARTIST, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
@Test
@@ -92,10 +86,9 @@ public void testSetAifNull() {
((AiffTag) tag).setID3Tag(new ID3v23Tag());
tag.setField(FieldKey.ARTIST, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
@Test
@@ -106,10 +99,9 @@ public void testSetWavNull() {
((WavTag) tag).setID3Tag(new ID3v23Tag());
tag.setField(FieldKey.ARTIST, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
@Test
@@ -120,11 +112,10 @@ public void testSetWavInfoNull() {
((WavTag) tag).setInfoTag(new WavInfoTag());
tag.setField(FieldKey.ARTIST, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNotNull(ex);
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
@Test
@@ -134,9 +125,8 @@ public void testSetWmaNull() {
Tag tag = new AsfTag();
tag.setField(FieldKey.ARTIST, (String) null);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue084Test.java b/src/test/java/org/jaudiotagger/issues/Issue084Test.java
index f83e632..bfbe68a 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue084Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue084Test.java
@@ -30,9 +30,9 @@ public void testSyncToId3HasInfoOnly() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_EXISTING_AND_ACTIVE
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123Synced.wav")
+ "test123Synced.wav"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -65,7 +65,6 @@ public void testSyncToId3HasInfoOnly() {
assertEquals("artistName", tag.getFirst(FieldKey.ARTIST));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -82,9 +81,9 @@ public void testSyncToInfoHasId3Only() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126Synced.wav")
+ "test126Synced.wav"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -113,7 +112,6 @@ public void testSyncToInfoHasId3Only() {
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -130,9 +128,9 @@ public void testSyncBeforeReadAfterWriteId3Only() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126SyncedAfterRead.wav")
+ "test126SyncedAfterRead.wav"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -167,7 +165,6 @@ public void testSyncBeforeReadAfterWriteId3Only() {
f.commit();
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -184,9 +181,9 @@ public void testAutoSyncBeforeReadId3Only() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126SyncedAfterRead.wav")
+ "test126SyncedAfterRead.wav"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -201,7 +198,6 @@ public void testAutoSyncBeforeReadId3Only() {
assertEquals("fred\0", tag.getFirst(FieldKey.ARTIST));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -218,9 +214,9 @@ public void testAutoSyncBeforeReadInfoOnly() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123AutoSyncedAfterRead.wav")
+ "test123AutoSyncedAfterRead.wav"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -235,7 +231,6 @@ public void testAutoSyncBeforeReadInfoOnly() {
assertEquals("artistName", tag.getFirst(FieldKey.ARTIST));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -252,9 +247,9 @@ public void testAutoSyncAfterWriteInfoOnly() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH_AND_SYNC
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123AutoSyncedAfterReadBeforeWrite.wav")
+ "test123AutoSyncedAfterReadBeforeWrite.wav"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -285,7 +280,6 @@ public void testAutoSyncAfterWriteInfoOnly() {
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -302,9 +296,9 @@ public void testAutoSyncAfterWriteId3Only() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH_AND_SYNC
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126AutoSyncedAfterReadBeforeWrite.wav")
+ "test126AutoSyncedAfterReadBeforeWrite.wav"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -335,7 +329,6 @@ public void testAutoSyncAfterWriteId3Only() {
assertEquals("tim", tag.getFirst(FieldKey.ARTIST));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue086Test.java b/src/test/java/org/jaudiotagger/issues/Issue086Test.java
index c336034..7912586 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue086Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue086Test.java
@@ -27,9 +27,9 @@ public void testEnsureWritingID3SkipBytesWhenChunkNotEven() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126ID3WriteSyncByte.wav")
+ "test126ID3WriteSyncByte.wav"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -51,7 +51,6 @@ public void testEnsureWritingID3SkipBytesWhenChunkNotEven() {
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue093Test.java b/src/test/java/org/jaudiotagger/issues/Issue093Test.java
index 6d9f8a2..c8d4cd2 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue093Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue093Test.java
@@ -14,27 +14,24 @@
import org.jaudiotagger.tag.Tag;
import org.jaudiotagger.tag.TagOptionSingleton;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue093Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteAiffWithCorruptID3Tag1() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test145.aiff");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test145.aiff",
- new File("test145CorruptedID3.aiff")
+ "test145CorruptedID3.aiff"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
f.getTag().setField(FieldKey.ARTIST, "Jonathon");
@@ -54,20 +51,15 @@ public void testWriteAiffWithCorruptID3Tag1() {
public void testWriteAiffWithCorruptID3Tag2() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test152.aiff");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test152.aiff",
- new File("test152MissingByteId3.aiff")
+ "test152MissingByteId3.aiff"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
f.getTag().setField(FieldKey.ARTIST, "fred");
@@ -84,12 +76,8 @@ public void testWriteAiffWithCorruptID3Tag2() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testNaimRipMultipleTagsFixId3() {
- File orig = new File("testdata", "test152.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_ID3_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -98,9 +86,9 @@ public void testNaimRipMultipleTagsFixId3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test152.wav",
- new File("test152_id3.wav")
+ "test152_id3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -112,19 +100,14 @@ public void testNaimRipMultipleTagsFixId3() {
System.out.println(tag);
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testNaimRipMultipleFixTagsExistingInfo() {
- File orig = new File("testdata", "test152.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -133,9 +116,9 @@ public void testNaimRipMultipleFixTagsExistingInfo() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test152.wav",
- new File("test152_existing_info.wav")
+ "test152_existing_info.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -147,19 +130,14 @@ public void testNaimRipMultipleFixTagsExistingInfo() {
System.out.println(tag);
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testNaimRipMultipleTagsFixId3BothSync() {
- File orig = new File("testdata", "test152.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_ID3_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -168,9 +146,9 @@ public void testNaimRipMultipleTagsFixId3BothSync() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test152.wav",
- new File("test152_existing_id3_both_sync.wav")
+ "test152_existing_id3_both_sync.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -182,7 +160,6 @@ public void testNaimRipMultipleTagsFixId3BothSync() {
System.out.println(tag);
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue100Test.java b/src/test/java/org/jaudiotagger/issues/Issue100Test.java
index ce8d53c..637a24e 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue100Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue100Test.java
@@ -20,7 +20,7 @@ public class Issue100Test extends AbstractTestCase {
public void testID3v24WriteFieldsInPreferredOrder() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
//Create tag
ID3v24Tag tag = new ID3v24Tag();
@@ -64,7 +64,7 @@ public void testID3v24WriteFieldsInPreferredOrder() {
public void testID3v23WriteFieldsInPreferredOrder() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
//Create tag
ID3v23Tag tag = new ID3v23Tag();
@@ -108,7 +108,7 @@ public void testID3v23WriteFieldsInPreferredOrder() {
public void testID3v22WriteFieldsInPreferredOrder() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
//Create tag
ID3v22Tag tag = new ID3v22Tag();
diff --git a/src/test/java/org/jaudiotagger/issues/Issue119Test.java b/src/test/java/org/jaudiotagger/issues/Issue119Test.java
index 44912e8..a36d1ae 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue119Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue119Test.java
@@ -21,20 +21,15 @@ public class Issue119Test extends AbstractTestCase {
public void testWriteAiffWithOddLengthDataChunk() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test151.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test151.aif",
- new File("test151MissingByte.aiff")
+ "test151MissingByte.aiff"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
f.getTag().setField(FieldKey.ARTIST, "fred");
@@ -57,17 +52,12 @@ public void testWriteFileWithOddLengthLastDataChunkInfo() {
WavSaveOptions.SAVE_ACTIVE
);
- File orig = new File("testdata", "test153.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test153.wav",
- new File("test153_odd_data_length_info.wav")
+ "test153_odd_data_length_info.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -80,7 +70,6 @@ public void testWriteFileWithOddLengthLastDataChunkInfo() {
System.out.println(tag);
assertEquals("freddy", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -93,17 +82,12 @@ public void testWriteFileWithOddLengthLastDataChunkId3() {
WavSaveOptions.SAVE_ACTIVE
);
- File orig = new File("testdata", "test153.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test153.wav",
- new File("test153_odd_data_length_id3.wav")
+ "test153_odd_data_length_id3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -116,7 +100,6 @@ public void testWriteFileWithOddLengthLastDataChunkId3() {
System.out.println(tag);
assertEquals("freddy", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -129,17 +112,12 @@ public void testWriteFileWithOddLengthLastDataChunkId3AndInfo() {
WavSaveOptions.SAVE_BOTH_AND_SYNC
);
- File orig = new File("testdata", "test153.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test153.wav",
- new File("test153_odd_data_length_id3_and_info.wav")
+ "test153_odd_data_length_id3_and_info.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -152,7 +130,6 @@ public void testWriteFileWithOddLengthLastDataChunkId3AndInfo() {
System.out.println(tag);
assertEquals("freddy", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue123Test.java b/src/test/java/org/jaudiotagger/issues/Issue123Test.java
index 5c73132..cb1ea09 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue123Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue123Test.java
@@ -19,15 +19,10 @@ public class Issue123Test extends AbstractTestCase {
@Test
public void testWriteJRiverAlbumArtistOgg() {
- File orig = new File("testdata", "test.ogg");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ File testFile = copyAudioToTmp("test.ogg");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
System.out.println(af.getTag());
@@ -240,7 +235,6 @@ public void testWriteJRiverAlbumArtistOgg() {
"tommy"
);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -248,15 +242,10 @@ public void testWriteJRiverAlbumArtistOgg() {
@Test
public void testWriteJRiverAlbumArtistFlac() {
- File orig = new File("testdata", "test.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
System.out.println(af.getTag());
@@ -468,7 +457,6 @@ public void testWriteJRiverAlbumArtistFlac() {
"tommy"
);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -476,15 +464,10 @@ public void testWriteJRiverAlbumArtistFlac() {
@Test
public void testReadJRiverAlbumArtistOgg() {
- File orig = new File("testdata", "test.ogg");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ File testFile = copyAudioToTmp("test.ogg");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
System.out.println(af.getTag());
@@ -627,7 +610,6 @@ public void testReadJRiverAlbumArtistOgg() {
"tommy"
);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
@@ -635,15 +617,10 @@ public void testReadJRiverAlbumArtistOgg() {
@Test
public void testReadJRiverAlbumArtistFlac() {
- File orig = new File("testdata", "test.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
TagOptionSingleton.getInstance().setVorbisAlbumArtistSaveOptions(
@@ -791,7 +768,6 @@ public void testReadJRiverAlbumArtistFlac() {
"tommy"
);
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue146Test.java b/src/test/java/org/jaudiotagger/issues/Issue146Test.java
index c55b5ef..558c9bb 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue146Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue146Test.java
@@ -7,18 +7,15 @@
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue146Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue146() throws Exception {
- File orig = new File("testdata", "test158.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File file = AbstractTestCase.copyAudioToTmp("test158.mp3");
+ File file = copyAudioToTmp("test158.mp3");
if (file.exists()) {
AudioFile afile = AudioFileIO.read(file);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue161Test.java b/src/test/java/org/jaudiotagger/issues/Issue161Test.java
index 516d8b8..25a627c 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue161Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue161Test.java
@@ -8,25 +8,21 @@
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue161Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadID3() {
- File orig = new File("testdata", "test159.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test159.mp3");
+ File testFile = copyAudioToTmp("test159.mp3");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
System.out.println(af.getTag());
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue173Test.java b/src/test/java/org/jaudiotagger/issues/Issue173Test.java
index ffe3182..4069345 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue173Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue173Test.java
@@ -26,19 +26,13 @@ public class Issue173Test extends AbstractTestCase {
public void testMp4GenresUsingGenericInterface() {
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
- File orig = new File("testdata", "test.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
try {
System.out.println(
TagOptionSingleton.getInstance().isWriteMp4GenresAsText()
);
AudioFile mp4File = null;
Mp4Tag tag = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ File testFile = copyAudioToTmp("test.m4a");
mp4File = AudioFileIO.read(testFile);
tag = (Mp4Tag) mp4File.getTag();
//Set valid value
@@ -111,11 +105,6 @@ public void testMp4GenresUsingGenericInterface() {
public void testMp4GenresUsingMp4Interface() {
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
- File orig = new File("testdata", "test.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
try {
System.out.println(
@@ -123,7 +112,7 @@ public void testMp4GenresUsingMp4Interface() {
);
AudioFile mp4File = null;
Mp4Tag tag = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ File testFile = copyAudioToTmp("test.m4a");
mp4File = AudioFileIO.read(testFile);
tag = (Mp4Tag) mp4File.getTag();
//Set valid value
@@ -147,11 +136,6 @@ public void testMp4GenresUsingMp4Interface() {
public void testMp4InvalidGenresUsingMp4Interface() {
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
- File orig = new File("testdata", "test.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
try {
System.out.println(
@@ -159,13 +143,13 @@ public void testMp4InvalidGenresUsingMp4Interface() {
);
AudioFile mp4File = null;
Mp4Tag tag = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ File testFile = copyAudioToTmp("test.m4a");
mp4File = AudioFileIO.read(testFile);
tag = (Mp4Tag) mp4File.getTag();
//Set valid value
tag.setField(Mp4FieldKey.GENRE, "Rocky");
} catch (Exception ex) {
- assertTrue(ex instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, ex);
assertEquals(
ex.getMessage(),
ErrorMessage.NOT_STANDARD_MP$_GENRE.getMsg()
@@ -175,18 +159,13 @@ public void testMp4InvalidGenresUsingMp4Interface() {
@Test
public void testMp3ID3v24sGenresUsingGenericInterface() {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V24);
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
AudioFile mp3File = null;
ID3v24Tag tag = null;
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
mp3File = AudioFileIO.read(testFile);
mp3File.getTagOrCreateAndSetDefault();
tag = (ID3v24Tag) mp3File.getTag();
@@ -195,24 +174,24 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "Rock");
assertEquals("Rock", tag.getFirst(FieldKey.GENRE));
FrameBodyTCON body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("17", body.getText());
//Set Integral value directly, gets converted
tag.setField(FieldKey.GENRE, "1");
assertEquals("Classic Rock", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("1", body.getText());
//Set Integral value > 125 directly, gets converted
tag.setField(FieldKey.GENRE, "127");
assertEquals("Drum & Bass", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
// because we explicitly set integer value, use it
assertEquals("127", body.getText());
@@ -220,8 +199,8 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "Drum & Bass");
assertEquals("Drum & Bass", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
// because we actually set string, write string instead of integer
assertEquals("Drum & Bass", body.getText());
@@ -229,8 +208,8 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "250");
assertEquals("250", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("250", body.getText());
tag.setField(FieldKey.GENRE, "Rock");
@@ -239,8 +218,8 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
assertEquals("Rock", tag.getValue(FieldKey.GENRE, 0));
assertEquals("Musical", tag.getValue(FieldKey.GENRE, 1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("17\u000077", body.getText());
tag.setField(FieldKey.GENRE, "1");
tag.addField(FieldKey.GENRE, "2");
@@ -251,8 +230,8 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
assertEquals("Classic Rock", results.get(0));
assertEquals("Country", results.get(1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("1\u00002", body.getText());
mp3File.commit();
mp3File = AudioFileIO.read(testFile);
@@ -261,8 +240,8 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
assertEquals("Classic Rock", results.get(0));
assertEquals("Country", results.get(1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("1\u00002", body.getText());
tag.setField(FieldKey.GENRE, "Remix");
@@ -271,8 +250,8 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
assertEquals("Remix", tag.getValue(FieldKey.GENRE, 0));
assertEquals("Cover", tag.getValue(FieldKey.GENRE, 1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("RX\u0000CR", body.getText());
mp3File.commit();
mp3File = AudioFileIO.read(testFile);
@@ -281,8 +260,8 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
assertEquals("Remix", tag.getValue(FieldKey.GENRE, 0));
assertEquals("Cover", tag.getValue(FieldKey.GENRE, 1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("RX\u0000CR", body.getText());
tag.addField(FieldKey.GENRE, "67");
assertEquals("Cover", tag.getValue(FieldKey.GENRE, 1));
@@ -294,18 +273,13 @@ public void testMp3ID3v24sGenresUsingGenericInterface() {
@Test
public void testMp3ID3v22sGenresUsingGenericInterface() {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception e = null;
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V22);
AudioFile mp3File = null;
ID3v22Tag tag = null;
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
mp3File = AudioFileIO.read(testFile);
mp3File.getTagOrCreateAndSetDefault();
tag = (ID3v22Tag) mp3File.getTag();
@@ -314,24 +288,24 @@ public void testMp3ID3v22sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "Rock");
assertEquals("Rock", tag.getFirst(FieldKey.GENRE));
FrameBodyTCON body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
assertEquals("(17)", body.getText());
//Set Integral value directly, gets converted
tag.setField(FieldKey.GENRE, "1");
assertEquals("Classic Rock", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
assertEquals("(1)", body.getText());
//Set Integral value > 125 directly, gets converted
tag.setField(FieldKey.GENRE, "127");
assertEquals("Drum & Bass", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
// because we explicitly set integer value, use it
assertEquals("(127)", body.getText());
@@ -339,8 +313,8 @@ public void testMp3ID3v22sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "Drum & Bass");
assertEquals("Drum & Bass", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
// because we actually set string, write string instead of integer
assertEquals("Drum & Bass", body.getText());
@@ -348,8 +322,8 @@ public void testMp3ID3v22sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "250");
assertEquals("250", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
assertEquals("250", body.getText());
tag.setField(FieldKey.GENRE, "Rock");
@@ -359,8 +333,8 @@ public void testMp3ID3v22sGenresUsingGenericInterface() {
assertEquals("Musical", tag.getValue(FieldKey.GENRE, 1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
assertEquals("(17)(77)", body.getText());
tag.setField(FieldKey.GENRE, "1");
tag.addField(FieldKey.GENRE, "2");
@@ -371,8 +345,8 @@ public void testMp3ID3v22sGenresUsingGenericInterface() {
assertEquals("Classic Rock", results.get(0));
assertEquals("Country", results.get(1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
assertEquals("(1)(2)", body.getText());
mp3File.commit();
mp3File = AudioFileIO.read(testFile);
@@ -382,13 +356,13 @@ public void testMp3ID3v22sGenresUsingGenericInterface() {
assertEquals("Classic Rock", results.get(0));
assertEquals("Country", results.get(1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
tag.setField(FieldKey.GENRE, "Remix");
tag.addField(FieldKey.GENRE, "CR");
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
assertEquals("(RX)(CR)", body.getText());
// assertEquals("Remix",tag.getFirst(FieldKey.GENRE));
// assertEquals("Remix",tag.getValue(FieldKey.GENRE, 0));
@@ -397,8 +371,8 @@ public void testMp3ID3v22sGenresUsingGenericInterface() {
mp3File = AudioFileIO.read(testFile);
tag = (ID3v22Tag) mp3File.getTag();
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCO"
- )).getBody();
+ "TCO"
+ )).getBody();
assertEquals("(RX)(CR)", body.getText());
} catch (Exception ex) {
e = ex;
@@ -408,11 +382,6 @@ public void testMp3ID3v22sGenresUsingGenericInterface() {
@Test
public void testMp3ID3v23sGenresUsingGenericInterface() {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception e = null;
try {
@@ -420,7 +389,7 @@ public void testMp3ID3v23sGenresUsingGenericInterface() {
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
AudioFile mp3File = null;
ID3v23Tag tag = null;
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
mp3File = AudioFileIO.read(testFile);
mp3File.getTagOrCreateAndSetDefault();
tag = (ID3v23Tag) mp3File.getTag();
@@ -429,24 +398,24 @@ public void testMp3ID3v23sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "Rock");
assertEquals("Rock", tag.getFirst(FieldKey.GENRE));
FrameBodyTCON body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("(17)", body.getText());
//Set Integral value directly, gets converted
tag.setField(FieldKey.GENRE, "1");
assertEquals("Classic Rock", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("(1)", body.getText());
//Set Integral value > 125 directly, gets converted
tag.setField(FieldKey.GENRE, "127");
assertEquals("Drum & Bass", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
// because we explicitly set integer value, use it
assertEquals("(127)", body.getText());
@@ -454,8 +423,8 @@ public void testMp3ID3v23sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "Drum & Bass");
assertEquals("Drum & Bass", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
// because we actually set string, write string instead of integer
assertEquals("Drum & Bass", body.getText());
@@ -463,8 +432,8 @@ public void testMp3ID3v23sGenresUsingGenericInterface() {
tag.setField(FieldKey.GENRE, "250");
assertEquals("250", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("250", body.getText());
tag.setField(FieldKey.GENRE, "Rock");
@@ -474,8 +443,8 @@ public void testMp3ID3v23sGenresUsingGenericInterface() {
assertEquals("Musical", tag.getValue(FieldKey.GENRE, 1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("(17)(77)", body.getText());
tag.setField(FieldKey.GENRE, "1");
tag.addField(FieldKey.GENRE, "2");
@@ -486,8 +455,8 @@ public void testMp3ID3v23sGenresUsingGenericInterface() {
assertEquals("Classic Rock", results.get(0));
assertEquals("Country", results.get(1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("(1)(2)", body.getText());
mp3File.commit();
mp3File = AudioFileIO.read(testFile);
@@ -497,13 +466,13 @@ public void testMp3ID3v23sGenresUsingGenericInterface() {
assertEquals("Classic Rock", results.get(0));
assertEquals("Country", results.get(1));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
tag.setField(FieldKey.GENRE, "Remix");
tag.addField(FieldKey.GENRE, "CR");
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("(RX)(CR)", body.getText());
assertEquals("Remix", tag.getFirst(FieldKey.GENRE));
assertEquals("Remix", tag.getValue(FieldKey.GENRE, 0));
@@ -512,26 +481,26 @@ public void testMp3ID3v23sGenresUsingGenericInterface() {
mp3File = AudioFileIO.read(testFile);
tag = (ID3v23Tag) mp3File.getTag();
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("(RX)(CR)", body.getText());
tag.setField(FieldKey.GENRE, "Cover");
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("(CR)", body.getText());
tag.addField(FieldKey.GENRE, "FlapFlap");
assertEquals("Cover", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
assertEquals("(CR)\u0000FlapFlap", body.getText());
tag.setField(FieldKey.GENRE, "Country Shoegaze");
assertEquals("Country Shoegaze", tag.getFirst(FieldKey.GENRE));
body = (FrameBodyTCON) ((AbstractID3v2Frame) tag.getFrame(
- "TCON"
- )).getBody();
+ "TCON"
+ )).getBody();
//TODO cannot handle setting v23 refinements in generic interface, but does that really matter
//ID3v24Tag doesnt really have the convcept OutOfMemoryError refinements just multiple values
assertEquals("Country Shoegaze", body.getText());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue178Test.java b/src/test/java/org/jaudiotagger/issues/Issue178Test.java
index d069760..db81759 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue178Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue178Test.java
@@ -1,5 +1,6 @@
package org.jaudiotagger.issues;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
@@ -17,31 +18,25 @@ public class Issue178Test extends AbstractTestCase {
*/
@Test
public void testReadBadOgg() {
- File orig = new File("testdata", "test36.ogg");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
Date startDate = new Date();
System.out.println("start:" + startDate);
try {
- testFile = AbstractTestCase.copyAudioToTmp("test36.ogg");
+ testFile = copyAudioToTmp("test36.ogg");
//Read File
AudioFile af = AudioFileIO.read(testFile);
//Print Out Tree
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
Date endDate = new Date();
System.out.println("end :" + endDate);
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
assertTrue(endDate.getTime() - startDate.getTime() < 1000);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue183Test.java b/src/test/java/org/jaudiotagger/issues/Issue183Test.java
index c91bcf0..4519ec1 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue183Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue183Test.java
@@ -1,8 +1,6 @@
package org.jaudiotagger.issues;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
@@ -14,13 +12,8 @@ public class Issue183Test extends AbstractTestCase {
@Test
public void testReadCorruptOgg() {
- File orig = new File("testdata", "test508.ogg");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test508.ogg");
+ File testFile = copyAudioToTmp("test508.ogg");
assertThatExceptionOfType(CannotReadException.class)
.isThrownBy(() -> AudioFileIO.read(testFile))
diff --git a/src/test/java/org/jaudiotagger/issues/Issue184Test.java b/src/test/java/org/jaudiotagger/issues/Issue184Test.java
index f76c47b..01a0c02 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue184Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue184Test.java
@@ -1,31 +1,24 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.exceptions.CannotReadException;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class Issue184Test extends AbstractTestCase {
@Test
public void testReadCorruptWma() {
- File orig = new File("testdata", "test509.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test509.wma");
+ File testFile = copyAudioToTmp("test509.wma");
AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
- assertTrue(e instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, e);
ex = e;
}
assertNotNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue185Test.java b/src/test/java/org/jaudiotagger/issues/Issue185Test.java
index 934cd95..50316ec 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue185Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue185Test.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFile;
@@ -11,13 +8,15 @@
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class Issue185Test extends AbstractTestCase {
@Test
public void testDefaultTagMp3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
AudioFile af = AudioFileIO.read(testFile);
//No Tag
@@ -25,20 +24,20 @@ public void testDefaultTagMp3() {
//Tag Created
Tag tag = af.createDefaultTag();
- assertTrue(tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
//but not setField in tag itself
assertNull(af.getTag());
//Now setField
af.setTag(tag);
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
//Save changes
af.commit();
af = AudioFileIO.read(testFile);
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
} catch (Exception e) {
exceptionCaught = e;
}
@@ -49,7 +48,7 @@ public void testDefaultTagMp3() {
public void testDefaultTagMp3AndCreate() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
AudioFile af = AudioFileIO.read(testFile);
//No Tag
@@ -57,14 +56,14 @@ public void testDefaultTagMp3AndCreate() {
//Tag Created and setField
Tag tag = af.getTagOrCreateAndSetDefault();
- assertTrue(tag instanceof ID3v23Tag);
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
//Save changes
af.commit();
af = AudioFileIO.read(testFile);
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
} catch (Exception e) {
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue198Test.java b/src/test/java/org/jaudiotagger/issues/Issue198Test.java
index 8db2f83..be22581 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue198Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue198Test.java
@@ -16,13 +16,7 @@ public class Issue198Test extends AbstractTestCase {
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "issue-198.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("issue-198.m4a");
+ File testFile = copyAudioToTmp("issue-198.m4a");
AudioFile af = AudioFileIO.read(testFile);
System.out.println(af.getAudioHeader());
af.getTagOrCreateAndSetDefault();
@@ -33,7 +27,6 @@ public void testIssue() {
System.out.println(json);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue220Test.java b/src/test/java/org/jaudiotagger/issues/Issue220Test.java
index 48d5d33..192dfe1 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue220Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue220Test.java
@@ -18,22 +18,16 @@ public class Issue220Test extends AbstractTestCase {
*/
@Test
public void testReadMp4WithoutUdta() {
- File orig = new File("testdata", "test41.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test41.m4a");
+ testFile = copyAudioToTmp("test41.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
assertTrue(af.getTag().isEmpty());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -45,16 +39,11 @@ public void testReadMp4WithoutUdta() {
*/
@Test
public void testWriteMp4WithoutUdta() {
- File orig = new File("testdata", "test41.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test41.m4a");
+ testFile = copyAudioToTmp("test41.m4a");
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
@@ -85,7 +74,6 @@ public void testWriteMp4WithoutUdta() {
assertEquals("genre", af.getTag().getFirst(FieldKey.GENRE));
assertEquals("year", af.getTag().getFirst(FieldKey.YEAR));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -98,16 +86,11 @@ public void testWriteMp4WithoutUdta() {
*/
@Test
public void testReadMp4WithUdtaAndMetaHierachy() {
- File orig = new File("testdata", "test42.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test42.m4a");
+ testFile = copyAudioToTmp("test42.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -115,7 +98,6 @@ public void testReadMp4WithUdtaAndMetaHierachy() {
assertEquals("album", af.getTag().getFirst(FieldKey.ALBUM));
assertEquals("test42", af.getTag().getFirst(FieldKey.TITLE));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -128,16 +110,11 @@ public void testReadMp4WithUdtaAndMetaHierachy() {
*/
@Test
public void testWriteMp4WithUdtaAndMetaHierachy() {
- File orig = new File("testdata", "test42.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test42.m4a");
+ testFile = copyAudioToTmp("test42.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -156,7 +133,6 @@ public void testWriteMp4WithUdtaAndMetaHierachy() {
assertEquals("KARENTAYLORGENRE", af.getTag().getFirst(FieldKey.GENRE));
assertEquals("12345678", af.getTag().getFirst(FieldKey.AMAZON_ID));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -168,16 +144,11 @@ public void testWriteMp4WithUdtaAndMetaHierachy() {
*/
@Test
public void testWriteMp4WithUdtaAfterTrackSmaller() {
- File orig = new File("testdata", "test44.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test44.m4a");
+ testFile = copyAudioToTmp("test44.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -190,7 +161,6 @@ public void testWriteMp4WithUdtaAfterTrackSmaller() {
af = AudioFileIO.read(testFile);
assertEquals("ti", af.getTag().getFirst(FieldKey.TITLE));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -202,16 +172,11 @@ public void testWriteMp4WithUdtaAfterTrackSmaller() {
*/
@Test
public void testWriteMp4WithUdtaAfterTrack() {
- File orig = new File("testdata", "test44.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test44.m4a");
+ testFile = copyAudioToTmp("test44.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -232,7 +197,6 @@ public void testWriteMp4WithUdtaAfterTrack() {
assertEquals("genre", af.getTag().getFirst(FieldKey.GENRE));
assertEquals("year", af.getTag().getFirst(FieldKey.YEAR));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue221Test.java b/src/test/java/org/jaudiotagger/issues/Issue221Test.java
index 690b137..b473b30 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue221Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue221Test.java
@@ -1,7 +1,7 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
import java.io.FileOutputStream;
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.tag.FieldKey;
@@ -21,10 +21,9 @@ public void testCreateNullMp4FrameTitle() {
Mp4Tag tag = new Mp4Tag();
tag.setField(FieldKey.TITLE, (String) null);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -34,10 +33,9 @@ public void testCreateNullOggVorbisFrameTitle() {
VorbisCommentTag tag = VorbisCommentTag.createNewTag();
tag.setField(FieldKey.TITLE, (String) null);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -47,15 +45,14 @@ public void testCreateNullID3v23FrameTitle() {
ID3v23Tag tag = new ID3v23Tag();
tag.setField(FieldKey.TITLE, (String) null);
FileOutputStream os = new FileOutputStream(
- "testdatatmp/issue_221_title_v23.mp3"
+ tempFileResource("issue_221_title_v23.mp3")
);
tag.write(os.getChannel(), 0);
os.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -65,15 +62,14 @@ public void testCreateNullID3v23FrameAlbum() {
ID3v23Tag tag = new ID3v23Tag();
tag.setField(FieldKey.ALBUM, (String) null);
FileOutputStream os = new FileOutputStream(
- "testdatatmp/issue_221_title_v23.mp3"
+ tempFileResource("issue_221_title_v23.mp3")
);
tag.write(os.getChannel(), 0);
os.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -83,15 +79,14 @@ public void testCreateNullID3v23FrameArtist() {
ID3v23Tag tag = new ID3v23Tag();
tag.setField(FieldKey.ARTIST, (String) null);
FileOutputStream os = new FileOutputStream(
- "testdatatmp/issue_221_title_v23.mp3"
+ tempFileResource("issue_221_title_v23.mp3")
);
tag.write(os.getChannel(), 0);
os.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -101,15 +96,14 @@ public void testCreateNullID3v23FrameComment() {
ID3v23Tag tag = new ID3v23Tag();
tag.setField(FieldKey.COMMENT, (String) null);
FileOutputStream os = new FileOutputStream(
- "testdatatmp/issue_221_title_v23.mp3"
+ tempFileResource("issue_221_title_v23.mp3")
);
tag.write(os.getChannel(), 0);
os.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -119,15 +113,14 @@ public void testCreateNullID3v23FrameGenre() {
ID3v23Tag tag = new ID3v23Tag();
tag.setField(FieldKey.GENRE, (String) null);
FileOutputStream os = new FileOutputStream(
- "testdatatmp/issue_221_title_v23.mp3"
+ tempFileResource("issue_221_title_v23.mp3")
);
tag.write(os.getChannel(), 0);
os.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -137,15 +130,14 @@ public void testCreateNullID3v23FrameTrack() {
ID3v23Tag tag = new ID3v23Tag();
tag.setField(FieldKey.TRACK, (String) null);
FileOutputStream os = new FileOutputStream(
- "testdatatmp/issue_221_title_v23.mp3"
+ tempFileResource("issue_221_title_v23.mp3")
);
tag.write(os.getChannel(), 0);
os.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -155,16 +147,15 @@ public void testCreateNullID3v24Frame() {
ID3v24Tag tag = new ID3v24Tag();
tag.setField(FieldKey.TITLE, (String) null);
FileOutputStream os = new FileOutputStream(
- "testdatatmp/issue_221_title_v24.mp3"
+ "issue_221_title_v24.mp3"
);
tag.write(os.getChannel(), 0);
os.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
@@ -174,15 +165,14 @@ public void testCreateNullID3v22Frame() {
ID3v22Tag tag = new ID3v22Tag();
tag.setField(FieldKey.TITLE, (String) null);
FileOutputStream os = new FileOutputStream(
- "testdatatmp/issue_221_title_v24.mp3"
+ "issue_221_title_v24.mp3"
);
tag.write(os.getChannel(), 0);
os.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue222Test.java b/src/test/java/org/jaudiotagger/issues/Issue222Test.java
index 8907eff..c2432fe 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue222Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue222Test.java
@@ -16,22 +16,16 @@ public class Issue222Test extends AbstractTestCase {
*/
@Test
public void testreadMp4WithoutUUuidButNoUdta() {
- File orig = new File("testdata", "test4.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test4.m4a");
+ testFile = copyAudioToTmp("test4.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
assertTrue(af.getTag().isEmpty()); //But empty
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue224Test.java b/src/test/java/org/jaudiotagger/issues/Issue224Test.java
index bc1ae34..cb6f79d 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue224Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue224Test.java
@@ -15,33 +15,28 @@
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.jaudiotagger.tag.id3.framebody.FrameBodyAPIC;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue224Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadInvalidPicture() {
String genre = null;
- File orig = new File("testdata", "test31.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test31.mp3");
+ File testFile = copyAudioToTmp("test31.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(11, tag.getFieldCount());
- assertTrue(tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
ID3v23Tag id3v23Tag = (ID3v23Tag) tag;
TagField coverArtField = id3v23Tag.getFirstField(
org.jaudiotagger.tag.id3.ID3v23FieldKey.COVER_ART.getFieldName()
);
- assertTrue(coverArtField instanceof ID3v23Frame);
- assertTrue(
- ((ID3v23Frame) coverArtField).getBody() instanceof FrameBodyAPIC
- );
+ assertInstanceOf(ID3v23Frame.class, coverArtField);
+ assertInstanceOf(FrameBodyAPIC.class, ((ID3v23Frame) coverArtField).getBody());
FrameBodyAPIC body =
(FrameBodyAPIC) ((ID3v23Frame) coverArtField).getBody();
byte[] imageRawData = body.getImageData();
@@ -65,7 +60,6 @@ public void testReadInvalidPicture() {
assertEquals("FREDDY", body.getDescription());
f.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue225Test.java b/src/test/java/org/jaudiotagger/issues/Issue225Test.java
index 813b3ea..1d8c7c4 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue225Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue225Test.java
@@ -9,6 +9,7 @@
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue225Test extends AbstractTestCase {
@@ -17,22 +18,17 @@ public class Issue225Test extends AbstractTestCase {
* store the value the genre is mapped to we return null. This is correct behaviour.
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadInvalidGenre() {
String genre = null;
- File orig = new File("testdata", "test30.m4a");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test30.m4a");
+ File testFile = copyAudioToTmp("test30.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
genre = tag.getFirst(FieldKey.GENRE);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue233Test.java b/src/test/java/org/jaudiotagger/issues/Issue233Test.java
index 1be72c2..4d3cf82 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue233Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue233Test.java
@@ -12,6 +12,7 @@
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.jaudiotagger.tag.id3.ID3v24Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue233Test extends AbstractTestCase {
@@ -19,7 +20,7 @@ public class Issue233Test extends AbstractTestCase {
public void testDeletingID3v2Tag() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
//No Tags
MP3File mp3File = new MP3File(testFile);
@@ -71,34 +72,25 @@ public void testDeletingID3v2Tag() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testDeletingID3v1Tag() {
- File orig = new File("testdata", "test32.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test32.mp3");
+ File testFile = copyAudioToTmp("test32.mp3");
AudioFile af = AudioFileIO.read(testFile);
AudioFileIO.delete(af);
} catch (Exception e) {
exceptionCaught = e;
- e.printStackTrace();
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadingID3v1Tag() {
- File orig = new File("testdata", "test32.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test32.mp3");
+ File testFile = copyAudioToTmp("test32.mp3");
AudioFile af = AudioFileIO.read(testFile);
MP3File mf = (MP3File) af;
assertEquals("The Ides Of March", af.getTag().getFirst(FieldKey.TITLE));
@@ -107,7 +99,6 @@ public void testReadingID3v1Tag() {
assertEquals("", af.getTag().getFirst(FieldKey.ARTIST));
} catch (Exception e) {
exceptionCaught = e;
- e.printStackTrace();
}
assertNull(exceptionCaught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue239Test.java b/src/test/java/org/jaudiotagger/issues/Issue239Test.java
index 8d72acd..2cf9328 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue239Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue239Test.java
@@ -20,7 +20,7 @@ public class Issue239Test extends AbstractTestCase {
public void testDeletingCOMMFrames() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
//Add a v24Tag
AudioFile af = AudioFileIO.read(testFile);
@@ -47,7 +47,7 @@ public void testDeletingCOMMFrames() {
af = AudioFileIO.read(testFile);
mp3File = (MP3File) af;
//Check mapped okay ands empty
- assertTrue(mp3File.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getTag());
assertEquals(2, mp3File.getTag().getFields(FieldKey.COMMENT).size());
//Delete Fields
@@ -60,7 +60,6 @@ public void testDeletingCOMMFrames() {
assertEquals(0, mp3File.getTag().getFields(FieldKey.COMMENT).size());
} catch (Exception e) {
exceptionCaught = e;
- e.printStackTrace();
}
assertNull(exceptionCaught);
}
@@ -72,7 +71,7 @@ public void testDeletingCOMMFrames() {
public void testDeletingFieldThatUsesCOMMFrames() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
//Add a v24Tag
AudioFile af = AudioFileIO.read(testFile);
@@ -99,7 +98,7 @@ public void testDeletingFieldThatUsesCOMMFrames() {
af = AudioFileIO.read(testFile);
mp3File = (MP3File) af;
//Check mapped okay ands empty
- assertTrue(mp3File.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getTag());
assertEquals(2, mp3File.getTag().getFields(FieldKey.CUSTOM1).size());
//Delete Fields
@@ -112,7 +111,6 @@ public void testDeletingFieldThatUsesCOMMFrames() {
assertEquals(0, mp3File.getTag().getFields(FieldKey.CUSTOM1).size());
} catch (Exception e) {
exceptionCaught = e;
- e.printStackTrace();
}
assertNull(exceptionCaught);
}
@@ -124,7 +122,7 @@ public void testDeletingFieldThatUsesCOMMFrames() {
public void testDeletingFieldThatUsesCOMMFramesDoesntDeleteOtherCOMMFrame() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
//Add a v24Tag
AudioFile af = AudioFileIO.read(testFile);
@@ -151,7 +149,7 @@ public void testDeletingFieldThatUsesCOMMFramesDoesntDeleteOtherCOMMFrame() {
af = AudioFileIO.read(testFile);
mp3File = (MP3File) af;
//Check mapped okay ands empty
- assertTrue(mp3File.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, mp3File.getTag());
assertEquals(1, mp3File.getTag().getFields(FieldKey.CUSTOM1).size());
//Delete Fields
@@ -166,7 +164,6 @@ public void testDeletingFieldThatUsesCOMMFramesDoesntDeleteOtherCOMMFrame() {
assertEquals(1, mp3File.getTag().getFields(FieldKey.CUSTOM2).size());
} catch (Exception e) {
exceptionCaught = e;
- e.printStackTrace();
}
assertNull(exceptionCaught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue240Test.java b/src/test/java/org/jaudiotagger/issues/Issue240Test.java
index 194834a..b4322ca 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue240Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue240Test.java
@@ -11,26 +11,23 @@
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.mp4.Mp4Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue240Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWritelargeDataToFile() {
- File orig = new File("testdata", "test34.m4a");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test34.m4a");
+ File testFile = copyAudioToTmp("test34.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(0, af.getTag().getFields(FieldKey.COVER_ART).size());
//Add new image
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
diff --git a/src/test/java/org/jaudiotagger/issues/Issue241Test.java b/src/test/java/org/jaudiotagger/issues/Issue241Test.java
index 0d75bed..4a38a93 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue241Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue241Test.java
@@ -29,7 +29,7 @@ public void testWriteFieldsToMp3ID3v24() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -51,15 +51,15 @@ public void testWriteFieldsToMp3ID3v24() {
TagField tagField = af
.getTag()
.getFirstField(ID3v24FieldKey.LANGUAGE.getFieldName());
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyTLAN);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyTLAN.class, ((ID3v24Frame) tagField).getBody());
assertTrue(
((FrameBodyTLAN) ((ID3v24Frame) tagField).getBody()).isValid()
);
tagField = af.getTag().getFirstField(ID3v24FieldKey.KEY.getFieldName());
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyTKEY);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyTKEY.class, ((ID3v24Frame) tagField).getBody());
assertTrue(
((FrameBodyTKEY) ((ID3v24Frame) tagField).getBody()).isValid()
);
@@ -70,8 +70,8 @@ public void testWriteFieldsToMp3ID3v24() {
tagField = af
.getTag()
.getFirstField(ID3v24FieldKey.LANGUAGE.getFieldName());
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyTLAN);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyTLAN.class, ((ID3v24Frame) tagField).getBody());
assertFalse(
((FrameBodyTLAN) ((ID3v24Frame) tagField).getBody()).isValid()
);
@@ -80,13 +80,12 @@ public void testWriteFieldsToMp3ID3v24() {
af.commit();
assertEquals("keys", af.getTag().getFirst(FieldKey.KEY));
tagField = af.getTag().getFirstField(ID3v24FieldKey.KEY.getFieldName());
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyTKEY);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyTKEY.class, ((ID3v24Frame) tagField).getBody());
assertFalse(
((FrameBodyTKEY) ((ID3v24Frame) tagField).getBody()).isValid()
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -101,7 +100,7 @@ public void testWriteFieldsToMp3ID3v23() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -120,7 +119,6 @@ public void testWriteFieldsToMp3ID3v23() {
)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -135,7 +133,7 @@ public void testWriteFieldsToMp3ID3v22() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -154,7 +152,6 @@ public void testWriteFieldsToMp3ID3v22() {
)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -169,7 +166,7 @@ public void testWriteFieldsToOggVorbis() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ testFile = copyAudioToTmp("test.ogg");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -187,7 +184,6 @@ public void testWriteFieldsToOggVorbis() {
)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -202,7 +198,7 @@ public void testWriteFieldsToFlac() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ testFile = copyAudioToTmp("test.flac");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -220,7 +216,6 @@ public void testWriteFieldsToFlac() {
)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -235,7 +230,7 @@ public void testWriteFieldsToWma() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ testFile = copyAudioToTmp("test1.wma");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -253,7 +248,6 @@ public void testWriteFieldsToWma() {
)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -268,7 +262,7 @@ public void testWriteFieldsToMp4() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ testFile = copyAudioToTmp("test.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -286,7 +280,6 @@ public void testWriteFieldsToMp4() {
)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -301,7 +294,7 @@ public void testValidateMusicalKey() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -344,7 +337,6 @@ public void testValidateMusicalKey() {
assertEquals("C##", af.getTag().getFirst(FieldKey.KEY));
assertFalse(MusicalKey.isValid(tag.getFirst(FieldKey.KEY)));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue242Test.java b/src/test/java/org/jaudiotagger/issues/Issue242Test.java
index 2019360..4eee714 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue242Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue242Test.java
@@ -22,9 +22,9 @@ public class Issue242Test extends AbstractTestCase {
public void testWriteNewUrlsFilev24() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1030.mp3")
+ "test1030.mp3"
);
//Add a v24Tag
@@ -126,7 +126,7 @@ public void testWriteNewUrlsFilev24() {
af = AudioFileIO.read(testFile);
mp3File = (MP3File) af;
//Check mapped okay ands empty
- assertTrue(mp3File.getTag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getTag());
assertEquals(
1,
mp3File.getTag().getFields(FieldKey.URL_OFFICIAL_RELEASE_SITE).size()
@@ -197,7 +197,6 @@ public void testWriteNewUrlsFilev24() {
);
} catch (Exception e) {
exceptionCaught = e;
- e.printStackTrace();
}
assertNull(exceptionCaught);
}
@@ -209,9 +208,9 @@ public void testWriteNewUrlsFilev24() {
public void testWriteNewUrlsFilev23() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1031.mp3")
+ "test1031.mp3"
);
//Add a v24Tag
@@ -389,7 +388,6 @@ public void testWriteNewUrlsFilev23() {
);
} catch (Exception e) {
exceptionCaught = e;
- e.printStackTrace();
}
assertNull(exceptionCaught);
}
@@ -401,9 +399,9 @@ public void testWriteNewUrlsFilev23() {
public void testWriteNewUrlsFilev22() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1032.mp3")
+ "test1032.mp3"
);
//Add a v24Tag
@@ -578,7 +576,6 @@ public void testWriteNewUrlsFilev22() {
);
} catch (Exception e) {
exceptionCaught = e;
- e.printStackTrace();
}
assertNull(exceptionCaught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue245Test.java b/src/test/java/org/jaudiotagger/issues/Issue245Test.java
index 211b3b9..b0f3528 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue245Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue245Test.java
@@ -29,7 +29,7 @@ public void testWriteArtworkFieldsToMp3ID3v24() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -40,7 +40,7 @@ public void testWriteArtworkFieldsToMp3ID3v24() {
//Now addField the image
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
@@ -50,7 +50,7 @@ public void testWriteArtworkFieldsToMp3ID3v24() {
af = AudioFileIO.read(testFile);
tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
Artwork artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -64,7 +64,6 @@ public void testWriteArtworkFieldsToMp3ID3v24() {
tag = af.getTag();
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -79,7 +78,7 @@ public void testWriteArtworkFieldsToMp3ID3v23() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -90,7 +89,7 @@ public void testWriteArtworkFieldsToMp3ID3v23() {
//Now addField the image
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
@@ -100,7 +99,7 @@ public void testWriteArtworkFieldsToMp3ID3v23() {
af = AudioFileIO.read(testFile);
tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
Artwork artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -114,7 +113,6 @@ public void testWriteArtworkFieldsToMp3ID3v23() {
tag = af.getTag();
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -129,7 +127,7 @@ public void testWriteArtworkFieldsToMp3ID3v22() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -140,7 +138,7 @@ public void testWriteArtworkFieldsToMp3ID3v22() {
//Now addField the image
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
@@ -150,7 +148,7 @@ public void testWriteArtworkFieldsToMp3ID3v22() {
af = AudioFileIO.read(testFile);
tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
Artwork artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -164,7 +162,6 @@ public void testWriteArtworkFieldsToMp3ID3v22() {
tag = af.getTag();
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -179,14 +176,14 @@ public void testReadWriteArtworkFieldsToOggVorbis() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test3.ogg");
+ testFile = copyAudioToTmp("test3.ogg");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
Artwork artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -194,7 +191,7 @@ public void testReadWriteArtworkFieldsToOggVorbis() {
//Now replace the image
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
tag.setField(newartwork);
@@ -202,7 +199,7 @@ public void testReadWriteArtworkFieldsToOggVorbis() {
af = AudioFileIO.read(testFile);
tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -215,7 +212,6 @@ public void testReadWriteArtworkFieldsToOggVorbis() {
tag = af.getTag();
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -230,9 +226,9 @@ public void testReadWriteArtworkFieldsToFlac() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp(
+ testFile = copyAudioToTmp(
"test.flac",
- new File("testwriteartwork.flac")
+ "testwriteartwork.flac"
);
//Read File okay
@@ -240,7 +236,7 @@ public void testReadWriteArtworkFieldsToFlac() {
Tag tag = af.getTag();
assertEquals(2, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
Artwork artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -248,7 +244,7 @@ public void testReadWriteArtworkFieldsToFlac() {
assertEquals(3, artwork.getPictureType());
//Now replace the image
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
@@ -259,7 +255,7 @@ public void testReadWriteArtworkFieldsToFlac() {
af = AudioFileIO.read(testFile);
tag = af.getTag();
assertEquals(2, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -273,7 +269,6 @@ public void testReadWriteArtworkFieldsToFlac() {
tag = af.getTag();
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -288,14 +283,14 @@ public void testReadWriteArtworkFieldsToWma() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test5.wma");
+ testFile = copyAudioToTmp("test5.wma");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
Artwork artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -303,7 +298,7 @@ public void testReadWriteArtworkFieldsToWma() {
assertEquals(3, artwork.getPictureType());
//Now replace the image
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
@@ -313,11 +308,9 @@ public void testReadWriteArtworkFieldsToWma() {
af.commit();
af = AudioFileIO.read(testFile);
tag = af.getTag();
- assertTrue(
- tag.getFirstField(FieldKey.COVER_ART) instanceof AsfTagCoverField
- );
+ assertInstanceOf(AsfTagCoverField.class, tag.getFirstField(FieldKey.COVER_ART));
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -331,7 +324,6 @@ public void testReadWriteArtworkFieldsToWma() {
tag = af.getTag();
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -346,14 +338,14 @@ public void testReadWriteArtworkFieldsToMp4() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ testFile = copyAudioToTmp("test.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
Artwork artwork = tag.getFirstArtwork();
assertEquals("image/jpeg", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -361,7 +353,7 @@ public void testReadWriteArtworkFieldsToMp4() {
//Now replace the image
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
@@ -370,7 +362,7 @@ public void testReadWriteArtworkFieldsToMp4() {
af = AudioFileIO.read(testFile);
tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -383,7 +375,6 @@ public void testReadWriteArtworkFieldsToMp4() {
tag = af.getTag();
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -399,7 +390,7 @@ public void testReadWriteArtworkFieldsToWav() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.wav");
+ testFile = copyAudioToTmp("test.wav");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -407,7 +398,6 @@ public void testReadWriteArtworkFieldsToWav() {
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -417,18 +407,17 @@ public void testReadWriteArtworkFieldsToWav() {
//Now try and addField image
AudioFile af = AudioFileIO.read(testFile);
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
Tag tag = af.getTag();
tag.setField(newartwork);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
//Not Supported
try {
@@ -439,11 +428,10 @@ public void testReadWriteArtworkFieldsToWav() {
assertEquals(0, tag.getArtworkList().size());
af.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
/**
@@ -454,7 +442,7 @@ public void testReadWriteArtworkFieldsToReal() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test01.ra");
+ testFile = copyAudioToTmp("test01.ra");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -462,7 +450,6 @@ public void testReadWriteArtworkFieldsToReal() {
assertEquals(0, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -472,18 +459,17 @@ public void testReadWriteArtworkFieldsToReal() {
//Now try and addField image
AudioFile af = AudioFileIO.read(testFile);
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
Tag tag = af.getTag();
tag.setField(newartwork);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
//Not supported
try {
@@ -491,10 +477,9 @@ public void testReadWriteArtworkFieldsToReal() {
Tag tag = af.getTag();
tag.deleteArtworkField();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue248Test.java b/src/test/java/org/jaudiotagger/issues/Issue248Test.java
index 5d74fb8..154aa5c 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue248Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue248Test.java
@@ -13,7 +13,7 @@ public class Issue248Test extends AbstractTestCase {
@Test
public void testMultiThreadedMP3HeaderAccess() throws Exception {
- final File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrOld0.mp3");
+ final File testFile = copyAudioToTmp("testV1vbrOld0.mp3");
final MP3File mp3File = new MP3File(testFile);
final Thread[] threads = new Thread[1000];
for (int i = 0; i < 1000; i++) {
@@ -24,10 +24,8 @@ public void run() {
try {
//System.out.println("Output is"+mp3File.getMP3AudioHeader().getTrackLengthAsString());
} catch (RuntimeException e) {
- e.printStackTrace();
countExceptions++;
} catch (Exception e) {
- e.printStackTrace();
countExceptions++;
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue255Test.java b/src/test/java/org/jaudiotagger/issues/Issue255Test.java
index c9985aa..0093fbd 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue255Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue255Test.java
@@ -11,6 +11,7 @@
import org.jcodec.containers.mp4.MP4Util;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue255Test extends AbstractTestCase {
@@ -18,24 +19,19 @@ public class Issue255Test extends AbstractTestCase {
* Test Mp4 with padding after last atom
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadMp4FileWithPaddingAfterLastAtom() {
- File orig = new File("testdata", "test35.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test35.m4a");
+ testFile = copyAudioToTmp("test35.m4a");
//Read File
AudioFile af = AudioFileIO.read(testFile);
//Print Out Tree
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -47,7 +43,6 @@ public void testReadMp4FileWithPaddingAfterLastAtom() {
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
System.out.println(json);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -58,50 +53,40 @@ public void testReadMp4FileWithPaddingAfterLastAtom() {
*
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFileWithInvalidPadding() {
- File orig = new File("testdata", "test28.m4p");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test28.m4p",
- new File("WriteFileWithInvalidFreeAtom.m4p")
+ "WriteFileWithInvalidFreeAtom.m4p"
);
AudioFile f = AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
/**
* Test Mp4 with padding after last atom
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteMp4FileWithPaddingAfterLastAtom() {
- File orig = new File("testdata", "test35.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test35.m4a");
+ testFile = copyAudioToTmp("test35.m4a");
//Add a v24Tag
AudioFile af = AudioFileIO.read(testFile);
af.getTag().setField(FieldKey.ALBUM, "NewValue");
af.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue257Test.java b/src/test/java/org/jaudiotagger/issues/Issue257Test.java
index e8422fd..034d905 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue257Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue257Test.java
@@ -1,5 +1,6 @@
package org.jaudiotagger.issues;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
@@ -8,6 +9,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.exceptions.CannotReadException;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue257Test extends AbstractTestCase {
@@ -15,27 +17,22 @@ public class Issue257Test extends AbstractTestCase {
* Test Mp4 with crap between free atom and mdat atom, shoud cause immediate failure
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadMp4FileWithPaddingAfterLastAtom() {
- File orig = new File("testdata", "test37.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test37.m4a");
+ testFile = copyAudioToTmp("test37.m4a");
//Read File
AudioFile af = AudioFileIO.read(testFile);
//Print Out Tree
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue261Test.java b/src/test/java/org/jaudiotagger/issues/Issue261Test.java
index 4e205c8..bbae2d6 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue261Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue261Test.java
@@ -9,6 +9,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue261Test extends AbstractTestCase {
@@ -16,17 +17,13 @@ public class Issue261Test extends AbstractTestCase {
* Test write mp4 ok without any udta/meta atoms
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteMp4() {
- File orig = new File("testdata", "test45.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test45.m4a");
+ testFile = copyAudioToTmp("test45.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -38,7 +35,6 @@ public void testWriteMp4() {
af = AudioFileIO.read(testFile);
assertEquals("2007", af.getTag().getFirst(FieldKey.YEAR));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue263Test.java b/src/test/java/org/jaudiotagger/issues/Issue263Test.java
index db4d555..52f60c0 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue263Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue263Test.java
@@ -23,7 +23,7 @@ public void testWriteArtworkFieldsToMp3ID3v24() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -31,12 +31,11 @@ public void testWriteArtworkFieldsToMp3ID3v24() {
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
/**
@@ -47,7 +46,7 @@ public void testWriteArtworkFieldsToMp3ID3v22() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -55,12 +54,11 @@ public void testWriteArtworkFieldsToMp3ID3v22() {
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
/**
@@ -71,7 +69,7 @@ public void testWriteArtworkFieldsToMp3ID3v23() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -79,12 +77,11 @@ public void testWriteArtworkFieldsToMp3ID3v23() {
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
/**
@@ -95,14 +92,13 @@ public void testReadWriteArtworkFieldsToOggVorbis() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test3.ogg");
+ testFile = copyAudioToTmp("test3.ogg");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -116,18 +112,17 @@ public void testReadWriteArtworkFieldsToFlac() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ testFile = copyAudioToTmp("test.flac");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
/**
@@ -138,18 +133,17 @@ public void testReadWriteArtworkFieldsToWma() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test5.wma");
+ testFile = copyAudioToTmp("test5.wma");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
/**
@@ -160,18 +154,17 @@ public void testReadWriteArtworkFieldsToMp4() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test2.m4a");
+ testFile = copyAudioToTmp("test2.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
/**
@@ -182,18 +175,17 @@ public void testReadWriteArtworkFieldsToWav() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.wav");
+ testFile = copyAudioToTmp("test.wav");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
/**
@@ -204,17 +196,16 @@ public void testReadWriteArtworkFieldsToReal() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test01.ra");
+ testFile = copyAudioToTmp("test01.ra");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
tag.createField(FieldKey.COVER_ART, "test");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue265Test.java b/src/test/java/org/jaudiotagger/issues/Issue265Test.java
index 9614561..7065c84 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue265Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue265Test.java
@@ -18,17 +18,12 @@ public class Issue265Test extends AbstractTestCase {
*/
@Test
public void testWriteTooLargeStringToFile() {
- File orig = new File("testdata", "test7.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
TagOptionSingleton.getInstance().setTruncateTextWithoutErrors(false);
- File testFile = AbstractTestCase.copyAudioToTmp("test7.wma");
+ File testFile = copyAudioToTmp("test7.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(0, tag.getFields(FieldKey.COVER_ART).size());
@@ -40,11 +35,10 @@ public void testWriteTooLargeStringToFile() {
}
tag.setField(FieldKey.ARTIST, sb.toString());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
/**
@@ -52,15 +46,10 @@ public void testWriteTooLargeStringToFile() {
*/
@Test
public void testWriteTruncateStringToFile() {
- File orig = new File("testdata", "test7.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test7.wma");
+ File testFile = copyAudioToTmp("test7.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(0, tag.getFields(FieldKey.COVER_ART).size());
@@ -76,7 +65,6 @@ public void testWriteTruncateStringToFile() {
tag.setField(FieldKey.ARTIST, sb.toString());
f.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -87,15 +75,10 @@ public void testWriteTruncateStringToFile() {
*/
@Test
public void testWriteTooLargeStringToFileContentDesc() {
- File orig = new File("testdata", "test7.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test7.wma");
+ File testFile = copyAudioToTmp("test7.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -106,11 +89,10 @@ public void testWriteTooLargeStringToFileContentDesc() {
}
tag.setField(FieldKey.TITLE, sb.toString());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
/**
@@ -118,15 +100,10 @@ public void testWriteTooLargeStringToFileContentDesc() {
*/
@Test
public void testWriteTruncateStringToFileContentDesc() {
- File orig = new File("testdata", "test7.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test7.wma");
+ File testFile = copyAudioToTmp("test7.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -141,7 +118,6 @@ public void testWriteTruncateStringToFileContentDesc() {
tag.setField(FieldKey.TITLE, sb.toString());
f.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue268Test.java b/src/test/java/org/jaudiotagger/issues/Issue268Test.java
index f48850f..9159efd 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue268Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue268Test.java
@@ -9,6 +9,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue268Test extends AbstractTestCase {
@@ -16,17 +17,13 @@ public class Issue268Test extends AbstractTestCase {
* Test read wma with NonArtwork Binary Data
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadWma() {
- File orig = new File("testdata", "test8.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test8.wma");
+ testFile = copyAudioToTmp("test8.wma");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -38,7 +35,6 @@ public void testReadWma() {
System.out.println(af.getTag().toString());
assertEquals("FRED", af.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue269Test.java b/src/test/java/org/jaudiotagger/issues/Issue269Test.java
index 483bbf8..1a4abf2 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue269Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue269Test.java
@@ -13,6 +13,7 @@
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.jaudiotagger.tag.id3.framebody.FrameBodyTCOP;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue269Test extends AbstractTestCase {
@@ -20,17 +21,13 @@ public class Issue269Test extends AbstractTestCase {
* Test read mp3 that says it has extended header but doesnt really
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadMp3WithExtendedHeaderFlagSetButNoExtendedHeader() {
- File orig = new File("testdata", "test46.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test46.mp3");
+ testFile = copyAudioToTmp("test46.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -47,7 +44,6 @@ public void testReadMp3WithExtendedHeaderFlagSetButNoExtendedHeader() {
System.out.println(af.getTag().toString());
assertEquals("FRED", af.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -59,16 +55,11 @@ public void testReadMp3WithExtendedHeaderFlagSetButNoExtendedHeader() {
*/
@Test
public void testReadID3v23Mp3WithExtendedHeaderAndCrc() {
- File orig = new File("testdata", "test47.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test47.mp3");
+ testFile = copyAudioToTmp("test47.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -89,7 +80,6 @@ public void testReadID3v23Mp3WithExtendedHeaderAndCrc() {
System.out.println(af.getTag().toString());
assertEquals("FRED", af.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -101,16 +91,11 @@ public void testReadID3v23Mp3WithExtendedHeaderAndCrc() {
*/
@Test
public void testReadMp3WithEncryptedField() {
- File orig = new File("testdata", "test48.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test48.mp3");
+ testFile = copyAudioToTmp("test48.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -169,7 +154,6 @@ public void testReadMp3WithEncryptedField() {
assertEquals(0x40, frame.getStatusFlags().getOriginalFlags());
assertEquals(0x40, frame.getStatusFlags().getWriteFlags());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -180,16 +164,11 @@ public void testReadMp3WithEncryptedField() {
*/
@Test
public void testReadID3v24Mp3WithExtendedHeaderAndCrc() {
- File orig = new File("testdata", "test47.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test47.mp3");
+ testFile = copyAudioToTmp("test47.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -210,7 +189,6 @@ public void testReadID3v24Mp3WithExtendedHeaderAndCrc() {
System.out.println(af.getTag().toString());
assertEquals("FRED", af.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue270Test.java b/src/test/java/org/jaudiotagger/issues/Issue270Test.java
index 39c0dcf..2d66d3e 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue270Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue270Test.java
@@ -1,5 +1,6 @@
package org.jaudiotagger.issues;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
@@ -8,6 +9,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.exceptions.CannotReadException;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue270Test extends AbstractTestCase {
@@ -15,26 +17,21 @@ public class Issue270Test extends AbstractTestCase {
* Test read mp3 that says it has extended header but doesnt really
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadMp4WithCorruptMdata() {
- File orig = new File("testdata", "test49.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test49.m4a");
+ testFile = copyAudioToTmp("test49.m4a");
//Read FileFails
AudioFile af = AudioFileIO.read(testFile);
System.out.println(af.getTag().toString());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue271Test.java b/src/test/java/org/jaudiotagger/issues/Issue271Test.java
index c2d6578..8eeefe3 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue271Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue271Test.java
@@ -14,6 +14,7 @@
import org.jaudiotagger.tag.id3.ID3v23Frames;
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue271Test extends AbstractTestCase {
@@ -21,17 +22,13 @@ public class Issue271Test extends AbstractTestCase {
* Test read mp3 that says it has extended header but doesn't really
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadMp3WithExtendedHeaderFlagSetButNoExtendedHeader() {
- File orig = new File("testdata", "test46.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test46.mp3");
+ testFile = copyAudioToTmp("test46.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -48,7 +45,6 @@ public void testReadMp3WithExtendedHeaderFlagSetButNoExtendedHeader() {
System.out.println(af.getTag().toString());
assertEquals("FRED", af.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -60,16 +56,11 @@ public void testReadMp3WithExtendedHeaderFlagSetButNoExtendedHeader() {
*/
@Test
public void testReadMp3WithExtendedHeaderAndCrc() {
- File orig = new File("testdata", "test47.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test47.mp3");
+ testFile = copyAudioToTmp("test47.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -90,7 +81,6 @@ public void testReadMp3WithExtendedHeaderAndCrc() {
System.out.println(af.getTag().toString());
assertEquals("FRED", af.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -104,16 +94,11 @@ public void testReadMp3WithExtendedHeaderAndCrc() {
*/
@Test
public void testReadMp3WithEncryptedField() {
- File orig = new File("testdata", "test48.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test48.mp3");
+ testFile = copyAudioToTmp("test48.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -137,7 +122,6 @@ public void testReadMp3WithEncryptedField() {
System.out.println(af.getTag().toString());
assertEquals("FRED", af.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -149,16 +133,11 @@ public void testReadMp3WithEncryptedField() {
*/
@Test
public void testReadFlagsCompressed() {
- File orig = new File("testdata", "test51.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test51.mp3");
+ testFile = copyAudioToTmp("test51.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -189,7 +168,6 @@ public void testReadFlagsCompressed() {
assertEquals("B new start", v22tag.getFirst(FieldKey.TITLE));
TagOptionSingleton.getInstance().setUnsyncTags(false);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -201,16 +179,11 @@ public void testReadFlagsCompressed() {
*/
@Test
public void testReadFlagsUnsyced() {
- File orig = new File("testdata", "test52.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test52.mp3");
+ testFile = copyAudioToTmp("test52.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -242,7 +215,6 @@ public void testReadFlagsUnsyced() {
assertEquals("B new start", v22tag.getFirst(FieldKey.TITLE));
TagOptionSingleton.getInstance().setUnsyncTags(false);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -254,16 +226,11 @@ public void testReadFlagsUnsyced() {
*/
@Test
public void testReadFlagsUnsycedCompressed() {
- File orig = new File("testdata", "test53.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test53.mp3");
+ testFile = copyAudioToTmp("test53.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -295,7 +262,6 @@ public void testReadFlagsUnsycedCompressed() {
assertEquals("B new start", v22tag.getFirst(FieldKey.TITLE));
TagOptionSingleton.getInstance().setUnsyncTags(false);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue277Test.java b/src/test/java/org/jaudiotagger/issues/Issue277Test.java
index bac930b..7344d42 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue277Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue277Test.java
@@ -10,6 +10,7 @@
import org.jaudiotagger.tag.mp4.Mp4FieldKey;
import org.jaudiotagger.tag.mp4.Mp4Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue277Test extends AbstractTestCase {
@@ -17,17 +18,13 @@ public class Issue277Test extends AbstractTestCase {
* Set isCompilation
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSetIsCompilation() {
- File orig = new File("testdata", "test1.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test1.m4a");
+ testFile = copyAudioToTmp("test1.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(0, af.getTag().getFields(FieldKey.IS_COMPILATION).size());
@@ -51,17 +48,13 @@ public void testSetIsCompilation() {
* Set isCompilation new way
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSetIsCompilation2() {
- File orig = new File("testdata", "test1.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test1.m4a");
+ testFile = copyAudioToTmp("test1.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(0, af.getTag().getFields(FieldKey.IS_COMPILATION).size());
@@ -85,17 +78,13 @@ public void testSetIsCompilation2() {
* Set isCompilation and rating fields
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSetRating() {
- File orig = new File("testdata", "test1.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test1.m4a");
+ testFile = copyAudioToTmp("test1.m4a");
AudioFile af = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) af.getTag();
@@ -118,17 +107,13 @@ public void testSetRating() {
* Set rating is one byte but not true and false so should fail
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSetRating2() {
- File orig = new File("testdata", "test1.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test1.m4a");
+ testFile = copyAudioToTmp("test1.m4a");
AudioFile af = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) af.getTag();
diff --git a/src/test/java/org/jaudiotagger/issues/Issue279Test.java b/src/test/java/org/jaudiotagger/issues/Issue279Test.java
index 77b7f17..f7e3e08 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue279Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue279Test.java
@@ -9,6 +9,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue279Test extends AbstractTestCase {
@@ -16,17 +17,13 @@ public class Issue279Test extends AbstractTestCase {
* Test write to ogg, cant find parent setup header
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteToOgg() {
- File orig = new File("testdata", "test55.ogg");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test55.ogg");
+ testFile = copyAudioToTmp("test55.ogg");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -38,7 +35,6 @@ public void testWriteToOgg() {
System.out.println(af.getTag().toString());
assertEquals("FRED", af.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue282Test.java b/src/test/java/org/jaudiotagger/issues/Issue282Test.java
index b976a8b..a15cf4f 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue282Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue282Test.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFile;
@@ -10,23 +7,20 @@
import org.jaudiotagger.tag.images.ArtworkFactory;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class Issue282Test extends AbstractTestCase {
@Test
public void testWriteToRelativeWmaFile() {
- File orig = new File("testdata", "test1.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ testFile = copyAudioToTmp("test1.wma");
//Copy up a level coz we need it to be in same folder as working directory so can just specify filename
- File outputFile = new File(testFile.getName());
+ File outputFile = tempFileResource("target_" + testFile.getName());
boolean result = copy(testFile, outputFile);
assertTrue(result);
@@ -41,14 +35,13 @@ public void testWriteToRelativeWmaFile() {
.getTag()
.setField(
ArtworkFactory.createArtworkFromFile(
- new File("testdata/coverart.jpg")
+ fileResource("testdata", "coverart.jpg")
)
);
af.commit();
outputFile.delete();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -56,20 +49,23 @@ public void testWriteToRelativeWmaFile() {
}
@Test
- public void testWriteToRelativeMp3File() {
- File orig = new File("testdata", "testV1.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
+ public void testCopy() throws Exception {
+ String fileName = "testV1.mp3";
+ final File sourceFile = new File(ClassLoader.getSystemResource("testdata/" + fileName).toURI());
+ final File destFile = copyAudioToTmp(fileName);
+ assertTrue(destFile.exists());
+ assertEquals(sourceFile.length(), destFile.length());
+ }
+ @Test
+ public void testWriteToRelativeMp3File() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Copy up a level coz we need it to be in same folder as working directory so can just specify filename
- File outputFile = new File(testFile.getName());
+ File outputFile = tempFileResource("target_" + testFile.getName());
boolean result = copy(testFile, outputFile);
assertTrue(result);
@@ -84,12 +80,11 @@ public void testWriteToRelativeMp3File() {
.getTag()
.setField(
ArtworkFactory.createArtworkFromFile(
- new File("testdata/coverart.jpg")
+ fileResource("testdata", "coverart.jpg")
)
);
af.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue284Test.java b/src/test/java/org/jaudiotagger/issues/Issue284Test.java
index 9f3bcea..9a3654e 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue284Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue284Test.java
@@ -1,7 +1,7 @@
package org.jaudiotagger.issues;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
@@ -15,16 +15,11 @@ public class Issue284Test extends AbstractTestCase {
@Test
public void testConvertv23v24() {
- File orig = new File("testdata", "testV1.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
MP3File af = (MP3File) AudioFileIO.read(testFile);
ID3v24Frame frame = new ID3v24Frame(
@@ -34,10 +29,9 @@ public void testConvertv23v24() {
ID3v24Frames.FRAME_ID_INVOLVED_PEOPLE
);
frame.setBody(fb);
- assertTrue(frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, frame.getBody());
ID3v23Frame framev23 = new ID3v23Frame(frame);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -46,16 +40,11 @@ public void testConvertv23v24() {
@Test
public void testConvertv22v24() {
- File orig = new File("testdata", "testV1.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
MP3File af = (MP3File) AudioFileIO.read(testFile);
ID3v24Frame frame = new ID3v24Frame(
@@ -65,10 +54,9 @@ public void testConvertv22v24() {
ID3v24Frames.FRAME_ID_INVOLVED_PEOPLE
);
frame.setBody(fb);
- assertTrue(frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, frame.getBody());
ID3v22Frame framev22 = new ID3v22Frame(frame);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -77,16 +65,11 @@ public void testConvertv22v24() {
@Test
public void testConvertv24v23() {
- File orig = new File("testdata", "testV1.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
MP3File af = (MP3File) AudioFileIO.read(testFile);
ID3v23Frame frame = new ID3v23Frame(
@@ -96,10 +79,9 @@ public void testConvertv24v23() {
ID3v23Frames.FRAME_ID_V3_INVOLVED_PEOPLE
);
frame.setBody(fb);
- assertTrue(frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, frame.getBody());
ID3v24Frame framev24 = new ID3v24Frame(frame);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -108,16 +90,11 @@ public void testConvertv24v23() {
@Test
public void testConvertv24v22() {
- File orig = new File("testdata", "testV1.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
MP3File af = (MP3File) AudioFileIO.read(testFile);
ID3v22Frame frame = new ID3v22Frame(ID3v22Frames.FRAME_ID_V2_TITLE);
@@ -125,10 +102,9 @@ public void testConvertv24v22() {
ID3v22Frames.FRAME_ID_V2_TITLE
);
frame.setBody(fb);
- assertTrue(frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, frame.getBody());
ID3v24Frame framev24 = new ID3v24Frame(frame);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -137,16 +113,11 @@ public void testConvertv24v22() {
@Test
public void testConvertv22v23() {
- File orig = new File("testdata", "testV1.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
MP3File af = (MP3File) AudioFileIO.read(testFile);
ID3v23Frame frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_TITLE);
@@ -154,10 +125,9 @@ public void testConvertv22v23() {
ID3v23Frames.FRAME_ID_V3_TITLE
);
frame.setBody(fb);
- assertTrue(frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, frame.getBody());
ID3v22Frame framev22 = new ID3v22Frame(frame);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue286Test.java b/src/test/java/org/jaudiotagger/issues/Issue286Test.java
index f508c93..ce12bff 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue286Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue286Test.java
@@ -21,7 +21,7 @@ public class Issue286Test extends AbstractTestCase {
*/
@Test
public void testReadVorbisCoverartOne() throws Exception {
- File file = new File("testdata", "test76.ogg");
+ File file = fileResource("testdata", "test76.ogg");
AudioFile af = AudioFileIO.read(file);
assertEquals(1, af.getTag().getArtworkList().size());
Artwork artwork = af.getTag().getFirstArtwork();
@@ -38,7 +38,7 @@ public void testReadVorbisCoverartOne() throws Exception {
*/
@Test
public void testReadVorbisCoverartTwo() throws Exception {
- File file = new File("testdata", "test77.ogg");
+ File file = fileResource("testdata", "test77.ogg");
AudioFile af = AudioFileIO.read(file);
assertEquals(1, af.getTag().getArtworkList().size());
Artwork artwork = af.getTag().getFirstArtwork();
@@ -57,14 +57,14 @@ public void testReadWriteArtworkFieldsToOggVorbis() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test3.ogg");
+ testFile = copyAudioToTmp("test3.ogg");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTag();
assertEquals(1, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
Artwork artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
@@ -73,7 +73,7 @@ public void testReadWriteArtworkFieldsToOggVorbis() {
//Now add new image
Artwork newartwork = ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
);
newartwork.setDescription("A new file");
assertTrue(ImageFormats.isPortableFormat(newartwork.getBinaryData()));
@@ -83,21 +83,20 @@ public void testReadWriteArtworkFieldsToOggVorbis() {
tag = af.getTag();
assertEquals(2, tag.getArtworkList().size());
- assertTrue(tag.getArtworkList().get(0) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(0));
artwork = tag.getFirstArtwork();
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
assertEquals("", artwork.getDescription());
assertEquals(200, Images.getImage(artwork).getWidth());
- assertTrue(tag.getArtworkList().get(1) instanceof Artwork);
+ assertInstanceOf(Artwork.class, tag.getArtworkList().get(1));
artwork = tag.getArtworkList().get(1);
assertEquals("image/png", artwork.getMimeType());
assertNotNull(artwork.getImage());
assertEquals("A new file", artwork.getDescription());
assertEquals(200, Images.getImage(artwork).getWidth());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue290Test.java b/src/test/java/org/jaudiotagger/issues/Issue290Test.java
index 45a1b96..bfa7b62 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue290Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue290Test.java
@@ -9,21 +9,18 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue290Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSavingFile() {
- File orig = new File("testdata", "test59.mp4");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test59.mp4");
+ testFile = copyAudioToTmp("test59.mp4");
AudioFile af = AudioFileIO.read(testFile);
System.out.println("Tag is" + af.getTag().toString());
af.getTag().setField(af.getTag().createField(FieldKey.ARTIST, "fred"));
@@ -32,7 +29,6 @@ public void testSavingFile() {
af = AudioFileIO.read(testFile);
assertEquals("fred", af.getTag().getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue291Test.java b/src/test/java/org/jaudiotagger/issues/Issue291Test.java
index 33c4dad..d0ff0e1 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue291Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue291Test.java
@@ -11,21 +11,18 @@
import org.jcodec.containers.mp4.MP4Util;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue291Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSavingFile() {
- File orig = new File("testdata", "test83.mp4");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test83.mp4");
+ testFile = copyAudioToTmp("test83.mp4");
AudioFile af = AudioFileIO.read(testFile);
System.out.println("Tag is" + af.getTag().toString());
af
@@ -35,7 +32,6 @@ public void testSavingFile() {
af = AudioFileIO.read(testFile);
assertEquals("Kenny Rankin1", af.getTag().getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -43,22 +39,17 @@ public void testSavingFile() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testPrintAtomTree() {
- File orig = new File("testdata", "test83.mp4");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test83.mp4");
+ testFile = copyAudioToTmp("test83.mp4");
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
System.out.println(json);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue292Test.java b/src/test/java/org/jaudiotagger/issues/Issue292Test.java
index a9fd896..e9007f3 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue292Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue292Test.java
@@ -9,31 +9,29 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue292Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSavingMp3File() {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2.mp3");
- if (!testFile.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
+ File testFile;
File originalFileBackup = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2.mp3");
+ testFile = copyAudioToTmp("testV1Cbr128ID3v2.mp3");
//Put file in backup location
- originalFileBackup = new File(
+ originalFileBackup = fileResource(
testFile.getAbsoluteFile().getParentFile().getPath(),
AudioFile.getBaseFilename(testFile) + ".old"
);
testFile.renameTo(originalFileBackup);
//Copy over again
- testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2.mp3");
+ testFile = copyAudioToTmp("testV1Cbr128ID3v2.mp3");
//Read and save chnages
AudioFile af = AudioFileIO.read(testFile);
@@ -66,7 +64,6 @@ public void testSavingMp3File() {
af.getTag().getFirst(FieldKey.ARTIST)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
} finally {
originalFileBackup.delete();
@@ -75,27 +72,24 @@ public void testSavingMp3File() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSavingMp4File() {
- File testFile = AbstractTestCase.copyAudioToTmp("test8.m4a");
- if (!testFile.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
+ File testFile;
File originalFileBackup = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test8.m4a");
+ testFile = copyAudioToTmp("test8.m4a");
//Put file in backup location
- originalFileBackup = new File(
+ originalFileBackup = fileResource(
testFile.getAbsoluteFile().getParentFile().getPath(),
AudioFile.getBaseFilename(testFile) + ".old"
);
testFile.renameTo(originalFileBackup);
//Copy over again
- testFile = AbstractTestCase.copyAudioToTmp("test8.m4a");
+ testFile = copyAudioToTmp("test8.m4a");
//Read and save chnages
AudioFile af = AudioFileIO.read(testFile);
@@ -128,7 +122,6 @@ public void testSavingMp4File() {
af.getTag().getFirst(FieldKey.ARTIST)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
} finally {
originalFileBackup.delete();
diff --git a/src/test/java/org/jaudiotagger/issues/Issue294Test.java b/src/test/java/org/jaudiotagger/issues/Issue294Test.java
index 5152cc2..2ccba23 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue294Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue294Test.java
@@ -16,21 +16,16 @@
import org.jaudiotagger.tag.images.ArtworkFactory;
import org.jaudiotagger.tag.images.Images;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue294Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSavingArtworkToMp3File() {
- File orig = new File("testdata", "test70.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test70.mp3");
- File testPix = AbstractTestCase.copyAudioToTmp("test70.jpg");
- File originalFileBackup = null;
+ File testFile = copyAudioToTmp("test70.mp3");
+ File testPix = copyAudioToTmp("test70.jpg");
Exception exceptionCaught = null;
try {
@@ -127,7 +122,6 @@ public void testSavingArtworkToMp3File() {
assertEquals(500, Images.getImage(artwork).getHeight());
assertEquals(500, Images.getImage(artwork).getWidth());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue298Test.java b/src/test/java/org/jaudiotagger/issues/Issue298Test.java
index bcc6e54..358eaa8 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue298Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue298Test.java
@@ -28,7 +28,7 @@ public void testWriteFieldsToMp3ID3v24() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -455,8 +455,8 @@ public void testWriteFieldsToMp3ID3v24() {
{
TagField tagField = af.getTag().getFirstField(FieldKey.CUSTOM1);
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyCOMM);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyCOMM.class, ((ID3v24Frame) tagField).getBody());
}
af.commit();
af = AudioFileIO.read(testFile);
@@ -524,46 +524,45 @@ public void testWriteFieldsToMp3ID3v24() {
);
{
TagField tagField = af.getTag().getFirstField(FieldKey.CUSTOM1);
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyCOMM);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyCOMM.class, ((ID3v24Frame) tagField).getBody());
FrameBodyCOMM body = (FrameBodyCOMM) ((ID3v24Frame) tagField).getBody();
assertEquals(FrameBodyCOMM.MM_CUSTOM1, body.getDescription());
assertEquals(Languages.MEDIA_MONKEY_ID, body.getLanguage());
}
{
TagField tagField = af.getTag().getFirstField(FieldKey.CUSTOM2);
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyCOMM);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyCOMM.class, ((ID3v24Frame) tagField).getBody());
FrameBodyCOMM body = (FrameBodyCOMM) ((ID3v24Frame) tagField).getBody();
assertEquals(FrameBodyCOMM.MM_CUSTOM2, body.getDescription());
assertEquals(Languages.MEDIA_MONKEY_ID, body.getLanguage());
}
{
TagField tagField = af.getTag().getFirstField(FieldKey.CUSTOM3);
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyCOMM);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyCOMM.class, ((ID3v24Frame) tagField).getBody());
FrameBodyCOMM body = (FrameBodyCOMM) ((ID3v24Frame) tagField).getBody();
assertEquals(FrameBodyCOMM.MM_CUSTOM3, body.getDescription());
assertEquals(Languages.MEDIA_MONKEY_ID, body.getLanguage());
}
{
TagField tagField = af.getTag().getFirstField(FieldKey.CUSTOM4);
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyCOMM);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyCOMM.class, ((ID3v24Frame) tagField).getBody());
FrameBodyCOMM body = (FrameBodyCOMM) ((ID3v24Frame) tagField).getBody();
assertEquals(FrameBodyCOMM.MM_CUSTOM4, body.getDescription());
assertEquals(Languages.MEDIA_MONKEY_ID, body.getLanguage());
}
{
TagField tagField = af.getTag().getFirstField(FieldKey.CUSTOM5);
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyCOMM);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyCOMM.class, ((ID3v24Frame) tagField).getBody());
FrameBodyCOMM body = (FrameBodyCOMM) ((ID3v24Frame) tagField).getBody();
assertEquals(FrameBodyCOMM.MM_CUSTOM5, body.getDescription());
assertEquals(Languages.MEDIA_MONKEY_ID, body.getLanguage());
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -578,7 +577,7 @@ public void testWriteFieldsToMp3ID3v23() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -1040,7 +1039,6 @@ public void testWriteFieldsToMp3ID3v23() {
assertEquals("2", af.getTag().getFirst(FieldKey.MOVEMENT_TOTAL));
assertEquals("Movement", af.getTag().getFirst(FieldKey.MOVEMENT));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -1055,7 +1053,7 @@ public void testWriteFieldsToMp3ID3v22() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ testFile = copyAudioToTmp("testV1.mp3");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -1483,7 +1481,6 @@ public void testWriteFieldsToMp3ID3v22() {
af.getTag().getFirst(FieldKey.ITUNES_GROUPING)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -1498,7 +1495,7 @@ public void testWriteFieldsToOggVorbis() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ testFile = copyAudioToTmp("test.ogg");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -1928,7 +1925,6 @@ public void testWriteFieldsToOggVorbis() {
af.getTag().getFirst(FieldKey.MUSICBRAINZ_WORK)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -1943,7 +1939,7 @@ public void testWriteFieldsToFlac() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ testFile = copyAudioToTmp("test.flac");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -2452,7 +2448,6 @@ public void testWriteFieldsToFlac() {
af.getTag().getFirst(FieldKey.MUSICBRAINZ_WORK)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -2467,7 +2462,7 @@ public void testWriteFieldsToWma() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ testFile = copyAudioToTmp("test1.wma");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -2899,7 +2894,6 @@ public void testWriteFieldsToWma() {
af.getTag().getFirst(FieldKey.MUSICBRAINZ_WORK)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -2914,7 +2908,7 @@ public void testWriteFieldsToMp4() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ testFile = copyAudioToTmp("test.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -3349,7 +3343,6 @@ public void testWriteFieldsToMp4() {
af.getTag().getFirst(FieldKey.MUSICBRAINZ_WORK)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue308Test.java b/src/test/java/org/jaudiotagger/issues/Issue308Test.java
index cbaab1d..7ffdc32 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue308Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue308Test.java
@@ -10,29 +10,22 @@
import org.jaudiotagger.tag.images.Artwork;
import org.jaudiotagger.tag.images.ArtworkFactory;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue308Test extends AbstractTestCase {
public static int countExceptions = 0;
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testAddingLargeImageToOgg() {
- File orig = new File("testdata", "test72.ogg");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception e = null;
try {
- final File testFile = AbstractTestCase.copyAudioToTmp("test72.ogg");
- if (!testFile.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
+ final File testFile = copyAudioToTmp("test72.ogg");
AudioFile af = AudioFileIO.read(testFile);
Artwork artwork = ArtworkFactory.getNew();
- artwork.setFromFile(new File("testdata", "coverart_large.jpg"));
+ artwork.setFromFile(fileResource("testdata", "coverart_large.jpg"));
af.getTag().setField(artwork);
af.commit();
diff --git a/src/test/java/org/jaudiotagger/issues/Issue309Test.java b/src/test/java/org/jaudiotagger/issues/Issue309Test.java
index 61993f1..a97a350 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue309Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue309Test.java
@@ -7,22 +7,19 @@
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue309Test extends AbstractTestCase {
public static int countExceptions = 0;
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testAddingLargeImageToOgg() {
- File orig = new File("testdata", "test73.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception e = null;
try {
- final File testFile = AbstractTestCase.copyAudioToTmp("test73.m4a");
+ final File testFile = copyAudioToTmp("test73.m4a");
AudioFile af = AudioFileIO.read(testFile);
} catch (Exception ex) {
e = ex;
diff --git a/src/test/java/org/jaudiotagger/issues/Issue310Test.java b/src/test/java/org/jaudiotagger/issues/Issue310Test.java
index f8b6244..815ab10 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue310Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue310Test.java
@@ -12,23 +12,20 @@
import org.jcodec.containers.mp4.MP4Util;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue310Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSavingFile() {
- File orig = new File("testdata", "test85.mp4");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp(
+ testFile = copyAudioToTmp(
"test85.mp4",
- new File("test85Test1.mp4")
+ "test85Test1.mp4"
);
AudioFile af = AudioFileIO.read(testFile);
af
@@ -38,7 +35,6 @@ public void testSavingFile() {
af = AudioFileIO.read(testFile);
assertEquals("Kenny Rankin1", af.getTag().getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -46,19 +42,15 @@ public void testSavingFile() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSavingFile2() {
- File orig = new File("testdata", "test85.mp4");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp(
+ testFile = copyAudioToTmp(
"test85.mp4",
- new File("test85Test2.mp4")
+ "test85Test2.mp4"
);
AudioFile af = AudioFileIO.read(testFile);
@@ -67,7 +59,6 @@ public void testSavingFile2() {
af = AudioFileIO.read(testFile);
assertEquals("", af.getTag().getFirst(FieldKey.ENCODER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -75,32 +66,27 @@ public void testSavingFile2() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSavingFile3() {
- File orig = new File("testdata", "test85.mp4");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp(
+ testFile = copyAudioToTmp(
"test85.mp4",
- new File("test85Test3.mp4")
+ "test85Test3.mp4"
);
AudioFile af = AudioFileIO.read(testFile);
af
.getTag()
.setField(
ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart.png")
+ fileResource("testdata", "coverart.png")
)
);
af.commit();
af = AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -108,22 +94,17 @@ public void testSavingFile3() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testPrintAtomTree() {
- File orig = new File("testdata", "test85.mp4");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test85.mp4");
+ testFile = copyAudioToTmp("test85.mp4");
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
System.out.println(json);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue315Test.java b/src/test/java/org/jaudiotagger/issues/Issue315Test.java
index 76b785b..c84244c 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue315Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue315Test.java
@@ -8,6 +8,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue315Test extends AbstractTestCase {
@@ -16,16 +17,12 @@ public class Issue315Test extends AbstractTestCase {
* @throws Exception
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadWriteTagWithPictureBlockAtStart() {
- File orig = new File("testdata", "test54.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception e = null;
try {
- final File testFile = AbstractTestCase.copyAudioToTmp("test54.flac");
+ final File testFile = copyAudioToTmp("test54.flac");
AudioFile af = AudioFileIO.read(testFile);
//Modify File
diff --git a/src/test/java/org/jaudiotagger/issues/Issue319Test.java b/src/test/java/org/jaudiotagger/issues/Issue319Test.java
index edc007b..cbede5e 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue319Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue319Test.java
@@ -8,6 +8,7 @@
import org.jaudiotagger.tag.KeyNotFoundException;
import org.jaudiotagger.tag.Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue319Test extends AbstractTestCase {
@@ -16,14 +17,10 @@ public class Issue319Test extends AbstractTestCase {
* @throws Exception
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testTagEquality() throws Exception {
- File orig = new File("testdata", "test26.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File file1 = new File("testdata", "test26.mp3");
+ File file1 = fileResource("testdata", "test26.mp3");
MP3File audioFile = (MP3File) AudioFileIO.read(file1);
Tag tag = audioFile.getTag();
@@ -33,7 +30,6 @@ public void testTagEquality() throws Exception {
String fieldValue = tag.getFirst(key);
System.out.println("Fieldvalue is" + fieldValue);
} catch (KeyNotFoundException e) {
- e.printStackTrace();
}
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue320Test.java b/src/test/java/org/jaudiotagger/issues/Issue320Test.java
index 354672d..f00070a 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue320Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue320Test.java
@@ -8,6 +8,7 @@
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue320Test extends AbstractTestCase {
@@ -16,15 +17,11 @@ public class Issue320Test extends AbstractTestCase {
* @throws Exception
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testTagEquality() throws Exception {
- File orig = new File("testdata", "test26.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File file1 = new File("testdata", "test26.mp3");
- File file2 = new File("testdata", "test26.mp3");
+
+ File file1 = fileResource("testdata", "test26.mp3");
+ File file2 = fileResource("testdata", "test26.mp3");
MP3File audioFile1 = (MP3File) AudioFileIO.read(file1);
Tag tag1 = audioFile1.getTag();
diff --git a/src/test/java/org/jaudiotagger/issues/Issue322Test.java b/src/test/java/org/jaudiotagger/issues/Issue322Test.java
index e633b0d..8fdbfba 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue322Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue322Test.java
@@ -20,7 +20,7 @@ public class Issue322Test extends AbstractTestCase {
@Test
public void testNumberFieldHandling() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ File testFile = copyAudioToTmp("test.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
Exception expected = null;
@@ -31,7 +31,7 @@ public void testNumberFieldHandling() throws Exception {
}
assertNotNull(expected);
- assertTrue(expected instanceof FieldDataInvalidException);
+ assertInstanceOf(FieldDataInvalidException.class, expected);
expected = null;
try {
diff --git a/src/test/java/org/jaudiotagger/issues/Issue324Test.java b/src/test/java/org/jaudiotagger/issues/Issue324Test.java
index 3cb1c9d..7042d0b 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue324Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue324Test.java
@@ -9,18 +9,15 @@
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.id3.ID3v11Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue324Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testID3v1TagHandling() throws Exception {
- File orig = new File("testdata", "test32.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test32.mp3");
+ File testFile = copyAudioToTmp("test32.mp3");
assertEquals(1853744, testFile.length());
MP3File f = (MP3File) AudioFileIO.read(testFile);
assertEquals("Iron Maiden", f.getID3v1Tag().getFirst(FieldKey.ARTIST));
diff --git a/src/test/java/org/jaudiotagger/issues/Issue327Test.java b/src/test/java/org/jaudiotagger/issues/Issue327Test.java
index 6949c44..6b74bea 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue327Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue327Test.java
@@ -17,9 +17,9 @@ public class Issue327Test extends AbstractTestCase {
@Test
public void testUTF16BOMMultipleFieldSeperators() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testUTF16BOMMultipleFieldSeperators.mp3")
+ "testUTF16BOMMultipleFieldSeperators.mp3"
);
MP3File f = (MP3File) AudioFileIO.read(testFile);
f.setID3v2Tag(new ID3v23Tag());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue335Test.java b/src/test/java/org/jaudiotagger/issues/Issue335Test.java
index 5c7c6c5..d4f7c4b 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue335Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue335Test.java
@@ -11,20 +11,16 @@
import org.jaudiotagger.tag.id3.*;
import org.jaudiotagger.tag.id3.framebody.AbstractFrameBodyTextInfo;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue335Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testConvertv24Tov23ConvertsUTF8ToISO8859IfItCan()
throws Exception {
- File orig = new File("testdata", "test79.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
//TagOptionSingleton.getInstance().setResetTextEncodingForExistingFrames(false);
- File testFile = AbstractTestCase.copyAudioToTmp("test79.mp3");
+ File testFile = copyAudioToTmp("test79.mp3");
MP3File f = (MP3File) AudioFileIO.read(testFile);
assertEquals("Familial", f.getID3v2Tag().getFirst("TALB"));
AbstractID3v2Frame frame = (AbstractID3v2Frame) f
@@ -46,16 +42,12 @@ public void testConvertv24Tov23ConvertsUTF8ToISO8859IfItCan()
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testConvertv24Tov23OnlyConvertsUTF8ToISO8859IfItCan()
throws Exception {
- File orig = new File("testdata", "test79.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
//TagOptionSingleton.getInstance().setResetTextEncodingForExistingFrames(false);
- File testFile = AbstractTestCase.copyAudioToTmp("test79.mp3");
+ File testFile = copyAudioToTmp("test79.mp3");
MP3File f = (MP3File) AudioFileIO.read(testFile);
assertEquals("Familial", f.getID3v2Tag().getFirst("TALB"));
assertEquals(4, f.getID3v2Tag().getMajorVersion());
@@ -85,15 +77,11 @@ public void testConvertv24Tov23OnlyConvertsUTF8ToISO8859IfItCan()
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testConvertv23Twice() throws Exception {
- File orig = new File("testdata", "test79.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
//TagOptionSingleton.getInstance().setResetTextEncodingForExistingFrames(false);
- File testFile = AbstractTestCase.copyAudioToTmp("test79.mp3");
+ File testFile = copyAudioToTmp("test79.mp3");
MP3File f = (MP3File) AudioFileIO.read(testFile);
assertEquals("Familial", f.getID3v2Tag().getFirst("TALB"));
assertEquals(4, f.getID3v2Tag().getMajorVersion());
@@ -135,13 +123,9 @@ public void testConvertv23Twice() throws Exception {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testConvertCharsAtStartOfFile() throws Exception {
- File orig = new File("testdata", "test79.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
+ File orig = fileResource("testdata", "test79.mp3");
boolean isMP3v2 = false;
ID3v24Tag v24tag = null;
Tag tag = null;
diff --git a/src/test/java/org/jaudiotagger/issues/Issue345Test.java b/src/test/java/org/jaudiotagger/issues/Issue345Test.java
index 593179f..fa7bc9c 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue345Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue345Test.java
@@ -28,9 +28,9 @@ public void testWriteFieldsToMp3ID3v24() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp(
+ testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteFieldsToMp3ID3v24.mp3")
+ "testWriteFieldsToMp3ID3v24.mp3"
);
//Read File okay
@@ -65,8 +65,8 @@ public void testWriteFieldsToMp3ID3v24() {
);
{
TagField tagField = af.getTag().getFirstField(FieldKey.RATING);
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyPOPM);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyPOPM.class, ((ID3v24Frame) tagField).getBody());
}
af.commit();
af = AudioFileIO.read(testFile);
@@ -79,8 +79,8 @@ public void testWriteFieldsToMp3ID3v24() {
assertEquals("arrangervalue", af.getTag().getFirst(FieldKey.ARRANGER));
{
TagField tagField = af.getTag().getFirstField(FieldKey.RATING);
- assertTrue(tagField instanceof ID3v24Frame);
- assertTrue(((ID3v24Frame) tagField).getBody() instanceof FrameBodyPOPM);
+ assertInstanceOf(ID3v24Frame.class, tagField);
+ assertInstanceOf(FrameBodyPOPM.class, ((ID3v24Frame) tagField).getBody());
}
List fields = tag.getFields(FieldKey.PRODUCER);
@@ -114,7 +114,6 @@ public void testWriteFieldsToMp3ID3v24() {
assertEquals("", af.getTag().getFirst(FieldKey.ENGINEER));
assertEquals("", af.getTag().getFirst(FieldKey.DJMIXER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -129,9 +128,9 @@ public void testWriteFieldsToMp3ID3v23() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp(
+ testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteFieldsToMp3ID3v23.mp3")
+ "testWriteFieldsToMp3ID3v23.mp3"
);
AudioFile af = AudioFileIO.read(testFile);
@@ -201,7 +200,6 @@ public void testWriteFieldsToMp3ID3v23() {
assertEquals("", af.getTag().getFirst(FieldKey.ENGINEER));
assertEquals("", af.getTag().getFirst(FieldKey.DJMIXER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -216,9 +214,9 @@ public void testWriteFieldsToMp3ID3v22() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp(
+ testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteFieldsToMp3ID3v22.mp3")
+ "testWriteFieldsToMp3ID3v22.mp3"
);
//Read File okay
@@ -293,7 +291,6 @@ public void testWriteFieldsToMp3ID3v22() {
assertEquals("", tag.getFirst(FieldKey.ENGINEER));
assertEquals("", tag.getFirst(FieldKey.DJMIXER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -308,7 +305,7 @@ public void testWriteFieldsToOggVorbis() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ testFile = copyAudioToTmp("test.ogg");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -344,7 +341,6 @@ public void testWriteFieldsToOggVorbis() {
assertEquals("producervalue", af.getTag().getFirst(FieldKey.PRODUCER));
assertEquals("arrangervalue", af.getTag().getFirst(FieldKey.ARRANGER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -359,7 +355,7 @@ public void testWriteFieldsToFlac() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ testFile = copyAudioToTmp("test.flac");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -386,7 +382,6 @@ public void testWriteFieldsToFlac() {
assertEquals("producervalue", af.getTag().getFirst(FieldKey.PRODUCER));
assertEquals("arrangervalue", af.getTag().getFirst(FieldKey.ARRANGER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -401,7 +396,7 @@ public void testWriteFieldsToWma() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ testFile = copyAudioToTmp("test1.wma");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -437,7 +432,6 @@ public void testWriteFieldsToWma() {
assertEquals("producervalue", af.getTag().getFirst(FieldKey.PRODUCER));
assertEquals("arrangervalue", af.getTag().getFirst(FieldKey.ARRANGER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -452,7 +446,7 @@ public void testWriteFieldsToMp4() {
File testFile = null;
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ testFile = copyAudioToTmp("test.m4a");
//Read File okay
AudioFile af = AudioFileIO.read(testFile);
@@ -488,7 +482,6 @@ public void testWriteFieldsToMp4() {
assertEquals("producervalue", af.getTag().getFirst(FieldKey.PRODUCER));
assertEquals("arrangervalue", af.getTag().getFirst(FieldKey.ARRANGER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue356Test.java b/src/test/java/org/jaudiotagger/issues/Issue356Test.java
index a64420d..e3a6f01 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue356Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue356Test.java
@@ -23,9 +23,9 @@ public void testWritingLinkedUrlToID3v24() throws Exception {
AudioFile audioFile;
final String IMAGE_URL = "http://www.google.com/image.jpg";
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritingLinkedUrlToID3v24.mp3")
+ "testWritingLinkedUrlToID3v24.mp3"
);
audioFile = AudioFileIO.read(testFile);
audioFile.setTag(new ID3v24Tag());
@@ -49,9 +49,9 @@ public void testWritingLinkedUrlToID3v23() throws Exception {
AudioFile audioFile;
final String IMAGE_URL = "http://www.google.com/image.jpg";
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritingLinkedUrlToID3v23.mp3")
+ "testWritingLinkedUrlToID3v23.mp3"
);
audioFile = AudioFileIO.read(testFile);
audioFile.setTag(new ID3v23Tag());
@@ -75,9 +75,9 @@ public void testWritingLinkedUrlToID3v22() throws Exception {
AudioFile audioFile;
final String IMAGE_URL = "http://www.google.com/image.jpg";
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritingLinkedUrlToID3v22.mp3")
+ "testWritingLinkedUrlToID3v22.mp3"
);
audioFile = AudioFileIO.read(testFile);
audioFile.setTag(new ID3v22Tag());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue365Test.java b/src/test/java/org/jaudiotagger/issues/Issue365Test.java
index 72a0da0..3680c9a 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue365Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue365Test.java
@@ -9,27 +9,22 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue365Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test90.ogg");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test90.ogg");
+ File testFile = copyAudioToTmp("test90.ogg");
AudioFile af = AudioFileIO.read(testFile);
af.getTag().setField(FieldKey.ARTIST, "fred");
af.commit();
af = AudioFileIO.read(testFile);
assertEquals("fred", af.getTag().getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
caught = e;
}
assertNull(caught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue366Test.java b/src/test/java/org/jaudiotagger/issues/Issue366Test.java
index 6260ad0..ff148e6 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue366Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue366Test.java
@@ -9,20 +9,16 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue366Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test91.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test91.mp3");
+ File testFile = copyAudioToTmp("test91.mp3");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(af.getTag().getFirst(FieldKey.TRACK), "15");
} catch (Exception e) {
diff --git a/src/test/java/org/jaudiotagger/issues/Issue367Test.java b/src/test/java/org/jaudiotagger/issues/Issue367Test.java
index 46293d7..8dafa3e 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue367Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue367Test.java
@@ -7,20 +7,16 @@
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue367Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test93.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test93.mp3");
+ File testFile = copyAudioToTmp("test93.mp3");
long startTime = System.nanoTime();
AudioFile af = AudioFileIO.read(testFile);
long endTime = System.nanoTime();
@@ -28,7 +24,6 @@ public void testIssue() {
System.out.println("Time:" + totalTime + ":ms");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue368Test.java b/src/test/java/org/jaudiotagger/issues/Issue368Test.java
index 5a36e4e..ab50b2f 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue368Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue368Test.java
@@ -9,25 +9,20 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue368Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test95.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test95.m4a");
+ File testFile = copyAudioToTmp("test95.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(af.getTag().getFirst(FieldKey.DISC_NO), "2");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue370Test.java b/src/test/java/org/jaudiotagger/issues/Issue370Test.java
index e13dcfe..b721404 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue370Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue370Test.java
@@ -2,27 +2,22 @@
import static org.junit.jupiter.api.Assertions.assertNull;
-import java.io.File;
import org.jaudiotagger.AbstractTestCase;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue370Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test96.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
//ToDO Fix Issue
- //File testFile = AbstractTestCase.copyAudioToTmp("test96.m4a");
+ //File testFile = copyAudioToTmp("test96.m4a");
//AudioFile af = AudioFileIO.read(testFile);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue373Test.java b/src/test/java/org/jaudiotagger/issues/Issue373Test.java
index 8660efc..cb89263 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue373Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue373Test.java
@@ -9,20 +9,16 @@
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue373Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test94.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test94.mp3");
+ File testFile = copyAudioToTmp("test94.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.setTag(new ID3v23Tag());
@@ -36,7 +32,6 @@ public void testIssue() {
af.commit();
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue374Test.java b/src/test/java/org/jaudiotagger/issues/Issue374Test.java
index b6f4093..ad5395f 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue374Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue374Test.java
@@ -17,26 +17,16 @@ public class Issue374Test extends AbstractTestCase {
@Test
public void testIssue() {
- File testdatadir = new File("testdata");
+ File testdatadir = fileResource("testdata");
int count = 0;
for (File next : testdatadir.listFiles(new MP3FileFilter())) {
count++;
System.out.println("Checking:" + next.getName());
Exception caught = null;
try {
- File orig = new File("testdata", next.getName());
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
next.getName(),
- new File(
- next.getName().substring(0, next.getName().length() - 4) +
- count +
- ".mp3"
- )
+ next.getName().substring(0, next.getName().length() - 4) + count + ".mp3"
);
AudioFile af = AudioFileIO.read(testFile);
@@ -51,7 +41,7 @@ public void testIssue() {
}
tag.addField(
ArtworkFactory.createArtworkFromFile(
- new File("testdata", "coverart_large.jpg")
+ fileResource("testdata", "coverart_large.jpg")
)
);
af.commit();
@@ -67,7 +57,6 @@ public void testIssue() {
assertTrue(af.getTag().getFields(FieldKey.COVER_ART).size() > 0);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
assertNull(caught);
}
}
@@ -111,18 +100,18 @@ private MP3FileFilter(final boolean allowDirectories) {
public boolean accept(final File file) {
if (
file.getName().equals("corrupt.mp3") ||
- file.getName().equals("Issue79.mp3") ||
- file.getName().equals("test22.mp3") ||
- file.getName().equals("test92.mp3") ||
- file.getName().equals("issue52.mp3") ||
- file.getName().equals("Issue81.mp3")
+ file.getName().equals("Issue79.mp3") ||
+ file.getName().equals("test22.mp3") ||
+ file.getName().equals("test92.mp3") ||
+ file.getName().equals("issue52.mp3") ||
+ file.getName().equals("Issue81.mp3")
) {
return false;
}
return (
((file.getName()).toLowerCase().endsWith(".mp3")) ||
- (file.isDirectory() && (this.allowDirectories))
+ (file.isDirectory() && (this.allowDirectories))
);
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue380Test.java b/src/test/java/org/jaudiotagger/issues/Issue380Test.java
index 0cf8476..100e240 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue380Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue380Test.java
@@ -9,25 +9,20 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue380Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test98.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test98.m4a");
+ File testFile = copyAudioToTmp("test98.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertEquals("", af.getTag().getFirst(FieldKey.TRACK_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue383Test.java b/src/test/java/org/jaudiotagger/issues/Issue383Test.java
index 022c26d..0850166 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue383Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue383Test.java
@@ -9,6 +9,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue383Test extends AbstractTestCase {
@@ -17,16 +18,11 @@ public class Issue383Test extends AbstractTestCase {
* also report incorrect length, however think problem is audio does continue until 6:08 but is just quiet sound
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssueIncorrectTrackLength() {
Exception caught = null;
try {
- File orig = new File("testdata", "test106.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test106.mp3");
+ File testFile = copyAudioToTmp("test106.mp3");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(af.getAudioHeader().getTrackLength(), 368);
} catch (Exception e) {
@@ -40,16 +36,11 @@ public void testIssueIncorrectTrackLength() {
* such as Media Monkey show correct value.
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test107.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test107.mp3");
+ File testFile = copyAudioToTmp("test107.mp3");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(af.getTag().getFirst(FieldKey.TRACK), "01");
assertEquals(af.getAudioHeader().getTrackLength(), 4372);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue386Test.java b/src/test/java/org/jaudiotagger/issues/Issue386Test.java
index 7e937e2..4b72c11 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue386Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue386Test.java
@@ -7,25 +7,20 @@
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue386Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test99.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test99.mp3");
+ File testFile = copyAudioToTmp("test99.mp3");
AudioFile af = AudioFileIO.read(testFile);
System.out.println(af.getAudioHeader());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue387Test.java b/src/test/java/org/jaudiotagger/issues/Issue387Test.java
index 8628d62..b16f61d 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue387Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue387Test.java
@@ -9,20 +9,16 @@
import org.jcodec.containers.mp4.MP4Util;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue387Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test100.mp4");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test100.mp4");
+ File testFile = copyAudioToTmp("test100.mp4");
AudioFile af = AudioFileIO.read(testFile);
System.out.println(af.getAudioHeader());
af.getTagOrCreateAndSetDefault();
@@ -33,7 +29,6 @@ public void testIssue() {
System.out.println(json);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue390Test.java b/src/test/java/org/jaudiotagger/issues/Issue390Test.java
index a6a906d..943455a 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue390Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue390Test.java
@@ -10,40 +10,35 @@
import org.jaudiotagger.tag.id3.AbstractID3v2Frame;
import org.jaudiotagger.tag.id3.framebody.FrameBodyTIPL;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue390Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test101.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test101.mp3");
+ File testFile = copyAudioToTmp("test101.mp3");
AudioFile af = AudioFileIO.read(testFile);
MP3File mp3 = (MP3File) af;
assertNotNull(mp3.getID3v2Tag());
assertNotNull(mp3.getID3v2Tag().getFrame("TIPL"));
FrameBodyTIPL body = ((FrameBodyTIPL) ((AbstractID3v2Frame) (mp3
- .getID3v2Tag()
- .getFrame("TIPL"))).getBody());
+ .getID3v2Tag()
+ .getFrame("TIPL"))).getBody());
assertEquals(4, body.getNumberOfPairs());
assertEquals(body.getKeyAtIndex(3), "producer");
assertEquals(body.getValueAtIndex(3), "producer");
body = ((FrameBodyTIPL) ((AbstractID3v2Frame) (mp3
- .getID3v2TagAsv24()
- .getFrame("TIPL"))).getBody());
+ .getID3v2TagAsv24()
+ .getFrame("TIPL"))).getBody());
assertEquals(4, body.getNumberOfPairs());
assertEquals(body.getKeyAtIndex(3), "producer");
assertEquals(body.getValueAtIndex(3), "producer");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue394Test.java b/src/test/java/org/jaudiotagger/issues/Issue394Test.java
index 78db0ce..9c6a66b 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue394Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue394Test.java
@@ -23,7 +23,6 @@ public void testCreatingID3v1TagfromID3v2tagWithMultipleComments() {
Tag v1Tag = new ID3v1Tag((AbstractTag) tag);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue397Test.java b/src/test/java/org/jaudiotagger/issues/Issue397Test.java
index a16df0c..2e8c7fe 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue397Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue397Test.java
@@ -17,7 +17,7 @@ public class Issue397Test extends AbstractTestCase {
@Test
public void testSetSubtitleForMp4() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test2.m4a");
+ File testFile = copyAudioToTmp("test2.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
tag.setField(FieldKey.DISC_SUBTITLE, "discsubtitle");
@@ -41,9 +41,9 @@ public void testSetSubtitleForMp4() throws Exception {
@Test
public void testSetSubtitleForMp3v22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testSetSubtitleForMp3v22.mp3")
+ "testSetSubtitleForMp3v22.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V22);
@@ -69,9 +69,9 @@ public void testSetSubtitleForMp3v22() throws Exception {
@Test
public void testSetSubtitleForMp3v23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testSetSubtitleForMp3v23.mp3")
+ "testSetSubtitleForMp3v23.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
@@ -97,9 +97,9 @@ public void testSetSubtitleForMp3v23() throws Exception {
@Test
public void testSetSubtitleForMp3v24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testSetSubtitleForMp3v24.mp3")
+ "testSetSubtitleForMp3v24.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V24);
@@ -125,7 +125,7 @@ public void testSetSubtitleForMp3v24() throws Exception {
@Test
public void testSetSubtitleForOgg() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ File testFile = copyAudioToTmp("test.ogg");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateDefault();
tag.setField(FieldKey.DISC_SUBTITLE, "discsubtitle");
@@ -149,7 +149,7 @@ public void testSetSubtitleForOgg() throws Exception {
@Test
public void testSetSubtitleForFlac() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateDefault();
tag.setField(FieldKey.DISC_SUBTITLE, "discsubtitle");
@@ -173,7 +173,7 @@ public void testSetSubtitleForFlac() throws Exception {
@Test
public void testSetSubtitleForWma() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ File testFile = copyAudioToTmp("test1.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateDefault();
tag.setField(FieldKey.DISC_SUBTITLE, "discsubtitle");
diff --git a/src/test/java/org/jaudiotagger/issues/Issue398Test.java b/src/test/java/org/jaudiotagger/issues/Issue398Test.java
index 2e66d80..da1fe42 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue398Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue398Test.java
@@ -49,7 +49,6 @@ public void testID3v24() {
tag.setField(FieldKey.TRACK, "1");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -80,7 +79,6 @@ public void testID3v23() {
assertFalse(tag.hasField(FieldKey.TRACK_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -111,7 +109,6 @@ public void testID3v22() {
assertFalse(tag.hasField(FieldKey.TRACK_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -129,7 +126,6 @@ public void testID3v1() {
assertTrue(tag.hasField("artist"));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -170,7 +166,6 @@ public void testMp4() {
assertFalse(tag.hasField(FieldKey.URL_DISCOGS_RELEASE_SITE));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -195,7 +190,6 @@ public void testMp4getValue() {
assertEquals(1, tag.getAll(FieldKey.TRACK).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -246,7 +240,6 @@ public void testVorbis() {
assertFalse(tag.hasField(FieldKey.TRACK_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -297,7 +290,6 @@ public void testFlac() {
assertFalse(tag.hasField(FieldKey.TRACK_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -328,7 +320,6 @@ public void testWma() {
assertFalse(tag.hasField(FieldKey.TRACK_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue403Test.java b/src/test/java/org/jaudiotagger/issues/Issue403Test.java
index 1109521..50f6f40 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue403Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue403Test.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.KeyNotFoundException;
@@ -11,6 +8,8 @@
import org.jaudiotagger.tag.id3.ID3v1Tag;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class Issue403Test extends AbstractTestCase {
@Test
@@ -21,9 +20,8 @@ public void testSetInvalidField() {
v1Tag.setField(FieldKey.DISC_NO, "1");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
- assertTrue(caught instanceof KeyNotFoundException);
+ assertInstanceOf(KeyNotFoundException.class, caught);
}
@Test
@@ -34,9 +32,8 @@ public void testAddInvalidField() {
v1Tag.addField(FieldKey.DISC_NO, "1");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
- assertTrue(caught instanceof KeyNotFoundException);
+ assertInstanceOf(KeyNotFoundException.class, caught);
}
@Test
@@ -47,9 +44,8 @@ public void testCreateInvalidField() {
v1Tag.createField(FieldKey.DISC_NO, "1");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
- assertTrue(caught instanceof KeyNotFoundException);
+ assertInstanceOf(KeyNotFoundException.class, caught);
}
@Test
@@ -60,7 +56,6 @@ public void testDeleteInvalidField() {
v1Tag.deleteField(FieldKey.DISC_NO);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
//No need to throw exception because no error ocurred
assertNull(caught);
@@ -74,9 +69,8 @@ public void testSetInvalidFieldV11() {
v1Tag.setField(FieldKey.DISC_NO, "1");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
- assertTrue(caught instanceof KeyNotFoundException);
+ assertInstanceOf(KeyNotFoundException.class, caught);
}
@Test
@@ -87,9 +81,8 @@ public void testAddInvalidFieldV11() {
v1Tag.addField(FieldKey.DISC_NO, "1");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
- assertTrue(caught instanceof KeyNotFoundException);
+ assertInstanceOf(KeyNotFoundException.class, caught);
}
@Test
@@ -100,9 +93,8 @@ public void testCreateInvalidFieldV11() {
v1Tag.createField(FieldKey.DISC_NO, "1");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
- assertTrue(caught instanceof KeyNotFoundException);
+ assertInstanceOf(KeyNotFoundException.class, caught);
}
@Test
@@ -113,7 +105,6 @@ public void testDeleteInvalidFieldV11() {
v1Tag.deleteField(FieldKey.DISC_NO);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
//No need to throw exception because no error ocurred
assertNull(caught);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue404Test.java b/src/test/java/org/jaudiotagger/issues/Issue404Test.java
index 5f3c678..de36a61 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue404Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue404Test.java
@@ -8,23 +8,16 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue404Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWritingTooLongTempFile() {
- File origFile = new File(
- "testdata",
- "test3811111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111...........................................................m4a"
- );
- if (!origFile.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
Exception caught = null;
try {
- File orig = AbstractTestCase.copyAudioToTmp(
+ File orig = copyAudioToTmp(
"test3811111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111...........................................................m4a"
);
AudioFile af = AudioFileIO.read(orig);
@@ -32,7 +25,6 @@ public void testWritingTooLongTempFile() {
AudioFileIO.write(af);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue406Test.java b/src/test/java/org/jaudiotagger/issues/Issue406Test.java
index bf864ab..dbb9fd5 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue406Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue406Test.java
@@ -9,20 +9,16 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue406Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "test103.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test103.m4a");
+ File testFile = copyAudioToTmp("test103.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(af.getTag().getFirst(FieldKey.TITLE), "London Calling");
assertEquals(af.getTag().getFirst(FieldKey.ARTIST), "The Clash");
@@ -33,7 +29,6 @@ public void testIssue() {
assertEquals(af.getTag().getFirst(FieldKey.TITLE), "Bridport Calling");
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue409Test.java b/src/test/java/org/jaudiotagger/issues/Issue409Test.java
index 4240f40..f86aea0 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue409Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue409Test.java
@@ -6,20 +6,17 @@
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.mp3.MP3File;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue409Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testFindAudioHeaderWhenTagSizeIsTooShortAndHasNullPadding()
throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test111.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test111.mp3");
+ File testFile = copyAudioToTmp("test111.mp3");
MP3File mp3File = new MP3File(testFile);
System.out.println("AudioHeaderBefore" + mp3File.getMP3AudioHeader());
assertEquals(44100, mp3File.getMP3AudioHeader().getSampleRateAsNumber());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue410Test.java b/src/test/java/org/jaudiotagger/issues/Issue410Test.java
index db9009b..e3a9ce0 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue410Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue410Test.java
@@ -17,13 +17,7 @@ public class Issue410Test extends AbstractTestCase {
public void testIssue() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.LANGUAGE, "English");
af.commit();
@@ -41,7 +35,6 @@ public void testIssue() {
assertEquals("eng", af.getTag().getFirst(FieldKey.LANGUAGE));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue411Test.java b/src/test/java/org/jaudiotagger/issues/Issue411Test.java
index 2782fd4..39a0711 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue411Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue411Test.java
@@ -19,16 +19,10 @@ public void testIssue() {
TagOptionSingleton.getInstance().setWriteMp3GenresAsText(false);
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.COMPOSER, "fred");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals("fred", af.getTag().getFirst(FieldKey.COMPOSER));
@@ -46,7 +40,6 @@ public void testIssue() {
assertEquals(1, af.getTag().getFields(FieldKey.COMPOSER).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -57,13 +50,7 @@ public void testIssue2() {
Exception caught = null;
try {
- File orig = new File("testdata", "test.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.COMPOSER, "fred");
af.commit();
@@ -80,7 +67,6 @@ public void testIssue2() {
assertEquals(2, af.getTag().getFields(FieldKey.COMPOSER).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -91,15 +77,9 @@ public void testIssue3() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"01.mp3",
- new File("issue411TestIssue3.mp3")
+ "issue411TestIssue3.mp3"
);
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.GENRE, "rock");
@@ -114,7 +94,6 @@ public void testIssue3() {
assertEquals(1, af.getTag().getFields(FieldKey.GENRE).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -125,16 +104,10 @@ public void testIssue4() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.ENGINEER, "fred");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals("fred", af.getTag().getFirst(FieldKey.ENGINEER));
@@ -146,7 +119,6 @@ public void testIssue4() {
assertEquals(2, af.getTag().getFields(FieldKey.ENGINEER).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -157,16 +129,10 @@ public void testIssue5() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.BARCODE, "BARCODE1");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals("BARCODE1", af.getTag().getFirst(FieldKey.BARCODE));
@@ -184,7 +150,6 @@ public void testIssue5() {
assertEquals(1, af.getTag().getFields(FieldKey.BARCODE).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -195,18 +160,12 @@ public void testDeletions() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
Tag tag = af.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.BARCODE, "BARCODE1");
- assertTrue(tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
tag.addField(FieldKey.BARCODE, "BARCODE2");
assertEquals(2, tag.getAll(FieldKey.BARCODE).size());
af.commit();
@@ -216,7 +175,6 @@ public void testDeletions() {
assertEquals(0, tag.getAll(FieldKey.BARCODE).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue412Test.java b/src/test/java/org/jaudiotagger/issues/Issue412Test.java
index fd5c90d..90490d3 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue412Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue412Test.java
@@ -20,16 +20,10 @@ public class Issue412Test extends AbstractTestCase {
public void testTXXXSameDescription() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.BARCODE, "BARCODE1");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals("BARCODE1", af.getTag().getFirst(FieldKey.BARCODE));
@@ -47,7 +41,6 @@ public void testTXXXSameDescription() {
assertEquals(1, af.getTag().getFields(FieldKey.BARCODE).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -56,16 +49,10 @@ public void testTXXXSameDescription() {
public void testTXXXDifferentDescription() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.BARCODE, "BARCODE1");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals("BARCODE1", af.getTag().getFirst(FieldKey.BARCODE));
@@ -89,7 +76,6 @@ public void testTXXXDifferentDescription() {
assertEquals(1, af.getTag().getFields(FieldKey.CATALOG_NO).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -98,13 +84,7 @@ public void testTXXXDifferentDescription() {
public void testWXXXSameDescription() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af
.getTagOrCreateAndSetDefault()
@@ -112,7 +92,7 @@ public void testWXXXSameDescription() {
FieldKey.URL_DISCOGS_ARTIST_SITE,
"http://www.wrathrecords.co.uk/afarm.htm"
);
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals(
@@ -153,7 +133,6 @@ public void testWXXXSameDescription() {
);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -162,16 +141,10 @@ public void testWXXXSameDescription() {
public void testTXXXSameDescriptionMultiples() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.BARCODE, "BARCODE1");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals("BARCODE1", af.getTag().getFirst(FieldKey.BARCODE));
@@ -191,7 +164,6 @@ public void testTXXXSameDescriptionMultiples() {
assertEquals(1, af.getTag().getFields(FieldKey.BARCODE).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -200,18 +172,12 @@ public void testTXXXSameDescriptionMultiples() {
public void testWXXXSameDescriptionMultiples() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af
.getTagOrCreateAndSetDefault()
.setField(FieldKey.URL_DISCOGS_ARTIST_SITE, "BARCODE1");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals(
@@ -249,7 +215,6 @@ public void testWXXXSameDescriptionMultiples() {
);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -258,16 +223,10 @@ public void testWXXXSameDescriptionMultiples() {
public void testTCOMMultiples() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault().setField(FieldKey.COMPOSER, "composer1");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals("composer1", af.getTag().getFirst(FieldKey.COMPOSER));
@@ -287,7 +246,6 @@ public void testTCOMMultiples() {
assertEquals(1, af.getTag().getFields(FieldKey.COMPOSER).size());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -296,13 +254,9 @@ public void testTCOMMultiples() {
public void testTrackNoTotalCombinations() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
+ File orig = fileResource("testdata", "01.mp3");
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.commit();
@@ -320,7 +274,6 @@ public void testTrackNoTotalCombinations() {
assertEquals("11", tag.getFirst(FieldKey.TRACK_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -329,13 +282,7 @@ public void testTrackNoTotalCombinations() {
public void testTrackNoTotalAddCombinations() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.commit();
@@ -353,7 +300,6 @@ public void testTrackNoTotalAddCombinations() {
assertEquals("11", tag.getFirst(FieldKey.TRACK_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -362,13 +308,7 @@ public void testTrackNoTotalAddCombinations() {
public void testDiscNoTotalCombinations() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.commit();
@@ -386,7 +326,6 @@ public void testDiscNoTotalCombinations() {
assertEquals("11", tag.getFirst(FieldKey.DISC_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -395,13 +334,7 @@ public void testDiscNoTotalCombinations() {
public void testDiscNoTotalAddCombinations() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.commit();
@@ -425,7 +358,6 @@ public void testDiscNoTotalAddCombinations() {
assertEquals("11", tag.getFirst(FieldKey.DISC_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -434,14 +366,8 @@ public void testDiscNoTotalAddCombinations() {
public void testDiscNoTotalAddCombinationsWithPadding() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
TagOptionSingleton.getInstance().setPadNumbers(true);
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.commit();
@@ -468,7 +394,6 @@ public void testDiscNoTotalAddCombinationsWithPadding() {
assertEquals("11", tag.getFirst(FieldKey.DISC_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -477,14 +402,8 @@ public void testDiscNoTotalAddCombinationsWithPadding() {
public void testDiscNoTotalAddCombinationsWithPaddingFlac() {
Exception caught = null;
try {
- File orig = new File("testdata", "test.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
TagOptionSingleton.getInstance().setPadNumbers(true);
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.commit();
@@ -502,7 +421,6 @@ public void testDiscNoTotalAddCombinationsWithPaddingFlac() {
assertEquals("11", tag.getFirst(FieldKey.DISC_TOTAL));
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue417Test.java b/src/test/java/org/jaudiotagger/issues/Issue417Test.java
index 644b9b1..c48197c 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue417Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue417Test.java
@@ -19,18 +19,12 @@ public class Issue417Test extends AbstractTestCase {
public void testWOARMultiples() {
Exception caught = null;
try {
- File orig = new File("testdata", "01.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("01.mp3");
+ File testFile = copyAudioToTmp("01.mp3");
AudioFile af = AudioFileIO.read(testFile);
af
.getTagOrCreateAndSetDefault()
.setField(FieldKey.URL_OFFICIAL_ARTIST_SITE, "http://test1.html");
- assertTrue(af.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, af.getTag());
af.commit();
af = AudioFileIO.read(testFile);
assertEquals(
@@ -74,7 +68,6 @@ public void testWOARMultiples() {
);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue418Test.java b/src/test/java/org/jaudiotagger/issues/Issue418Test.java
index b170bd3..5bfcbc5 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue418Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue418Test.java
@@ -16,7 +16,7 @@ public class Issue418Test extends AbstractTestCase {
@Test
public void testGetCustomGenreField() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ File testFile = copyAudioToTmp("test.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals("Genre", tag.getFirst(FieldKey.GENRE));
diff --git a/src/test/java/org/jaudiotagger/issues/Issue420Test.java b/src/test/java/org/jaudiotagger/issues/Issue420Test.java
index 1628858..aad0c59 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue420Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue420Test.java
@@ -14,9 +14,9 @@ public class Issue420Test extends AbstractTestCase {
@Test
public void testReadingFieldsThatOnlyExistInID3v1tag() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testReadingFieldsThatOnlyExistInID3v1tag.mp3")
+ "testReadingFieldsThatOnlyExistInID3v1tag.mp3"
);
MP3File mp3File = new MP3File(testFile);
assertFalse(mp3File.hasID3v1Tag());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue421Test.java b/src/test/java/org/jaudiotagger/issues/Issue421Test.java
index 61a4d19..db5b651 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue421Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue421Test.java
@@ -9,18 +9,15 @@
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue421Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testTrackField() throws Exception {
- File orig = new File("testdata", "Arizona.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("Arizona.m4a");
+ File testFile = copyAudioToTmp("Arizona.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals("13", tag.getFirst(FieldKey.TRACK));
diff --git a/src/test/java/org/jaudiotagger/issues/Issue423Test.java b/src/test/java/org/jaudiotagger/issues/Issue423Test.java
index 3d67bdc..7a7b119 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue423Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue423Test.java
@@ -15,7 +15,7 @@ public class Issue423Test extends AbstractTestCase {
@Test
public void testGetAllMp4() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test2.m4a");
+ File testFile = copyAudioToTmp("test2.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertTrue(tag.hasField(FieldKey.TRACK));
@@ -29,9 +29,9 @@ public void testGetAllMp4() throws Exception {
@Test
public void testGetAllMp3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testGetAllMp3.mp3")
+ "testGetAllMp3.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateDefault();
@@ -48,7 +48,7 @@ public void testGetAllMp3() throws Exception {
@Test
public void testGetAllOgg() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ File testFile = copyAudioToTmp("test.ogg");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -64,7 +64,7 @@ public void testGetAllOgg() throws Exception {
@Test
public void testGetAllFlac() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -80,7 +80,7 @@ public void testGetAllFlac() throws Exception {
@Test
public void testGetAllWma() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ File testFile = copyAudioToTmp("test1.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateDefault();
tag.setField(FieldKey.TRACK, "1");
diff --git a/src/test/java/org/jaudiotagger/issues/Issue424Test.java b/src/test/java/org/jaudiotagger/issues/Issue424Test.java
index c7c07f5..b17abc5 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue424Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue424Test.java
@@ -15,7 +15,7 @@ public class Issue424Test extends AbstractTestCase {
@Test
public void testDeleteTrackTotalShouldNotEffectTrackNoMp4() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test2.m4a");
+ File testFile = copyAudioToTmp("test2.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
tag.deleteField(FieldKey.TRACK);
@@ -40,7 +40,7 @@ public void testDeleteTrackTotalShouldNotEffectTrackNoMp4() throws Exception {
@Test
public void testDeleteTrackTotalShouldNotEffectTrackNoMp3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateDefault();
tag.deleteField(FieldKey.TRACK);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue426Test.java b/src/test/java/org/jaudiotagger/issues/Issue426Test.java
index c22a45c..edd192a 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue426Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue426Test.java
@@ -15,7 +15,7 @@ public class Issue426Test extends AbstractTestCase {
@Test
public void testHasField() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.ARTIST, "fred");
diff --git a/src/test/java/org/jaudiotagger/issues/Issue428Test.java b/src/test/java/org/jaudiotagger/issues/Issue428Test.java
index ee78e34..2217b14 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue428Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue428Test.java
@@ -8,6 +8,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.flac.FlacAudioHeader;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue428Test extends AbstractTestCase {
@@ -15,9 +16,9 @@ public class Issue428Test extends AbstractTestCase {
public void testGetMD5ForFlac() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile af = AudioFileIO.read(testFile);
- assertTrue(af.getAudioHeader() instanceof FlacAudioHeader);
+ assertInstanceOf(FlacAudioHeader.class, af.getAudioHeader());
assertEquals(
32,
((FlacAudioHeader) af.getAudioHeader()).getMd5().length()
@@ -33,18 +34,14 @@ public void testGetMD5ForFlac() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testGetMD5ForFlac2() {
- File orig = new File("testdata", "test102.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test102.flac");
+ File testFile = copyAudioToTmp("test102.flac");
AudioFile af = AudioFileIO.read(testFile);
- assertTrue(af.getAudioHeader() instanceof FlacAudioHeader);
+ assertInstanceOf(FlacAudioHeader.class, af.getAudioHeader());
assertEquals(
32,
((FlacAudioHeader) af.getAudioHeader()).getMd5().length()
diff --git a/src/test/java/org/jaudiotagger/issues/Issue429Test.java b/src/test/java/org/jaudiotagger/issues/Issue429Test.java
index 215ee52..31ea68f 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue429Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue429Test.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFile;
@@ -16,23 +13,25 @@
import org.jaudiotagger.tag.reference.ID3V2Version;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class Issue429Test extends AbstractTestCase {
@Test
public void testDefaultCreationv23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.ARTIST, "fred");
f.commit();
f = AudioFileIO.read(testFile);
tag = f.getTag();
- assertTrue(tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
}
@Test
public void testDefaultCreationv24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V24);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
@@ -40,12 +39,12 @@ public void testDefaultCreationv24() throws Exception {
f.commit();
f = AudioFileIO.read(testFile);
tag = f.getTag();
- assertTrue(tag instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, tag);
}
@Test
public void testDefaultCreationv22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V22);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
@@ -53,40 +52,40 @@ public void testDefaultCreationv22() throws Exception {
f.commit();
f = AudioFileIO.read(testFile);
tag = f.getTag();
- assertTrue(tag instanceof ID3v22Tag);
+ assertInstanceOf(ID3v22Tag.class, tag);
}
@Test
public void testDefaultConvertv23tov24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
Tag tag = f.getTagOrCreateAndSetDefault();
- assertTrue(tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
tag.setField(FieldKey.ARTIST, "fred");
f.commit();
- assertTrue(tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V24);
f = AudioFileIO.read(testFile);
tag = f.getTagAndConvertOrCreateAndSetDefault();
- assertTrue(tag instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, tag);
assertEquals(tag.getFirst(FieldKey.ARTIST), "fred");
}
@Test
public void testDefaultConvertv24tov23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V24);
Tag tag = f.getTagOrCreateAndSetDefault();
- assertTrue(tag instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, tag);
tag.setField(FieldKey.ARTIST, "fred");
f.commit();
- assertTrue(tag instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, tag);
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
f = AudioFileIO.read(testFile);
tag = f.getTagAndConvertOrCreateAndSetDefault();
- assertTrue(tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
assertEquals(tag.getFirst(FieldKey.ARTIST), "fred");
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue431Test.java b/src/test/java/org/jaudiotagger/issues/Issue431Test.java
index 5a0a1be..3bb862c 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue431Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue431Test.java
@@ -24,7 +24,7 @@ public class Issue431Test extends AbstractTestCase {
@Test
public void testSetTrackNo() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -59,7 +59,7 @@ public void testSetTrackNoWithPaddingAndLengthOne() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_ONE_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -89,7 +89,7 @@ public void testSetTrackNoWithNoPaddingThenSetPaddingAndLengthOne()
throws Exception {
TagOptionSingleton.getInstance().setPadNumbers(false);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -141,7 +141,7 @@ public void testSetTrackNoWithPaddingAndLengthTwo() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_TWO_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -157,7 +157,7 @@ public void testSetTrackNoWithPaddingAndLengthThree() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_THREE_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -174,7 +174,7 @@ public void testSetTrackNoWithPaddingAndLengthThreeLargerNumber()
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_THREE_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "112");
@@ -190,7 +190,7 @@ public void testSetTrackNoWithNoPaddingAndLengthTwo() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_TWO_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -206,7 +206,7 @@ public void testSetTrackNoAndTotalWithPaddingLengthOne() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_ONE_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -224,7 +224,7 @@ public void testSetTrackNoAndTotalWithPaddingLengthTwo() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_TWO_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -238,7 +238,7 @@ public void testSetTrackNoAndTotalWithPaddingLengthTwo() throws Exception {
@Test
public void testSetTrackNoFlac() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "1");
@@ -250,7 +250,7 @@ public void testSetTrackNoFlac() throws Exception {
@Test
public void testSetTrackNoFlacWithPadding() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
TagOptionSingleton.getInstance().setPadNumbers(true);
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_ONE_ZERO
@@ -268,7 +268,7 @@ public void testSetTrackNoFlacWithPadding() throws Exception {
@Test
public void testSetPrePaddedTrackNo() throws Exception {
TagOptionSingleton.getInstance().setPadNumbers(false);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.TRACK, "01");
@@ -296,7 +296,7 @@ public void testSetPrePaddedTrackNo() throws Exception {
@Test
public void testSetDiscNo() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -331,7 +331,7 @@ public void testSetDiscNoWithPaddingAndLengthOne() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_ONE_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -361,7 +361,7 @@ public void testSetDiscNoWithNoPaddingThenSetPaddingAndLengthOne()
throws Exception {
TagOptionSingleton.getInstance().setPadNumbers(false);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -413,7 +413,7 @@ public void testSetDiscNoWithPaddingAndLengthTwo() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_TWO_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -429,7 +429,7 @@ public void testSetDiscNoWithPaddingAndLengthThree() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_THREE_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -446,7 +446,7 @@ public void testSetDiscNoWithPaddingAndLengthThreeLargerNumber()
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_THREE_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "112");
@@ -462,7 +462,7 @@ public void testSetDiscNoWithNoPaddingAndLengthTwo() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_TWO_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -478,7 +478,7 @@ public void testSetDiscNoAndTotalWithPaddingLengthOne() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_ONE_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -496,7 +496,7 @@ public void testSetDiscNoAndTotalWithPaddingLengthTwo() throws Exception {
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_TWO_ZERO
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -510,7 +510,7 @@ public void testSetDiscNoAndTotalWithPaddingLengthTwo() throws Exception {
@Test
public void testSetDiscNoFlac() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "1");
@@ -522,7 +522,7 @@ public void testSetDiscNoFlac() throws Exception {
@Test
public void testSetDiscNoFlacWithPadding() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
TagOptionSingleton.getInstance().setPadNumbers(true);
TagOptionSingleton.getInstance().setPadNumberTotalLength(
PadNumberOption.PAD_ONE_ZERO
@@ -540,7 +540,7 @@ public void testSetDiscNoFlacWithPadding() throws Exception {
@Test
public void testSetPrePaddedDiscNo() throws Exception {
TagOptionSingleton.getInstance().setPadNumbers(false);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "01");
@@ -569,7 +569,7 @@ public void testSetPrePaddedDiscNo() throws Exception {
@Test
public void testSetPrePaddedDiscAndDiscTotal() throws Exception {
TagOptionSingleton.getInstance().setPadNumbers(false);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_NO, "01");
@@ -602,7 +602,7 @@ public void testSetPrePaddedDiscAndDiscTotal() throws Exception {
@Test
public void testSetPrePaddedDiscTotal() throws Exception {
TagOptionSingleton.getInstance().setPadNumbers(false);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTagOrCreateAndSetDefault();
tag.setField(FieldKey.DISC_TOTAL, "08");
diff --git a/src/test/java/org/jaudiotagger/issues/Issue432Test.java b/src/test/java/org/jaudiotagger/issues/Issue432Test.java
index c5148c3..74d8ad9 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue432Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue432Test.java
@@ -14,7 +14,7 @@ public class Issue432Test extends AbstractTestCase {
public void testGetBitsPerSampleFlac() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile af = AudioFileIO.read(testFile);
assertTrue(af.getAudioHeader().isLossless());
} catch (Exception ex) {
@@ -27,7 +27,7 @@ public void testGetBitsPerSampleFlac() {
public void testGetBitsPerSampleMp4() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ File testFile = copyAudioToTmp("test.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertFalse(af.getAudioHeader().isLossless());
} catch (Exception ex) {
@@ -40,7 +40,7 @@ public void testGetBitsPerSampleMp4() {
public void testGetBitsPerSampleOgg() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ File testFile = copyAudioToTmp("test.ogg");
AudioFile af = AudioFileIO.read(testFile);
assertFalse(af.getAudioHeader().isLossless());
} catch (Exception ex) {
@@ -53,7 +53,7 @@ public void testGetBitsPerSampleOgg() {
public void testGetBitsPerSampleWma() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ File testFile = copyAudioToTmp("test1.wma");
AudioFile af = AudioFileIO.read(testFile);
assertFalse(af.getAudioHeader().isLossless());
} catch (Exception ex) {
@@ -66,9 +66,9 @@ public void testGetBitsPerSampleWma() {
public void testGetBitsPerSampleMp3() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testGetBitsPerSampleMp3-2.mp3")
+ "testGetBitsPerSampleMp3-2.mp3"
);
AudioFile af = AudioFileIO.read(testFile);
assertFalse(af.getAudioHeader().isLossless());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue433Test.java b/src/test/java/org/jaudiotagger/issues/Issue433Test.java
index 874fd50..1138952 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue433Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue433Test.java
@@ -10,22 +10,19 @@
import org.jcodec.containers.mp4.MP4Util;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue433Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteMp4LargeIncreaseExistingUdtaWithDatButNotMetaAddDataLarge()
throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test112.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test112.m4a",
- new File("test112.m4a")
+ "test112.m4a"
);
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
@@ -49,18 +46,14 @@ public void testWriteMp4LargeIncreaseExistingUdtaWithDatButNotMetaAddDataLarge()
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteMp4LargeIncreaseExistingUdtaWithDatButNotMetaAddDataSmall()
throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test112.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test112.m4a",
- new File("test112WriteSmall.m4a")
+ "test112WriteSmall.m4a"
);
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
@@ -81,18 +74,14 @@ public void testWriteMp4LargeIncreaseExistingUdtaWithDatButNotMetaAddDataSmall()
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteMp4LargeIncreaseExistingUdtaWithMetaDataAndUnknownAddDataLarge()
throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test141.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test141.m4a",
- new File("test141Large.m4a")
+ "test141Large.m4a"
);
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
@@ -116,18 +105,14 @@ public void testWriteMp4LargeIncreaseExistingUdtaWithMetaDataAndUnknownAddDataLa
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteMp4LargeIncreaseExistingUdtaWithMetaDataAndUnknownAddDataSmall()
throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test141.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test141.m4a",
- new File("test141Small.m4a")
+ "test141Small.m4a"
);
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue435Test.java b/src/test/java/org/jaudiotagger/issues/Issue435Test.java
index 8053b43..fa1b2a8 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue435Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue435Test.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.issues;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFile;
@@ -13,6 +10,8 @@
import org.jaudiotagger.tag.reference.ID3V2Version;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
public class Issue435Test extends AbstractTestCase {
@Test
@@ -23,7 +22,7 @@ public void testConvertV23TRDAToV24TRDC() {
FrameBodyTRDA fb = new FrameBodyTRDA((byte) 0, "2008");
frame.setBody(fb);
- File testFile = AbstractTestCase.copyAudioToTmp("testV25.mp3");
+ File testFile = copyAudioToTmp("testV25.mp3");
AudioFile af = AudioFileIO.read(testFile);
TagOptionSingleton.getInstance().setToDefault();
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
@@ -36,10 +35,8 @@ public void testConvertV23TRDAToV24TRDC() {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V24);
af.getTagAndConvertOrCreateAndSetDefault();
af.commit();
- assertTrue(af.getTag() instanceof ID3v24Tag);
- assertTrue(
- ((ID3v24Tag) af.getTag()).getFrame("TDRC") instanceof AbstractID3v2Frame
- );
+ assertInstanceOf(ID3v24Tag.class, af.getTag());
+ assertInstanceOf(AbstractID3v2Frame.class, ((ID3v24Tag) af.getTag()).getFrame("TDRC"));
TagOptionSingleton.getInstance().setToDefault();
} catch (Exception ex) {
diff --git a/src/test/java/org/jaudiotagger/issues/Issue437Test.java b/src/test/java/org/jaudiotagger/issues/Issue437Test.java
index 522c2f5..2aa52c4 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue437Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue437Test.java
@@ -15,7 +15,7 @@ public class Issue437Test extends AbstractTestCase {
public void testGetBitsPerSampleFlac() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(16, af.getAudioHeader().getBitsPerSample());
} catch (Exception ex) {
@@ -28,7 +28,7 @@ public void testGetBitsPerSampleFlac() {
public void testGetBitsPerSampleMp4() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ File testFile = copyAudioToTmp("test.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(16, af.getAudioHeader().getBitsPerSample());
} catch (Exception ex) {
@@ -41,7 +41,7 @@ public void testGetBitsPerSampleMp4() {
public void testGetBitsPerSampleOgg() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.ogg");
+ File testFile = copyAudioToTmp("test.ogg");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(16, af.getAudioHeader().getBitsPerSample());
} catch (Exception ex) {
@@ -54,7 +54,7 @@ public void testGetBitsPerSampleOgg() {
public void testGetBitsPerSampleWma() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ File testFile = copyAudioToTmp("test1.wma");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(16, af.getAudioHeader().getBitsPerSample());
} catch (Exception ex) {
@@ -67,9 +67,9 @@ public void testGetBitsPerSampleWma() {
public void testGetBitsPerSampleMp3() {
Throwable e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testGetBitsPerSampleMp3.mp3")
+ "testGetBitsPerSampleMp3.mp3"
);
AudioFile af = AudioFileIO.read(testFile);
assertEquals(16, af.getAudioHeader().getBitsPerSample());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue443Test.java b/src/test/java/org/jaudiotagger/issues/Issue443Test.java
index 8fa4710..553a11b 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue443Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue443Test.java
@@ -15,7 +15,7 @@ public class Issue443Test extends AbstractTestCase {
@Test
public void testID3v2DefaultCreateOrConvertWhenOnlyHasID3v1() {
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
MP3File test = new MP3File(testFile);
assertNull(test.getID3v1Tag());
assertNull(test.getID3v2Tag());
@@ -37,7 +37,7 @@ public void testID3v2DefaultCreateOrConvertWhenOnlyHasID3v1() {
@Test
public void testID3v2DefaultCreatedWhenOnlyHasID3v1() {
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
MP3File test = new MP3File(testFile);
assertNull(test.getID3v1Tag());
assertNull(test.getID3v2Tag());
@@ -59,7 +59,7 @@ public void testID3v2DefaultCreatedWhenOnlyHasID3v1() {
@Test
public void testID3v2CreatedWhenOnlyHasID3v1() {
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
MP3File test = new MP3File(testFile);
assertNull(test.getID3v1Tag());
assertNull(test.getID3v2Tag());
@@ -71,7 +71,7 @@ public void testID3v2CreatedWhenOnlyHasID3v1() {
test = new MP3File(testFile);
Tag tag = test.getTagOrCreateDefault();
- assertTrue(tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, tag);
} catch (Exception ex) {
ex.printStackTrace();
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue444Test.java b/src/test/java/org/jaudiotagger/issues/Issue444Test.java
index e03fa1f..a52f877 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue444Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue444Test.java
@@ -15,6 +15,7 @@
import org.jaudiotagger.tag.id3.TyerTdatAggregatedFrame;
import org.jaudiotagger.tag.reference.ID3V2Version;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue444Test extends AbstractTestCase {
@@ -22,7 +23,7 @@ public class Issue444Test extends AbstractTestCase {
public void testFullDateWrittenToID3v24() {
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V24);
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.getTag().setField(FieldKey.YEAR, "2004-10-12");
@@ -40,7 +41,7 @@ public void testFullDateWrittenToID3v24() {
public void testFullDateWrittenToID3v23NeedsToBeSplitIntoFrames() {
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.getTag().setField(FieldKey.YEAR, "2004-10-12");
@@ -52,8 +53,8 @@ public void testFullDateWrittenToID3v23NeedsToBeSplitIntoFrames() {
TyerTdatAggregatedFrame aggframe =
(TyerTdatAggregatedFrame) (((ID3v23Tag) af.getTag()).getFrame(
- "TYERTDAT"
- ));
+ "TYERTDAT"
+ ));
Iterator i = aggframe.getFrames().iterator();
assertEquals("2004", i.next().getContent());
assertEquals("1210", i.next().getContent());
@@ -66,8 +67,8 @@ public void testFullDateWrittenToID3v23NeedsToBeSplitIntoFrames() {
assertNull(((ID3v23Tag) af.getTag()).getFrame("TDAT"));
assertNotNull(((ID3v23Tag) af.getTag()).getFrame("TYERTDAT"));
aggframe = (TyerTdatAggregatedFrame) (((ID3v23Tag) af.getTag()).getFrame(
- "TYERTDAT"
- ));
+ "TYERTDAT"
+ ));
i = aggframe.getFrames().iterator();
assertEquals("2004", i.next().getContent());
assertEquals("1210", i.next().getContent());
@@ -80,7 +81,7 @@ public void testFullDateWrittenToID3v23NeedsToBeSplitIntoFrames() {
public void testYearAndMonthWrittenToID3v23NeedsToBeSplitIntoFrames() {
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.getTag().setField(FieldKey.YEAR, "2004-10");
@@ -92,8 +93,8 @@ public void testYearAndMonthWrittenToID3v23NeedsToBeSplitIntoFrames() {
TyerTdatAggregatedFrame aggframe =
(TyerTdatAggregatedFrame) (((ID3v23Tag) af.getTag()).getFrame(
- "TYERTDAT"
- ));
+ "TYERTDAT"
+ ));
Iterator i = aggframe.getFrames().iterator();
assertEquals("2004", i.next().getContent());
assertEquals("0110", i.next().getContent());
@@ -106,8 +107,8 @@ public void testYearAndMonthWrittenToID3v23NeedsToBeSplitIntoFrames() {
assertNull(((ID3v23Tag) af.getTag()).getFrame("TDAT"));
assertNotNull(((ID3v23Tag) af.getTag()).getFrame("TYERTDAT"));
aggframe = (TyerTdatAggregatedFrame) (((ID3v23Tag) af.getTag()).getFrame(
- "TYERTDAT"
- ));
+ "TYERTDAT"
+ ));
i = aggframe.getFrames().iterator();
assertEquals("2004", i.next().getContent());
assertEquals("0110", i.next().getContent());
@@ -120,7 +121,7 @@ public void testYearAndMonthWrittenToID3v23NeedsToBeSplitIntoFrames() {
public void testYearWrittenToID3v23NeedsToBePutInTyerFrame() {
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.getTag().setField(FieldKey.YEAR, "2004");
@@ -147,7 +148,7 @@ public void testInvalidYearNotWrittenToID3v23() {
Exception e = null;
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
- File testFile = AbstractTestCase.copyAudioToTmp("testV1vbrNew0.mp3");
+ File testFile = copyAudioToTmp("testV1vbrNew0.mp3");
AudioFile af = AudioFileIO.read(testFile);
af.getTagOrCreateAndSetDefault();
af.getTag().setField(FieldKey.YEAR, "20");
@@ -160,16 +161,12 @@ public void testInvalidYearNotWrittenToID3v23() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testDuplicates() {
- File orig = new File("testdata", "test106.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test106.mp3");
+ File testFile = copyAudioToTmp("test106.mp3");
AudioFile af = AudioFileIO.read(testFile);
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/src/test/java/org/jaudiotagger/issues/Issue446Test.java b/src/test/java/org/jaudiotagger/issues/Issue446Test.java
index ad5960b..53e8afb 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue446Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue446Test.java
@@ -13,22 +13,19 @@
import org.jaudiotagger.tag.id3.ID3v24Tag;
import org.jaudiotagger.tag.id3.framebody.FrameBodyTXXX;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue446Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadReplayGain() throws Exception {
boolean isMatchedPeak = false;
boolean isMatchedGain = false;
Exception ex = null;
- File orig = new File("testdata", "test110.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test110.mp3");
+ File testFile = copyAudioToTmp("test110.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Tag v24Tag = mp3File.getID3v2TagAsv24();
@@ -50,14 +47,10 @@ public void testReadReplayGain() throws Exception {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteReplayGain() throws Exception {
- File orig = new File("testdata", "test110.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test110.mp3");
+ File testFile = copyAudioToTmp("test110.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Tag v2Tag = (ID3v23Tag) mp3File.getID3v2Tag();
diff --git a/src/test/java/org/jaudiotagger/issues/Issue450Test.java b/src/test/java/org/jaudiotagger/issues/Issue450Test.java
index 96470c1..f687550 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue450Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue450Test.java
@@ -12,17 +12,14 @@
import org.jaudiotagger.tag.id3.ID3v24Frames;
import org.jaudiotagger.tag.id3.framebody.FrameBodyWOAR;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue450Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testSaveUrl() throws Exception {
- File orig = new File("testdata", "test108.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test108.mp3");
+ File testFile = copyAudioToTmp("test108.mp3");
MP3File mp3file = (MP3File) AudioFileIO.read(testFile);
AbstractID3v2Frame frame = (AbstractID3v2Frame) mp3file
.getID3v2TagAsv24()
diff --git a/src/test/java/org/jaudiotagger/issues/Issue451Test.java b/src/test/java/org/jaudiotagger/issues/Issue451Test.java
index 27ec3fd..9fcc9a6 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue451Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue451Test.java
@@ -10,26 +10,22 @@
import org.jcodec.containers.mp4.MP4Util;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue451Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testCovrAtom() throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test109.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test109.m4a");
+ File testFile = copyAudioToTmp("test109.m4a");
try {
//Now just createField tree
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
System.out.println(json);
} catch (Exception e) {
- e.printStackTrace();
}
try {
diff --git a/src/test/java/org/jaudiotagger/issues/Issue452Test.java b/src/test/java/org/jaudiotagger/issues/Issue452Test.java
index b3b3a1f..6b06562 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue452Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue452Test.java
@@ -7,22 +7,19 @@
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue452Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testFindAudioHeaderWhenTagSizeIsTooShortAndHasNullPadding()
throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test110.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test110.mp3",
- new File("testFindAudioHeaderWhenTagSizeIsTooShortAndHasNullPadding.mp3")
+ "testFindAudioHeaderWhenTagSizeIsTooShortAndHasNullPadding.mp3"
);
MP3File mp3File = new MP3File(testFile);
System.out.println("AudioHeaderBefore" + mp3File.getMP3AudioHeader());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue453Test.java b/src/test/java/org/jaudiotagger/issues/Issue453Test.java
index faf37ab..2b15372 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue453Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue453Test.java
@@ -7,19 +7,16 @@
import org.jaudiotagger.audio.mp3.MP3AudioHeader;
import org.jaudiotagger.audio.mp3.MP3File;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue453Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testMpeg3layer3_32bit() throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test113.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test113.mp3");
+ File testFile = copyAudioToTmp("test113.mp3");
MP3File mp3File = new MP3File(testFile);
MP3AudioHeader audio = mp3File.getMP3AudioHeader();
assertEquals("32", audio.getBitRate());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue454Test.java b/src/test/java/org/jaudiotagger/issues/Issue454Test.java
index a93f906..390837f 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue454Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue454Test.java
@@ -7,19 +7,16 @@
import org.jaudiotagger.audio.mp3.MP3AudioHeader;
import org.jaudiotagger.audio.mp3.MP3File;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue454Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testMpeg3layer2_64bit() throws Exception {
Exception ex = null;
- File orig = new File("testdata", "test114.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test114.mp3");
+ File testFile = copyAudioToTmp("test114.mp3");
MP3File mp3File = new MP3File(testFile);
MP3AudioHeader audio = mp3File.getMP3AudioHeader();
assertEquals("64", audio.getBitRate());
diff --git a/src/test/java/org/jaudiotagger/issues/Issue455Test.java b/src/test/java/org/jaudiotagger/issues/Issue455Test.java
index 678821a..30035de 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue455Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue455Test.java
@@ -10,19 +10,16 @@
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.TagField;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue455Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testMp4IsCompilationTrue() throws Exception {
- File orig = new File("testdata", "test1.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
AudioFile mp4File = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test1.m4a");
+ File testFile = copyAudioToTmp("test1.m4a");
Exception e = null;
try {
@@ -42,15 +39,11 @@ public void testMp4IsCompilationTrue() throws Exception {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testMp4IsCompilationTrue2() throws Exception {
- File orig = new File("testdata", "test1.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
AudioFile mp4File = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test1.m4a");
+ File testFile = copyAudioToTmp("test1.m4a");
Exception e = null;
try {
@@ -71,15 +64,11 @@ public void testMp4IsCompilationTrue2() throws Exception {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testMp4IsCompilationFalse() throws Exception {
- File orig = new File("testdata", "test1.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
AudioFile mp4File = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test1.m4a");
+ File testFile = copyAudioToTmp("test1.m4a");
Exception e = null;
try {
mp4File = AudioFileIO.read(testFile);
@@ -98,15 +87,11 @@ public void testMp4IsCompilationFalse() throws Exception {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testMp4IsCompilationFalse2() throws Exception {
- File orig = new File("testdata", "test1.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
AudioFile mp4File = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test1.m4a");
+ File testFile = copyAudioToTmp("test1.m4a");
Exception e = null;
try {
mp4File = AudioFileIO.read(testFile);
@@ -128,9 +113,9 @@ public void testMp4IsCompilationFalse2() throws Exception {
@Test
public void testMp3IsCompilationTrue() throws Exception {
AudioFile mp3File = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testMp3IsCompilationTrue.mp3")
+ "testMp3IsCompilationTrue.mp3"
);
Exception e = null;
@@ -161,9 +146,9 @@ public void testMp3IsCompilationTrue() throws Exception {
@Test
public void testMp3IsCompilationTrue2() throws Exception {
AudioFile mp3File = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testMp3IsCompilationTrue2.mp3")
+ "testMp3IsCompilationTrue2.mp3"
);
Exception e = null;
@@ -191,9 +176,9 @@ public void testMp3IsCompilationTrue2() throws Exception {
@Test
public void testMp3IsCompilationFalse() throws Exception {
AudioFile mp3File = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testMp3IsCompilationFalse.mp3")
+ "testMp3IsCompilationFalse.mp3"
);
Exception e = null;
try {
diff --git a/src/test/java/org/jaudiotagger/issues/Issue461Test.java b/src/test/java/org/jaudiotagger/issues/Issue461Test.java
index 13eab67..325bd7b 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue461Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue461Test.java
@@ -19,9 +19,9 @@ public class Issue461Test extends AbstractTestCase {
@Test
public void testV23DateConversionFromGeneric() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testV23DateConversionFromGeneric.mp3")
+ "testV23DateConversionFromGeneric.mp3"
);
MP3File mp3File = new MP3File(testFile);
ID3v23Tag v2Tag = new ID3v23Tag();
@@ -29,8 +29,8 @@ public void testV23DateConversionFromGeneric() throws Exception {
assertEquals("2004-01-30", v2Tag.getFirst(ID3v23FieldKey.YEAR));
TyerTdatAggregatedFrame frame = ((TyerTdatAggregatedFrame) v2Tag.getFrame(
- "TYERTDAT"
- ));
+ "TYERTDAT"
+ ));
assertNotNull(frame);
Set frames = frame.getFrames();
Iterator i = frames.iterator();
@@ -60,9 +60,9 @@ public void testV23DateConversionFromGeneric() throws Exception {
@Test
public void testV23DateConversionFromV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testV23DateConversionFromV24.mp3")
+ "testV23DateConversionFromV24.mp3"
);
MP3File mp3File = new MP3File(testFile);
ID3v24Tag v24Tag = new ID3v24Tag();
@@ -77,8 +77,8 @@ public void testV23DateConversionFromV24() throws Exception {
assertEquals("2004-01-30", v2Tag.getFirst(ID3v23FieldKey.YEAR));
TyerTdatAggregatedFrame frame = ((TyerTdatAggregatedFrame) v2Tag.getFrame(
- "TYERTDAT"
- ));
+ "TYERTDAT"
+ ));
assertNotNull(frame);
Set frames = frame.getFrames();
Iterator i = frames.iterator();
@@ -108,9 +108,9 @@ public void testV23DateConversionFromV24() throws Exception {
@Test
public void testV23DateConversionFromV24YearOnly() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testV23DateConversionFromV24YearOnly.mp3")
+ "testV23DateConversionFromV24YearOnly.mp3"
);
MP3File mp3File = new MP3File(testFile);
ID3v24Tag v24Tag = new ID3v24Tag();
@@ -136,9 +136,9 @@ public void testV23DateConversionFromV24YearOnly() throws Exception {
@Test
public void testV23DateConversionFromV24YearOnly2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testV23DateConversionFromV24YearOnly2.mp3")
+ "testV23DateConversionFromV24YearOnly2.mp3"
);
MP3File mp3File = new MP3File(testFile);
ID3v24Tag v24Tag = new ID3v24Tag();
@@ -162,9 +162,9 @@ public void testV23DateConversionFromV24YearOnly2() throws Exception {
@Test
public void testV23DayMonthYearConversionFromV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testV23DayMonthYearConversionFromV24.mp3")
+ "testV23DayMonthYearConversionFromV24.mp3"
);
MP3File mp3File = new MP3File(testFile);
ID3v24Tag v24Tag = new ID3v24Tag();
@@ -188,8 +188,8 @@ public void testV23DayMonthYearConversionFromV24() throws Exception {
assertEquals("2004-06-30", v24Tag.getFirst(FieldKey.YEAR));
TyerTdatAggregatedFrame frame = ((TyerTdatAggregatedFrame) v2Tag.getFrame(
- "TYERTDAT"
- ));
+ "TYERTDAT"
+ ));
assertNotNull(frame);
i = frame.getFrames().iterator();
FrameBodyTYER fbTyer = ((FrameBodyTYER) i.next().getBody());
@@ -201,9 +201,9 @@ public void testV23DayMonthYearConversionFromV24() throws Exception {
@Test
public void testV23MonthYearConversionFromV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testV23MonthYearConversionFromV24.mp3")
+ "testV23MonthYearConversionFromV24.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -225,8 +225,8 @@ public void testV23MonthYearConversionFromV24() throws Exception {
assertEquals("2004-06-01", v2Tag.getFirst(ID3v23FieldKey.YEAR));
TyerTdatAggregatedFrame frame = ((TyerTdatAggregatedFrame) v2Tag.getFrame(
- "TYERTDAT"
- ));
+ "TYERTDAT"
+ ));
assertNotNull(frame);
Set frames = frame.getFrames();
Iterator i = frames.iterator();
diff --git a/src/test/java/org/jaudiotagger/issues/Issue463Test.java b/src/test/java/org/jaudiotagger/issues/Issue463Test.java
index 004338a..8a830a9 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue463Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue463Test.java
@@ -11,20 +11,16 @@
import org.jcodec.containers.mp4.MP4Util;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue463Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadMp4() {
Exception ex = null;
try {
- File orig = new File("testdata", "test116.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test116.m4a");
+ File testFile = copyAudioToTmp("test116.m4a");
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
@@ -49,7 +45,6 @@ public void testReadMp4() {
assertNotNull(af.getTag());
assertEquals("fred", af.getTag().getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue466Test.java b/src/test/java/org/jaudiotagger/issues/Issue466Test.java
index c681a20..56af40b 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue466Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue466Test.java
@@ -9,20 +9,16 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue466Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFlac() {
Exception ex = null;
try {
- File orig = new File("testdata", "test115.flac");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test115.flac");
+ File testFile = copyAudioToTmp("test115.flac");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
assertEquals("", af.getTag().getFirst(FieldKey.ALBUM_ARTIST));
diff --git a/src/test/java/org/jaudiotagger/issues/Issue468Test.java b/src/test/java/org/jaudiotagger/issues/Issue468Test.java
index def54ed..aaacb11 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue468Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue468Test.java
@@ -6,6 +6,7 @@
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
+import org.jaudiotagger.tag.FieldDataInvalidException;
import org.jaudiotagger.tag.flac.FlacTag;
import org.junit.jupiter.api.Test;
@@ -15,18 +16,17 @@ public class Issue468Test extends AbstractTestCase {
public void testReadFlac() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.flac");
+ File testFile = copyAudioToTmp("test.flac");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
FlacTag tag = (FlacTag) af.getTag();
tag.setField(tag.createArtworkField(null, 1, "", "", 100, 200, 128, 1));
af.commit();
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNotNull(ex);
- assertTrue(ex instanceof org.jaudiotagger.tag.FieldDataInvalidException);
+ assertInstanceOf(FieldDataInvalidException.class, ex);
assertEquals("ImageData cannot be null", ex.getMessage());
}
}
diff --git a/src/test/java/org/jaudiotagger/issues/Issue478Test.java b/src/test/java/org/jaudiotagger/issues/Issue478Test.java
index 18f5ef6..e1f5b04 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue478Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue478Test.java
@@ -10,20 +10,17 @@
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.jaudiotagger.tag.id3.ID3v24Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue478Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testKeepPodcastTags() {
- File orig = new File("testdata", "test115.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test115.mp3");
+ File testFile = copyAudioToTmp("test115.mp3");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
MP3File mp3File = (MP3File) af;
@@ -69,7 +66,6 @@ public void testKeepPodcastTags() {
assertNotNull(tag.getFrame("PCST"));
assertNotNull(tag.getFrame("TGID"));
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue481Test.java b/src/test/java/org/jaudiotagger/issues/Issue481Test.java
index 77dd5ee..b1a22ce 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue481Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue481Test.java
@@ -8,26 +8,22 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue481Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadYear() {
- File orig = new File("testdata", "test139.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test139.mp3");
+ File testFile = copyAudioToTmp("test139.mp3");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
System.out.println(af.getTag());
assertEquals("2005", (af.getTag().getFirst(FieldKey.YEAR)));
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue483Test.java b/src/test/java/org/jaudiotagger/issues/Issue483Test.java
index 9ebef2e..6b315a9 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue483Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue483Test.java
@@ -8,17 +8,14 @@
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue483Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testCompareMp3Tag() throws Exception {
- File orig = new File("testdata", "test113.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
+ File orig = fileResource("testdata", "test113.mp3");
AudioFile af1 = AudioFileIO.read(orig);
AudioFile af2 = AudioFileIO.read(orig);
assertNotSame(af1, af2);
@@ -27,7 +24,7 @@ public void testCompareMp3Tag() throws Exception {
@Test
public void testCompareMp4Tag() throws Exception {
- File orig = new File("testdata", "test.m4a");
+ File orig = fileResource("testdata", "test.m4a");
AudioFile af1 = AudioFileIO.read(orig);
AudioFile af2 = AudioFileIO.read(orig);
assertNotSame(af1, af2);
@@ -36,7 +33,7 @@ public void testCompareMp4Tag() throws Exception {
@Test
public void testCompareFlacTag() throws Exception {
- File orig = new File("testdata", "test.flac");
+ File orig = fileResource("testdata", "test.flac");
AudioFile af1 = AudioFileIO.read(orig);
AudioFile af2 = AudioFileIO.read(orig);
assertNotSame(af1, af2);
@@ -45,7 +42,7 @@ public void testCompareFlacTag() throws Exception {
@Test
public void testCompareOggTag() throws Exception {
- File orig = new File("testdata", "test.ogg");
+ File orig = fileResource("testdata", "test.ogg");
AudioFile af1 = AudioFileIO.read(orig);
AudioFile af2 = AudioFileIO.read(orig);
assertNotSame(af1, af2);
@@ -54,7 +51,7 @@ public void testCompareOggTag() throws Exception {
@Test
public void testCompareAifTag() throws Exception {
- File orig = new File("testdata", "test132.aif");
+ File orig = fileResource("testdata", "test132.aif");
AudioFile af1 = AudioFileIO.read(orig);
AudioFile af2 = AudioFileIO.read(orig);
assertNotSame(af1, af2);
@@ -63,7 +60,7 @@ public void testCompareAifTag() throws Exception {
@Test
public void testCompareWavTag() throws Exception {
- File orig = new File("testdata", "test125.wav");
+ File orig = fileResource("testdata", "test125.wav");
AudioFile af1 = AudioFileIO.read(orig);
AudioFile af2 = AudioFileIO.read(orig);
assertNotSame(af1, af2);
@@ -72,7 +69,7 @@ public void testCompareWavTag() throws Exception {
@Test
public void testCompareWmaTag() throws Exception {
- File orig = new File("testdata", "test1.wma");
+ File orig = fileResource("testdata", "test1.wma");
AudioFile af1 = AudioFileIO.read(orig);
AudioFile af2 = AudioFileIO.read(orig);
assertNotSame(af1, af2);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue484Test.java b/src/test/java/org/jaudiotagger/issues/Issue484Test.java
index a89e615..1203232 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue484Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue484Test.java
@@ -8,26 +8,22 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue484Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadUTF16WithMissingBOM() {
- File orig = new File("testdata", "test140.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test140.mp3");
+ File testFile = copyAudioToTmp("test140.mp3");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
System.out.println(af.getTag());
assertEquals("1968", (af.getTag().getFirst(FieldKey.YEAR)));
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/issues/Issue66Test.java b/src/test/java/org/jaudiotagger/issues/Issue66Test.java
index 4c6a489..66d73e5 100755
--- a/src/test/java/org/jaudiotagger/issues/Issue66Test.java
+++ b/src/test/java/org/jaudiotagger/issues/Issue66Test.java
@@ -11,21 +11,17 @@
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class Issue66Test extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
- File orig = new File("testdata", "test118.m4a");
-
try {
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test118.m4a");
+ File testFile = copyAudioToTmp("test118.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertEquals(af.getTag().getFirst(FieldKey.ARTIST), "Shahmen");
@@ -35,7 +31,6 @@ public void testIssue() {
}
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/IssueTrackTotalTest.java b/src/test/java/org/jaudiotagger/issues/IssueTrackTotalTest.java
index 5d0e66c..c7f6837 100755
--- a/src/test/java/org/jaudiotagger/issues/IssueTrackTotalTest.java
+++ b/src/test/java/org/jaudiotagger/issues/IssueTrackTotalTest.java
@@ -9,22 +9,18 @@
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class IssueTrackTotalTest extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue() {
Exception caught = null;
try {
//System.out.println("TrackTotal Loading to Database:"+audioFile.getTagOrCreateDefault().getFirst(FieldKey.TRACK_TOTAL)+":");
- File orig = new File("testdata", "issue400.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("issue400.mp3");
+ File testFile = copyAudioToTmp("issue400.mp3");
AudioFile af = AudioFileIO.read(testFile);
MP3File mp3 = (MP3File) af;
assertNotNull(mp3.getID3v2Tag());
@@ -36,7 +32,6 @@ public void testIssue() {
);
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
diff --git a/src/test/java/org/jaudiotagger/issues/NetworkTest.java b/src/test/java/org/jaudiotagger/issues/NetworkTest.java
index 4ab2f2a..c62ab5a 100755
--- a/src/test/java/org/jaudiotagger/issues/NetworkTest.java
+++ b/src/test/java/org/jaudiotagger/issues/NetworkTest.java
@@ -8,6 +8,7 @@
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFileFilter;
import org.jaudiotagger.audio.AudioFileIO;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
public class NetworkTest extends AbstractTestCase {
@@ -33,18 +34,18 @@ private void loadFiles(final File dir) throws Exception {
}
@Test
+ @Disabled("Works only on dev machine")
public void testNetworkSpeed() {
Exception caught = null;
try {
System.out.println("Start:" + new Date());
File file = new File("Z:\\Music\\Replay Music Recordings");
- //File file = new File("C:\\Users\\MESH\\Music\\Replay Music Recordings");
+ //File file = "C:\\Users\\MESH\\Music\\Replay Music Recordings";
loadFiles(file);
System.out.println("Loaded:" + count.get());
System.out.println("End:" + new Date());
} catch (Exception e) {
caught = e;
- e.printStackTrace();
}
assertNull(caught);
}
@@ -53,7 +54,7 @@ public void testNetworkSpeed() {
@Test
public void testDataCopySpeed() throws Exception
{
- File file = new File("Z:\\Music\\Replay Music Recordings\\Beirut\\The Rip Tide\\Beirut-The Rip Tide-05-Payne's Bay.mp3");
+ File file = "Z:\\Music\\Replay Music Recordings\\Beirut\\The Rip Tide\\Beirut-The Rip Tide-05-Payne's Bay.mp3";
System.out.println("start:"+new Date());
FileChannel fc = new FileInputStream(file).getChannel();
@@ -66,7 +67,7 @@ public void testDataCopySpeed() throws Exception
@Test
public void testDataCopySpeed2() throws Exception
{
- File file = new File("Z:\\Music\\Replay Music Recordings\\Beirut\\The Rip Tide\\Beirut-The Rip Tide-05-Payne's Bay.mp3");
+ File file = "Z:\\Music\\Replay Music Recordings\\Beirut\\The Rip Tide\\Beirut-The Rip Tide-05-Payne's Bay.mp3";
System.out.println("start:"+new Date());
FileChannel fc = new FileInputStream(file).getChannel();
@@ -80,7 +81,7 @@ public void testDataCopySpeed2() throws Exception
/*public void testDataCopyBufferedStream() throws Exception
{
- File file = new File("Z:\\Music\\Replay Music Recordings\\Beirut\\The Rip Tide\\Beirut-The Rip Tide-05-Payne's Bay.mp3");
+ File file = "Z:\\Music\\Replay Music Recordings\\Beirut\\The Rip Tide\\Beirut-The Rip Tide-05-Payne's Bay.mp3";
Date start = new Date();
FileChannel fc = new FileInputStream(file).getChannel();
diff --git a/src/test/java/org/jaudiotagger/tag/aiff/AiffAudioTagTest.java b/src/test/java/org/jaudiotagger/tag/aiff/AiffAudioTagTest.java
index bb2e09c..f9c825f 100755
--- a/src/test/java/org/jaudiotagger/tag/aiff/AiffAudioTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/aiff/AiffAudioTagTest.java
@@ -26,32 +26,28 @@
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.jaudiotagger.tag.reference.ID3V2Version;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class AiffAudioTagTest {
+public class AiffAudioTagTest extends FilePermissionsTest {
@Test
public void testReadAiff1() {
Exception exceptionCaught = null;
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
- File orig = new File("testdata", "test119.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test119.aif",
- new File("test119ReadAiffWithoutTag.aif")
+ "test119ReadAiffWithoutTag.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
- assertTrue(tag instanceof AiffTag);
- assertTrue(((AiffTag) tag).getID3Tag() instanceof ID3v23Tag);
+ assertInstanceOf(AiffTag.class, tag);
+ assertInstanceOf(ID3v23Tag.class, ((AiffTag) tag).getID3Tag());
assertFalse(((AiffTag) tag).isExistingId3Tag());
assertEquals(0L, ((AiffTag) tag).getSizeOfID3TagIncludingChunkHeader());
assertEquals(0L, ((AiffTag) tag).getSizeOfID3TagOnly());
@@ -67,25 +63,20 @@ public void testReadAiff1() {
public void testReadAiffChangeDefault() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test119.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test119.aif",
- new File("test119ReadAiffWithoutTag.aif")
+ "test119ReadAiffWithoutTag.aif"
);
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V22);
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
- assertTrue(tag instanceof AiffTag);
- assertTrue(((AiffTag) tag).getID3Tag() instanceof ID3v22Tag);
+ assertInstanceOf(AiffTag.class, tag);
+ assertInstanceOf(ID3v22Tag.class, ((AiffTag) tag).getID3Tag());
assertFalse(((AiffTag) tag).isExistingId3Tag());
assertEquals(0L, ((AiffTag) tag).getSizeOfID3TagIncludingChunkHeader());
assertEquals(0L, ((AiffTag) tag).getSizeOfID3TagOnly());
@@ -101,24 +92,19 @@ public void testReadAiffChangeDefault() {
public void testReadAiff2() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test120.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test120.aif",
- new File("test120ReadAiffWithTag.aif")
+ "test120ReadAiffWithTag.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
assertNotNull(tag);
- assertTrue(tag instanceof AiffTag);
+ assertInstanceOf(AiffTag.class, tag);
assertTrue(((AiffTag) tag).isExistingId3Tag());
assertEquals(10, tag.getFieldCount());
assertEquals("Gary McGath", tag.getFirst(FieldKey.ARTIST));
@@ -147,20 +133,15 @@ public void testReadAiff2() {
public void testReadAiff3() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test121.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test121.aif",
- new File("test121ReadAiffWithoutItunesTag.aif")
+ "test121ReadAiffWithoutItunesTag.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(ah);
System.out.println(ah.getBitRate());
@@ -173,7 +154,7 @@ public void testReadAiff3() {
System.out.println(tag);
assertNotNull(tag);
assertTrue(((AiffTag) tag).isExistingId3Tag());
- assertTrue(tag instanceof AiffTag);
+ assertInstanceOf(AiffTag.class, tag);
assertEquals(6, tag.getFieldCount());
assertEquals("Coldplay", tag.getFirst(FieldKey.ARTIST));
assertEquals("A Rush Of Blood To The Head", tag.getFirst(FieldKey.ALBUM));
@@ -198,20 +179,15 @@ public void testReadAiff3() {
public void testReadAiff4() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test124.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test124.aif",
- new File("test124ReadAiffWithoutItunesTag.aif")
+ "test124ReadAiffWithoutItunesTag.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(ah);
System.out.println(ah.getBitRate());
@@ -224,7 +200,7 @@ public void testReadAiff4() {
System.out.println(tag);
assertNotNull(tag);
assertTrue(((AiffTag) tag).isExistingId3Tag());
- assertTrue(tag instanceof AiffTag);
+ assertInstanceOf(AiffTag.class, tag);
assertEquals(6, tag.getFieldCount());
assertEquals("Coldplay", tag.getFirst(FieldKey.ARTIST));
assertEquals("A Rush Of Blood To The Head", tag.getFirst(FieldKey.ALBUM));
@@ -249,20 +225,15 @@ public void testReadAiff4() {
public void testWriteAiff3() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test121.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test121.aif",
- new File("test121WriteAiffWithTagAddPadding.aif")
+ "test121WriteAiffWithTagAddPadding.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
assertNotNull(tag);
assertEquals(
@@ -312,20 +283,15 @@ public void testWriteAiff3() {
public void testWriteAiffWithoutTag() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test119.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test119.aif",
- new File("test119WriteAiffWithoutTag.aif")
+ "test119WriteAiffWithoutTag.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
assertNotNull(tag);
System.out.println(tag);
@@ -348,21 +314,16 @@ public void testWriteAiffWithoutTag() {
public void testDeleteAiff3() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test121.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test121.aif",
- new File("test121DeleteTag.aif")
+ "test121DeleteTag.aif"
);
try {
final int oldSize = readAIFFFormSize(testFile);
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
assertNotNull(tag);
@@ -390,20 +351,22 @@ public void testDeleteAiff3() {
assertNull(exceptionCaught);
}
+ private static int readAIFFFormSize(final File file) throws IOException {
+ try (final RandomAccessFile raf = new RandomAccessFile(file, "r")) {
+ raf.seek(IffHeaderChunk.SIGNATURE_LENGTH);
+ return raf.readInt();
+ }
+ }
+
@Test
public void testDeleteAiff4() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test124.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
// test124.aif is special in that the ID3 chunk is right at the beginning, not the end.
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test124.aif",
- new File("test124DeleteTag.aif")
+ "test124DeleteTag.aif"
);
try {
@@ -416,7 +379,7 @@ public void testDeleteAiff4() {
final int oldSize = readAIFFFormSize(testFile);
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
assertNotNull(tag);
@@ -449,20 +412,31 @@ public void testDeleteAiff4() {
assertNull(exceptionCaught);
}
+ private static List readChunkIds(final File file) throws IOException {
+ final List chunkIds = new ArrayList<>();
+ try (final RandomAccessFile raf = new RandomAccessFile(file, "r")) {
+ raf.seek(IffHeaderChunk.HEADER_LENGTH);
+ final ChunkHeader chunkHeader = new ChunkHeader(ByteOrder.BIG_ENDIAN);
+
+ while (raf.getFilePointer() != raf.length()) {
+ if (chunkHeader.readHeader(raf)) {
+ chunkIds.add(chunkHeader.getID());
+ }
+ raf.skipBytes((int) chunkHeader.getSize());
+ }
+ }
+ return chunkIds;
+ }
+
@Test
public void testWriteNotLastChunk() {
Exception exceptionCaught = null;
// test124.aif is special in that the ID3 chunk is right at the beginning, not the end.
- File orig = new File("testdata", "test124.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test124.aif",
- new File("test124WriteAiffWithChunkNotAtEnd.aif")
+ "test124WriteAiffWithChunkNotAtEnd.aif"
);
try {
final List oldChunkIds = readChunkIds(testFile);
@@ -473,7 +447,7 @@ public void testWriteNotLastChunk() {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
assertEquals(
10274L,
@@ -519,47 +493,19 @@ public void testWriteNotLastChunk() {
assertNull(exceptionCaught);
}
- private static int readAIFFFormSize(final File file) throws IOException {
- try (final RandomAccessFile raf = new RandomAccessFile(file, "r")) {
- raf.seek(IffHeaderChunk.SIGNATURE_LENGTH);
- return raf.readInt();
- }
- }
-
- private static List readChunkIds(final File file) throws IOException {
- final List chunkIds = new ArrayList<>();
- try (final RandomAccessFile raf = new RandomAccessFile(file, "r")) {
- raf.seek(IffHeaderChunk.HEADER_LENGTH);
- final ChunkHeader chunkHeader = new ChunkHeader(ByteOrder.BIG_ENDIAN);
-
- while (raf.getFilePointer() != raf.length()) {
- if (chunkHeader.readHeader(raf)) {
- chunkIds.add(chunkHeader.getID());
- }
- raf.skipBytes((int) chunkHeader.getSize());
- }
- }
- return chunkIds;
- }
-
@Test
public void testWriteMetadataAifcWhenSSNDBeforeCOMMChunk() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test135.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test136.aif",
- new File("test135SSNDBeforeCOMMChunk.aif")
+ "test135SSNDBeforeCOMMChunk.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
f.getTagOrCreateAndSetDefault().setField(FieldKey.ALBUM, "album");
@@ -567,11 +513,10 @@ public void testWriteMetadataAifcWhenSSNDBeforeCOMMChunk() {
f = AudioFileIO.read(testFile);
ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
assertEquals("album", f.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -581,20 +526,15 @@ public void testWriteMetadataAifcWhenSSNDBeforeCOMMChunk() {
public void testWriteMetadataAifcWithUnknonwExtraChunk() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test136.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test136.aif",
- new File("test136WriteMetadataWithUnknownExtraChunk.aif")
+ "test136WriteMetadataWithUnknownExtraChunk.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
System.out.println(f.getTag());
@@ -603,12 +543,11 @@ public void testWriteMetadataAifcWithUnknonwExtraChunk() {
f = AudioFileIO.read(testFile);
ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
System.out.println(f.getTag());
assertEquals("album", f.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -622,20 +561,15 @@ public void testWriteMetadataAifcWithUnknonwExtraChunk() {
public void testWriteMetadataAifcWithJunk() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test137.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test137.aif",
- new File("test137WriteMetadataWithJunkAtEnd.aif")
+ "test137WriteMetadataWithJunkAtEnd.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
f.getTagOrCreateAndSetDefault().setField(FieldKey.ALBUM, "album");
@@ -643,11 +577,10 @@ public void testWriteMetadataAifcWithJunk() {
f = AudioFileIO.read(testFile);
ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
// assertEquals("album", f.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -657,20 +590,15 @@ public void testWriteMetadataAifcWithJunk() {
public void testWriteMetadataAiffWithNameAndAuthorChunks() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test138.aiff");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test138.aiff",
- new File("test138WriteMetadataWithNameAuthorChunks.aiff")
+ "test138WriteMetadataWithNameAuthorChunks.aiff"
);
try {
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
f.getTagOrCreateAndSetDefault().setField(FieldKey.ALBUM, "album");
@@ -678,11 +606,10 @@ public void testWriteMetadataAiffWithNameAndAuthorChunks() {
f = AudioFileIO.read(testFile);
ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
assertEquals("album", f.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -694,14 +621,10 @@ public void testWriteMetadataAiffWithNameAndAuthorChunks() {
* correctly work out ID3chunk is still at end of file.
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testOddLengthID3ChunkFile() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test144.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_ONLY_AND_SYNC
@@ -709,9 +632,9 @@ public void testOddLengthID3ChunkFile() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH_AND_SYNC
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test144.aif",
- new File("test144Odd.aif")
+ "test144Odd.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
@@ -725,21 +648,16 @@ public void testOddLengthID3ChunkFile() {
System.out.println(f.getTag());
assertEquals(f.getTag().getFirst(FieldKey.ARTIST), "freddy");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testDeleteOddLengthID3ChunkFile() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test144.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_ONLY_AND_SYNC
@@ -747,9 +665,9 @@ public void testDeleteOddLengthID3ChunkFile() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_BOTH_AND_SYNC
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test144.aif",
- new File("test144OddDelete.aif")
+ "test144OddDelete.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
@@ -769,7 +687,6 @@ public void testDeleteOddLengthID3ChunkFile() {
);
assertEquals(0, ((AiffTag) f.getTag()).getSizeOfID3TagOnly());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -779,16 +696,11 @@ public void testDeleteOddLengthID3ChunkFile() {
public void testDeleteAiff4Odd() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test124.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
// test124.aif is special in that the ID3 chunk is right at the beginning, not the end.
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test124.aif",
- new File("test124DeleteOddTag.aif")
+ "test124DeleteOddTag.aif"
);
try {
@@ -801,7 +713,7 @@ public void testDeleteAiff4Odd() {
final int oldSize = readAIFFFormSize(testFile);
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
Tag tag = f.getTag();
System.out.println(tag);
assertNotNull(tag);
@@ -838,21 +750,16 @@ public void testDeleteAiff4Odd() {
public void testWriteMetadataAifcWithUnknownExtraChunkID3DatSizeOdd() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test136.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test136.aif",
- new File("test136WriteMetadataWithUnknownExtraChunkID3DatSizeOdd.aif")
+ "test136WriteMetadataWithUnknownExtraChunkID3DatSizeOdd.aif"
);
try {
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V22);
AudioFile f = AudioFileIO.read(testFile);
AudioHeader ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
System.out.println(f.getTag());
@@ -860,7 +767,7 @@ public void testWriteMetadataAifcWithUnknownExtraChunkID3DatSizeOdd() {
f.commit();
f = AudioFileIO.read(testFile);
ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
System.out.println(f.getTag());
assertEquals("albums", f.getTag().getFirst(FieldKey.ALBUM));
@@ -877,7 +784,7 @@ public void testWriteMetadataAifcWithUnknownExtraChunkID3DatSizeOdd() {
f.commit();
f = AudioFileIO.read(testFile);
ah = f.getAudioHeader();
- assertTrue(ah instanceof AiffAudioHeader);
+ assertInstanceOf(AiffAudioHeader.class, ah);
System.out.println(ah);
System.out.println(f.getTag());
assertEquals("albuks", f.getTag().getFirst(FieldKey.ALBUM));
@@ -890,7 +797,6 @@ public void testWriteMetadataAifcWithUnknownExtraChunkID3DatSizeOdd() {
((AiffTag) f.getTag()).getEndLocationInFileOfId3Chunk()
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -898,43 +804,38 @@ public void testWriteMetadataAifcWithUnknownExtraChunkID3DatSizeOdd() {
@Test
public void testWriteWriteProtectedFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckDisabled(
+ runWriteWriteProtectedFileWithCheckDisabled(
"test121.aif"
);
}
@Test
public void testWriteWriteProtectedFileWithCheckEnabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckEnabled(
+ runWriteWriteProtectedFileWithCheckEnabled(
"test121.aif"
);
}
@Test
public void testWriteReadOnlyFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteReadOnlyFileWithCheckDisabled("test121.aif");
+ runWriteReadOnlyFileWithCheckDisabled("test121.aif");
}
@Test
public void testDeleteArtworkField() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test157.aif");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test157.aif",
- new File("testDeleteArtworkField.aif")
+ "testDeleteArtworkField.aif"
);
try {
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
System.out.println(tag);
assertNotNull(tag);
- assertTrue(tag instanceof AiffTag);
+ assertInstanceOf(AiffTag.class, tag);
assertTrue(((AiffTag) tag).isExistingId3Tag());
assertEquals(2, tag.getArtworkList().size());
diff --git a/src/test/java/org/jaudiotagger/tag/dsf/DsfAudioFileTest.java b/src/test/java/org/jaudiotagger/tag/dsf/DsfAudioFileTest.java
index 72450b8..f4f6e46 100755
--- a/src/test/java/org/jaudiotagger/tag/dsf/DsfAudioFileTest.java
+++ b/src/test/java/org/jaudiotagger/tag/dsf/DsfAudioFileTest.java
@@ -3,7 +3,6 @@
import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.FilePermissionsTest;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
@@ -11,26 +10,21 @@
import org.jaudiotagger.tag.id3.ID3v24Tag;
import org.junit.jupiter.api.Test;
-public class DsfAudioFileTest {
+public class DsfAudioFileTest extends FilePermissionsTest {
@Test
public void testReadDsfMetadata() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test122.dsf");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test122.dsf",
- new File("test122readmetadata.dsf")
+ "test122readmetadata.dsf"
);
try {
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
- assertTrue(f.getTag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, f.getTag());
assertEquals("test3", f.getTag().getFirst(FieldKey.TITLE));
assertEquals("Artist", f.getTag().getFirst(FieldKey.ARTIST));
assertEquals("Album Artist", f.getTag().getFirst(FieldKey.ALBUM_ARTIST));
@@ -41,7 +35,6 @@ public void testReadDsfMetadata() {
//assertEquals("Composer ", f.getTag().getFirst(FieldKey.COMPOSER));
//assertEquals("1971", f.getTag().getFirst(FieldKey.YEAR));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -49,20 +42,20 @@ public void testReadDsfMetadata() {
@Test
public void testWriteWriteProtectedFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckDisabled(
+ runWriteWriteProtectedFileWithCheckDisabled(
"test122.dsf"
);
}
@Test
public void testWriteWriteProtectedFileWithCheckEnabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckEnabled(
+ runWriteWriteProtectedFileWithCheckEnabled(
"test122.dsf"
);
}
@Test
public void testWriteReadOnlyFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteReadOnlyFileWithCheckDisabled("test122.dsf");
+ runWriteReadOnlyFileWithCheckDisabled("test122.dsf");
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/flac/ConcurrentWritesTest.java b/src/test/java/org/jaudiotagger/tag/flac/ConcurrentWritesTest.java
index e66f0d5..db54f61 100755
--- a/src/test/java/org/jaudiotagger/tag/flac/ConcurrentWritesTest.java
+++ b/src/test/java/org/jaudiotagger/tag/flac/ConcurrentWritesTest.java
@@ -10,7 +10,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
@@ -18,7 +19,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ConcurrentWritesTest {
+public class ConcurrentWritesTest extends AbstractBaseTestCase {
private static final int THREADS = 100;
private final File[] files = new File[THREADS];
@@ -26,11 +27,9 @@ public class ConcurrentWritesTest {
@BeforeEach
public void setUp() {
for (int counter = 0; counter < THREADS; counter++) {
- files[counter] = AbstractTestCase.copyAudioToTmp(
+ files[counter] = copyAudioToTmp(
"test2.flac",
- new File(
- ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".flac"
- )
+ ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".flac"
);
}
}
@@ -55,13 +54,7 @@ public void testConcurrentWrites() throws Exception {
}
}
- private static class WriteFileCallable implements Callable {
-
- private final File file;
-
- public WriteFileCallable(File file) {
- this.file = file;
- }
+ private record WriteFileCallable(File file) implements Callable {
public Boolean call() throws Exception {
AudioFile audiofile = AudioFileIO.read(file);
diff --git a/src/test/java/org/jaudiotagger/tag/flac/FlacReadTest.java b/src/test/java/org/jaudiotagger/tag/flac/FlacReadTest.java
index 8a8be9d..3bd554f 100755
--- a/src/test/java/org/jaudiotagger/tag/flac/FlacReadTest.java
+++ b/src/test/java/org/jaudiotagger/tag/flac/FlacReadTest.java
@@ -3,15 +3,17 @@
import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.exceptions.CannotReadException;
import org.jaudiotagger.audio.flac.FlacInfoReader;
import org.jaudiotagger.audio.flac.metadatablock.MetadataBlockDataPicture;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class FlacReadTest {
+public class FlacReadTest extends AbstractBaseTestCase {
/**
* Read Flac File
@@ -20,9 +22,9 @@ public class FlacReadTest {
public void testReadTwoChannelFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test2.flac",
- new File("test2read.flac")
+ "test2read.flac"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -32,7 +34,6 @@ public void testReadTwoChannelFile() {
assertEquals("44100", f.getAudioHeader().getSampleRate());
assertEquals(5, f.getAudioHeader().getTrackLength());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -45,9 +46,9 @@ public void testReadTwoChannelFile() {
public void testReadSingleChannelFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.flac",
- new File("test3read.flac")
+ "test3read.flac"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -57,7 +58,6 @@ public void testReadSingleChannelFile() {
assertEquals(1, f.getAudioHeader().getTrackLength());
assertEquals("47", f.getAudioHeader().getBitRate()); //is this correct value
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -70,16 +70,15 @@ public void testReadSingleChannelFile() {
public void testNotFlac() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testV1noFlac.flac")
+ "testV1noFlac.flac"
);
AudioFile f = AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
/**
@@ -89,12 +88,11 @@ public void testNotFlac() {
public void testReadCueSheet() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test3.flac");
+ File testFile = copyAudioToTmp("test3.flac");
AudioFile f = AudioFileIO.read(testFile);
FlacInfoReader infoReader = new FlacInfoReader();
assertEquals(5, infoReader.countMetaBlocks(f.getFile()));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -104,25 +102,18 @@ public void testReadCueSheet() {
* test read flac file with preceding ID3 header
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFileWithId3Header() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test22.flac");
- if (!orig.isFile()) {
- System.out.println(
- "Test cannot be run because test file not available"
- );
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test22.flac",
- new File("testreadFlacWithId3.flac")
+ "testreadFlacWithId3.flac"
);
AudioFile f = AudioFileIO.read(testFile);
FlacInfoReader infoReader = new FlacInfoReader();
assertEquals(4, infoReader.countMetaBlocks(f.getFile()));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -132,25 +123,18 @@ public void testReadFileWithId3Header() {
* test read flac file with no header
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFileWithOnlyStreamInfoAndPaddingHeader() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test102.flac");
- if (!orig.isFile()) {
- System.out.println(
- "Test cannot be run because test file not available"
- );
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test102.flac",
- new File("test102.flac")
+ "test102.flac"
);
AudioFile f = AudioFileIO.read(testFile);
FlacInfoReader infoReader = new FlacInfoReader();
assertEquals(2, infoReader.countMetaBlocks(f.getFile()));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -160,27 +144,20 @@ public void testReadFileWithOnlyStreamInfoAndPaddingHeader() {
* test read flac file with no header
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadArtwork() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test154.flac");
- if (!orig.isFile()) {
- System.out.println(
- "Test cannot be run because test file not available"
- );
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test154.flac",
- new File("test154.flac")
+ "test154.flac"
);
AudioFile f = AudioFileIO.read(testFile);
MetadataBlockDataPicture mbdp = (((FlacTag) f.getTag()).getImages().get(
- 0
- ));
+ 0
+ ));
System.out.println(mbdp);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/tag/flac/FlacWriteTest.java b/src/test/java/org/jaudiotagger/tag/flac/FlacWriteTest.java
index 6f733cb..d4da9d0 100755
--- a/src/test/java/org/jaudiotagger/tag/flac/FlacWriteTest.java
+++ b/src/test/java/org/jaudiotagger/tag/flac/FlacWriteTest.java
@@ -5,7 +5,6 @@
import java.io.File;
import java.io.RandomAccessFile;
import java.util.List;
-import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.FilePermissionsTest;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
@@ -18,8 +17,9 @@
import org.jaudiotagger.tag.reference.PictureTypes;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class FlacWriteTest {
+public class FlacWriteTest extends FilePermissionsTest {
@BeforeEach
public void setUp() {
@@ -35,9 +35,9 @@ public void testWriteAllFieldsToFile() {
try {
//Put artifically low just to test it out
TagOptionSingleton.getInstance().setWriteChunkSize(40000);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test2.flac",
- new File("test2write.flac")
+ "test2write.flac"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -48,7 +48,7 @@ public void testWriteAllFieldsToFile() {
assertEquals("2", f.getAudioHeader().getChannels());
assertEquals("44100", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
FlacTag tag = (FlacTag) f.getTag();
assertEquals(
"reference libFLAC 1.1.4 20070213",
@@ -119,7 +119,7 @@ public void testWriteAllFieldsToFile() {
//Add new image
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -143,7 +143,7 @@ public void testWriteAllFieldsToFile() {
f.commit();
f = AudioFileIO.read(testFile);
assertEquals(5, infoReader.countMetaBlocks(f.getFile()));
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
assertEquals(
"reference libFLAC 1.1.4 20070213",
@@ -218,7 +218,6 @@ public void testWriteAllFieldsToFile() {
System.out.println("NewFileSize:" + f.getFile().length());
assertEquals(144202, f.getFile().length());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -230,9 +229,9 @@ public void testWriteAllFieldsToFileSmallChunkSize() {
try {
//Put artifically low just to test it out
TagOptionSingleton.getInstance().setWriteChunkSize(1000);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test2.flac",
- new File("test2write.flac")
+ "test2write.flac"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -243,7 +242,7 @@ public void testWriteAllFieldsToFileSmallChunkSize() {
assertEquals("2", f.getAudioHeader().getChannels());
assertEquals("44100", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
FlacTag tag = (FlacTag) f.getTag();
assertEquals(
"reference libFLAC 1.1.4 20070213",
@@ -314,7 +313,7 @@ public void testWriteAllFieldsToFileSmallChunkSize() {
//Add new image
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -338,7 +337,7 @@ public void testWriteAllFieldsToFileSmallChunkSize() {
f.commit();
f = AudioFileIO.read(testFile);
assertEquals(5, infoReader.countMetaBlocks(f.getFile()));
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
assertEquals(
"reference libFLAC 1.1.4 20070213",
@@ -413,7 +412,6 @@ public void testWriteAllFieldsToFileSmallChunkSize() {
System.out.println("NewFileSize:" + f.getFile().length());
assertEquals(144202, f.getFile().length());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -426,9 +424,9 @@ public void testWriteAllFieldsToFileSmallChunkSize() {
public void testDeleteTagFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.flac",
- new File("testdeletetag.flac")
+ "testdeletetag.flac"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -437,14 +435,13 @@ public void testDeleteTagFile() {
assertEquals("2", f.getAudioHeader().getChannels());
assertEquals("44100", f.getAudioHeader().getSampleRate());
assertEquals(2, ((FlacTag) f.getTag()).getImages().size());
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
assertFalse(f.getTag().isEmpty());
AudioFileIO.delete(f);
f = AudioFileIO.read(testFile);
assertTrue(f.getTag().isEmpty());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -457,9 +454,9 @@ public void testDeleteTagFile() {
public void testWriteFileWithCueSheet() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.flac",
- new File("testWriteWithCueSheet.flac")
+ "testWriteWithCueSheet.flac"
);
AudioFile f = AudioFileIO.read(testFile);
FlacInfoReader infoReader = new FlacInfoReader();
@@ -470,7 +467,6 @@ public void testWriteFileWithCueSheet() {
infoReader = new FlacInfoReader();
assertEquals("BLOCK", f.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -480,19 +476,13 @@ public void testWriteFileWithCueSheet() {
* Test writing to file that contains an ID3 header
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteFileWithId3Header() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test22.flac");
- if (!orig.isFile()) {
- System.out.println(
- "Test cannot be run because test file not available"
- );
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test22.flac",
- new File("testWriteFlacWithId3.flac")
+ "testWriteFlacWithId3.flac"
);
AudioFile f = AudioFileIO.read(testFile);
FlacInfoReader infoReader = new FlacInfoReader();
@@ -504,7 +494,6 @@ public void testWriteFileWithId3Header() {
assertEquals(4, infoReader.countMetaBlocks(f.getFile()));
assertEquals("BLOCK", f.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -514,20 +503,13 @@ public void testWriteFileWithId3Header() {
* Metadata size has increased so that shift required
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteFileWithId3HeaderAudioShifted() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test22.flac");
- if (!orig.isFile()) {
- System.out.println(
- "Test cannot be run because test file not available"
- );
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test22.flac",
- new File("testWriteFlacWithId3Shifted.flac")
+ "testWriteFlacWithId3Shifted.flac"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -536,7 +518,7 @@ public void testWriteFileWithId3HeaderAudioShifted() {
assertEquals("2", f.getAudioHeader().getChannels());
assertEquals("44100", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
FlacTag tag = (FlacTag) f.getTag();
assertEquals(
"reference libFLAC 1.1.4 20070213",
@@ -562,7 +544,7 @@ public void testWriteFileWithId3HeaderAudioShifted() {
//Add new image
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -582,7 +564,7 @@ public void testWriteFileWithId3HeaderAudioShifted() {
f.commit();
f = AudioFileIO.read(testFile);
assertEquals(5, infoReader.countMetaBlocks(f.getFile()));
- assertTrue(f.getTag() instanceof FlacTag);
+ assertInstanceOf(FlacTag.class, f.getTag());
assertEquals(
"reference libFLAC 1.1.4 20070213",
tag.getFirst(FieldKey.ENCODER)
@@ -595,7 +577,6 @@ public void testWriteFileWithId3HeaderAudioShifted() {
assertEquals("BLOCK", tag.getFirst(FieldKey.ARTIST));
assertEquals(1, tag.getArtworkList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -603,9 +584,9 @@ public void testWriteFileWithId3HeaderAudioShifted() {
@Test
public void testDeleteTag() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test2.flac",
- new File("testDelete.flac")
+ "testDelete.flac"
);
AudioFile f = AudioFileIO.read(testFile);
AudioFileIO.delete(f);
@@ -616,9 +597,9 @@ public void testDeleteTag() throws Exception {
@Test
public void testWriteMultipleFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.flac",
- new File("testWriteMultiple.flac")
+ "testWriteMultiple.flac"
);
AudioFile f = AudioFileIO.read(testFile);
List tagFields = f.getTag().getFields(FieldKey.ALBUM_ARTIST_SORT);
@@ -636,9 +617,9 @@ public void testWriteMultipleFields() throws Exception {
@Test
public void testDeleteFields() throws Exception {
//Delete using generic key
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.flac",
- new File("testWriteMultiple.flac")
+ "testWriteMultiple.flac"
);
AudioFile f = AudioFileIO.read(testFile);
List tagFields = f.getTag().getFields(FieldKey.ALBUM_ARTIST_SORT);
@@ -672,19 +653,13 @@ public void testDeleteFields() throws Exception {
* test read flac file with just streaminfo and padding header
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteFileThatOnlyHadStreamAndPaddingInfoHeader() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test102.flac");
- if (!orig.isFile()) {
- System.out.println(
- "Test cannot be run because test file not available"
- );
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test102.flac",
- new File("test102.flac")
+ "test102.flac"
);
AudioFile f = AudioFileIO.read(testFile);
FlacInfoReader infoReader = new FlacInfoReader();
@@ -698,7 +673,6 @@ public void testWriteFileThatOnlyHadStreamAndPaddingInfoHeader() {
assertEquals(3, infoReader.countMetaBlocks(f.getFile()));
assertEquals("fred", f.getTag().getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -706,20 +680,20 @@ public void testWriteFileThatOnlyHadStreamAndPaddingInfoHeader() {
@Test
public void testWriteWriteProtectedFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckDisabled(
+ runWriteWriteProtectedFileWithCheckDisabled(
"test2.flac"
);
}
@Test
public void testWriteWriteProtectedFileWithCheckEnabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckEnabled(
+ runWriteWriteProtectedFileWithCheckEnabled(
"test2.flac"
);
}
@Test
public void testWriteReadOnlyFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteReadOnlyFileWithCheckDisabled("test2.flac");
+ runWriteReadOnlyFileWithCheckDisabled("test2.flac");
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/id3/CompressedTest.java b/src/test/java/org/jaudiotagger/tag/id3/CompressedTest.java
index 01c2128..c929f0b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/CompressedTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/CompressedTest.java
@@ -22,7 +22,7 @@ public class CompressedTest extends AbstractTestCase {
public void testv23TagReadCompressedCommentFrame() throws Exception {
final String COMM_TEXT = "[P-M-S] Teampms [P-M-S]";
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue98-1.id3",
"testV1.mp3"
);
@@ -53,7 +53,7 @@ public void testv23TagReadCompressedCommentFrame() throws Exception {
public void testv23TagReadCompressedAPICFrame() throws Exception {
final int FRAME_SIZE = 3220;
final String TITLE_TEXT = "Crazy Train";
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue98-2.id3",
"testV1.mp3"
);
@@ -88,7 +88,7 @@ public void testv23TagReadCompressedAPICFrame() throws Exception {
*/
@Test
public void testv24TagReadCompressedPictureFrame() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue98-3.id3",
"testV1.mp3"
);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/ConcurrentWritesTest.java b/src/test/java/org/jaudiotagger/tag/id3/ConcurrentWritesTest.java
index 8e6a349..6f3cb5b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/ConcurrentWritesTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/ConcurrentWritesTest.java
@@ -10,7 +10,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
@@ -18,7 +19,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ConcurrentWritesTest {
+public class ConcurrentWritesTest extends AbstractBaseTestCase {
private static final int THREADS = 100;
private final File[] files = new File[THREADS];
@@ -26,11 +27,9 @@ public class ConcurrentWritesTest {
@BeforeEach
public void setUp() {
for (int counter = 0; counter < THREADS; counter++) {
- files[counter] = AbstractTestCase.copyAudioToTmp(
+ files[counter] = copyAudioToTmp(
"testV25.mp3",
- new File(
- ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".mp3"
- )
+ ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".mp3"
);
}
}
@@ -55,13 +54,7 @@ public void testConcurrentWrites() throws Exception {
}
}
- private static class WriteFileCallable implements Callable {
-
- private final File file;
-
- public WriteFileCallable(File file) {
- this.file = file;
- }
+ private record WriteFileCallable(File file) implements Callable {
public Boolean call() throws Exception {
AudioFile audiofile = AudioFileIO.read(file);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/DeprecatedFrameTest.java b/src/test/java/org/jaudiotagger/tag/id3/DeprecatedFrameTest.java
index 2f72b46..0b8fac1 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/DeprecatedFrameTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/DeprecatedFrameTest.java
@@ -1,7 +1,7 @@
package org.jaudiotagger.tag.id3;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.util.List;
@@ -17,7 +17,7 @@ public class DeprecatedFrameTest extends AbstractTestCase {
@Test
public void testv24TagWithDeprecatedFrameShouldCreateAsDeprecated()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue88.id3",
"testV1.mp3"
);
@@ -28,13 +28,13 @@ public void testv24TagWithDeprecatedFrameShouldCreateAsDeprecated()
.getID3v2Tag()
.getFrame(ID3v23Frames.FRAME_ID_V3_TYER);
assertNotNull(v24frame);
- assertTrue(v24frame.getBody() instanceof FrameBodyDeprecated);
+ assertInstanceOf(FrameBodyDeprecated.class, v24frame.getBody());
}
@Test
public void testConvertTagWithDeprecatedFrameToTagWhereFrameShouldNoLongerBeDeprecated()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue88.id3",
"testV1.mp3"
);
@@ -43,13 +43,13 @@ public void testConvertTagWithDeprecatedFrameToTagWhereFrameShouldNoLongerBeDepr
ID3v23Tag v23Tag = new ID3v23Tag(mp3File.getID3v2Tag());
ID3v23Frame v23frame = (ID3v23Frame) ((List) v23Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_TYER
- )).get(0);
- assertTrue(v23frame.getBody() instanceof FrameBodyTYER);
+ ID3v23Frames.FRAME_ID_V3_TYER
+ )).get(0);
+ assertInstanceOf(FrameBodyTYER.class, v23frame.getBody());
v23frame = (ID3v23Frame) ((List) v23Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_TYER
- )).get(1);
- assertTrue(v23frame.getBody() instanceof FrameBodyTYER);
+ ID3v23Frames.FRAME_ID_V3_TYER
+ )).get(1);
+ assertInstanceOf(FrameBodyTYER.class, v23frame.getBody());
mp3File.setID3v2Tag(v23Tag);
mp3File.save();
@@ -57,12 +57,12 @@ public void testConvertTagWithDeprecatedFrameToTagWhereFrameShouldNoLongerBeDepr
mp3File = new MP3File(testFile);
v23Tag = (ID3v23Tag) mp3File.getID3v2Tag();
v23frame = (ID3v23Frame) v23Tag.getFrame(ID3v23Frames.FRAME_ID_V3_TYER);
- assertTrue(v23frame.getBody() instanceof FrameBodyTYER);
+ assertInstanceOf(FrameBodyTYER.class, v23frame.getBody());
}
@Test
public void testSavingV24DeprecatedTIMETagToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue122-1.id3",
"testV1.mp3"
);
@@ -72,7 +72,7 @@ public void testSavingV24DeprecatedTIMETagToV23() throws Exception {
ID3v23Frames.FRAME_ID_V3_TIME
);
assertNotNull(v24frame);
- assertTrue(v24frame.getBody() instanceof FrameBodyDeprecated);
+ assertInstanceOf(FrameBodyDeprecated.class, v24frame.getBody());
//Save as V23
ID3v23Tag v23Tag = new ID3v23Tag(v24Tag);
@@ -84,12 +84,12 @@ public void testSavingV24DeprecatedTIMETagToV23() throws Exception {
ID3v23Frame v23frame = (ID3v23Frame) v23Tag.getFrame(
ID3v23Frames.FRAME_ID_V3_TIME
);
- assertTrue(v23frame.getBody() instanceof FrameBodyTIME);
+ assertInstanceOf(FrameBodyTIME.class, v23frame.getBody());
}
@Test
public void testSavingV24DeprecatedEmptyTDATTagToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue122-2.id3",
"testV1.mp3"
);
@@ -99,7 +99,7 @@ public void testSavingV24DeprecatedEmptyTDATTagToV23() throws Exception {
ID3v23Frames.FRAME_ID_V3_TDAT
);
assertNotNull(v24frame);
- assertTrue(v24frame.getBody() instanceof FrameBodyDeprecated);
+ assertInstanceOf(FrameBodyDeprecated.class, v24frame.getBody());
//Save as V23
ID3v23Tag v23Tag = new ID3v23Tag(v24Tag);
@@ -110,8 +110,6 @@ public void testSavingV24DeprecatedEmptyTDATTagToV23() throws Exception {
v23Tag = (ID3v23Tag) mp3File.getID3v2Tag();
Object v23frame = v23Tag.getFrame(ID3v23Frames.FRAME_ID_V3_TYER);
assertNotNull(v23frame);
- assertTrue(
- ((AbstractID3v2Frame) v23frame).getBody() instanceof FrameBodyTYER
- );
+ assertInstanceOf(FrameBodyTYER.class, ((AbstractID3v2Frame) v23frame).getBody());
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/id3/DuplicateFrameTest.java b/src/test/java/org/jaudiotagger/tag/id3/DuplicateFrameTest.java
index 67cecd9..d08a545 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/DuplicateFrameTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/DuplicateFrameTest.java
@@ -1,7 +1,7 @@
package org.jaudiotagger.tag.id3;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
@@ -9,21 +9,18 @@
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class DuplicateFrameTest extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadingFileWithCorruptFirstFrame() throws Exception {
- File orig = new File("testdata", "test78.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test78.mp3");
+ File testFile = copyAudioToTmp("test78.mp3");
MP3File f = (MP3File) AudioFileIO.read(testFile);
Tag tag = f.getTag();
- assertTrue(f.getTag() instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, f.getTag());
ID3v23Tag id3v23tag = (ID3v23Tag) tag;
//Frame contains two TYER frames
assertEquals(21, id3v23tag.getDuplicateBytes());
diff --git a/src/test/java/org/jaudiotagger/tag/id3/EmptyFrameTest.java b/src/test/java/org/jaudiotagger/tag/id3/EmptyFrameTest.java
index 1dbe3b2..1b1bf45 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/EmptyFrameTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/EmptyFrameTest.java
@@ -4,17 +4,18 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.id3.framebody.FrameBodyWOAF;
import org.jaudiotagger.tag.id3.framebody.FrameBodyWORS;
import org.junit.jupiter.api.Test;
-public class EmptyFrameTest {
+public class EmptyFrameTest extends AbstractBaseTestCase {
@Test
public void testWriteID3v23TagWithEmptyFrameFirst() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128ID3v2.mp3");
MP3File mp3File = null;
mp3File = new MP3File(testFile);
@@ -44,7 +45,7 @@ public void testWriteID3v23TagWithEmptyFrameFirst() throws Exception {
@Test
public void testWriteID3v24TagWithEmptyFrameFirst() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128ID3v2.mp3");
MP3File mp3File = null;
mp3File = new MP3File(testFile);
@@ -80,7 +81,7 @@ public void testWriteID3v24TagWithEmptyFrameFirst() throws Exception {
@Test
public void testWriteID3v22TagWithEmptyFrameFirst() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128ID3v2.mp3");
MP3File mp3File = null;
mp3File = new MP3File(testFile);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FileClosingTest.java b/src/test/java/org/jaudiotagger/tag/id3/FileClosingTest.java
index 0c318ef..185b6f4 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FileClosingTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FileClosingTest.java
@@ -15,7 +15,7 @@ public class FileClosingTest extends AbstractTestCase {
@Test
public void testClosingFileAfterFailedRead() {
Exception exception = null;
- File testFile = AbstractTestCase.copyAudioToTmp("corrupt.mp3");
+ File testFile = copyAudioToTmp("corrupt.mp3");
//Try and Read
try {
@@ -38,7 +38,7 @@ public void testClosingFileAfterFailedRead() {
@Test
public void testClosingFileAfterSuccessfulRead() {
Exception exception = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
//Try and Read
try {
@@ -61,7 +61,7 @@ public void testClosingFileAfterSuccessfulRead() {
@Test
public void testClosingFileAfterFailedReadOnly() {
Exception exception = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
boolean readonly = testFile.setReadOnly();
assertTrue(readonly);
@@ -77,6 +77,7 @@ public void testClosingFileAfterFailedReadOnly() {
assertNotNull(exception);
//Should be able to deleteField
+ testFile.setWritable(true); // needs to be writeable to be deletable
boolean deleted = testFile.delete();
assertTrue(deleted);
}
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameCOMMTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameCOMMTest.java
index 4534123..1a91d1b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameCOMMTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameCOMMTest.java
@@ -18,7 +18,7 @@ public class FrameCOMMTest extends AbstractTestCase {
public void testReadFileContainingInvalidSizeCOMMFrame() {
Exception e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue77.id3",
"testV1.mp3"
);
@@ -37,7 +37,7 @@ public void testReadFileContainingInvalidSizeCOMMFrame() {
public void testReadFileContainingInvalidTextEncodingCOMMFrame() {
Exception e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue80.id3",
"testV1.mp3"
);
@@ -57,7 +57,7 @@ public void testreadFrameContainingInvalidlanguageCodeCOMMFrame() {
final String INVALID_LANG_CODE = " ";
Exception e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue108.id3",
"testV1.mp3"
);
@@ -72,7 +72,6 @@ public void testreadFrameContainingInvalidlanguageCodeCOMMFrame() {
assertEquals(INVALID_LANG_CODE, frameBody.getLanguage());
} catch (Exception ie) {
- ie.printStackTrace();
e = ie;
}
assertNull(e);
@@ -89,7 +88,7 @@ public void testsaveFileContainingNullLanguageCodeCOMMFrame() {
Exception e = null;
try {
//Read tag
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue108.id3",
"testV1.mp3"
);
@@ -123,7 +122,6 @@ public void testsaveFileContainingNullLanguageCodeCOMMFrame() {
frameBody = (FrameBodyCOMM) commFrame.getBody();
assertEquals(SAFE_SHORTER_LANG_CODE, frameBody.getLanguage());
} catch (Exception ie) {
- ie.printStackTrace();
e = ie;
}
assertNull(e);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameETCOTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameETCOTest.java
index 671b8b3..6180c2f 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameETCOTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameETCOTest.java
@@ -13,6 +13,7 @@
import org.jaudiotagger.tag.id3.framebody.FrameBodyETCO;
import org.jaudiotagger.tag.id3.framebody.FrameBodyETCOTest;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class FrameETCOTest extends AbstractTestCase {
@@ -31,19 +32,16 @@ public static ID3v24Frame getInitialisedFrame() {
* @throws Exception
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFile() throws Exception {
- File orig = new File("testdata", "test20.mp3");
- if (!orig.isFile()) {
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test20.mp3");
+ File testFile = copyAudioToTmp("test20.mp3");
AudioFile f = AudioFileIO.read(testFile);
final ID3v23Frame frame =
((ID3v23Frame) ((ID3v23Tag) f.getTag()).getFrame(
- ID3v24Frames.FRAME_ID_EVENT_TIMING_CODES
- ));
+ ID3v24Frames.FRAME_ID_EVENT_TIMING_CODES
+ ));
FrameBodyETCO body = (FrameBodyETCO) frame.getBody();
assertEquals(2, body.getTimestampFormat());
assertEquals(1, body.getTimingCodes().size());
@@ -55,7 +53,6 @@ public void testReadFile() throws Exception {
assertEquals(224, entry.getValue()[0]);
assertEquals(56963L, (long) entry.getKey());
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -63,7 +60,7 @@ public void testReadFile() throws Exception {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -103,7 +100,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FramePCNTTest.java b/src/test/java/org/jaudiotagger/tag/id3/FramePCNTTest.java
index 0eb3a83..150fd50 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FramePCNTTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FramePCNTTest.java
@@ -71,7 +71,7 @@ public void testCreateID3v23Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -92,7 +92,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_PLAY_COUNTER);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FramePICAndAPICTest.java b/src/test/java/org/jaudiotagger/tag/id3/FramePICAndAPICTest.java
index 5cb978f..b4bbe89 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FramePICAndAPICTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FramePICAndAPICTest.java
@@ -134,7 +134,7 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -150,13 +150,13 @@ public void testSaveToFile() throws Exception {
.getFrame(ID3v24Frames.FRAME_ID_ATTACHED_PICTURE);
assertNotNull(frame);
FrameBodyAPIC body = (FrameBodyAPIC) frame.getBody();
- assertTrue(body instanceof FrameBodyAPIC);
+ assertInstanceOf(FrameBodyAPIC.class, body);
assertEquals(FrameBodyAPICTest.DESCRIPTION, body.getDescription());
}
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -178,13 +178,13 @@ public void testConvertV24ToV23() throws Exception {
.getFrame(ID3v23Frames.FRAME_ID_V3_ATTACHED_PICTURE);
assertNotNull(frame);
FrameBodyAPIC body = (FrameBodyAPIC) frame.getBody();
- assertTrue(body instanceof FrameBodyAPIC);
+ assertInstanceOf(FrameBodyAPIC.class, body);
assertEquals(FrameBodyAPICTest.DESCRIPTION, body.getDescription());
}
@Test
public void testConvertV24ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -206,13 +206,13 @@ public void testConvertV24ToV22() throws Exception {
.getFrame(ID3v22Frames.FRAME_ID_V2_ATTACHED_PICTURE);
assertNotNull(frame);
FrameBodyPIC body = (FrameBodyPIC) frame.getBody();
- assertTrue(body instanceof FrameBodyPIC);
+ assertInstanceOf(FrameBodyPIC.class, body);
assertEquals(FrameBodyAPICTest.DESCRIPTION, body.getDescription());
}
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -236,7 +236,7 @@ public void testConvertV22ToV24() throws Exception {
.getFrame(ID3v24Frames.FRAME_ID_ATTACHED_PICTURE);
assertNotNull(frame);
FrameBodyAPIC body = (FrameBodyAPIC) frame.getBody();
- assertTrue(body instanceof FrameBodyAPIC);
+ assertInstanceOf(FrameBodyAPIC.class, body);
assertEquals(FrameBodyPICTest.DESCRIPTION, body.getDescription());
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FramePOPMTest.java b/src/test/java/org/jaudiotagger/tag/id3/FramePOPMTest.java
index ab135f2..33064c9 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FramePOPMTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FramePOPMTest.java
@@ -92,7 +92,7 @@ public void testCreateID3v23Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -115,7 +115,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_POPULARIMETER);
@@ -141,7 +141,7 @@ public void testSaveEmptyFrameToFile() throws Exception {
@Test
public void testReadFileContainingPOMFrameWithoutCounter() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue72.id3",
"testV1.mp3"
);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameRVADAndRVA2Test.java b/src/test/java/org/jaudiotagger/tag/id3/FrameRVADAndRVA2Test.java
index 8126ef2..24a3cd6 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameRVADAndRVA2Test.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameRVADAndRVA2Test.java
@@ -155,7 +155,7 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -171,7 +171,7 @@ public void testSaveToFile() throws Exception {
.getFrame(ID3v24Frames.FRAME_ID_RELATIVE_VOLUME_ADJUSTMENT2);
assertNotNull(frame);
FrameBodyRVA2 body = (FrameBodyRVA2) frame.getBody();
- assertTrue(body instanceof FrameBodyRVA2);
+ assertInstanceOf(FrameBodyRVA2.class, body);
assertNull(
cmp(
FrameBodyRVA2Test.TEST_BYTES,
@@ -182,7 +182,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -204,7 +204,7 @@ public void testConvertV24ToV23() throws Exception {
.getFrame(ID3v23Frames.FRAME_ID_V3_RELATIVE_VOLUME_ADJUSTMENT);
assertNotNull(frame);
FrameBodyRVAD body = (FrameBodyRVAD) frame.getBody();
- assertTrue(body instanceof FrameBodyRVAD);
+ assertInstanceOf(FrameBodyRVAD.class, body);
assertNull(
cmp(
FrameBodyRVA2Test.TEST_BYTES,
@@ -215,7 +215,7 @@ public void testConvertV24ToV23() throws Exception {
@Test
public void testConvertV24ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -237,12 +237,12 @@ public void testConvertV24ToV22() throws Exception {
.getFrame(ID3v22Frames.FRAME_ID_V2_RELATIVE_VOLUME_ADJUSTMENT);
assertNotNull(frame);
FrameBodyRVAD body = (FrameBodyRVAD) frame.getBody();
- assertTrue(body instanceof FrameBodyRVAD);
+ assertInstanceOf(FrameBodyRVAD.class, body);
}
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -266,7 +266,7 @@ public void testConvertV22ToV24() throws Exception {
.getFrame(ID3v24Frames.FRAME_ID_RELATIVE_VOLUME_ADJUSTMENT2);
assertNotNull(frame);
FrameBodyRVA2 body = (FrameBodyRVA2) frame.getBody();
- assertTrue(body instanceof FrameBodyRVA2);
+ assertInstanceOf(FrameBodyRVA2.class, body);
assertNull(
cmp(
FrameBodyRVADTest.TEST_BYTES,
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameSYLTTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameSYLTTest.java
index 507bc5e..e9ce594 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameSYLTTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameSYLTTest.java
@@ -20,7 +20,7 @@ public class FrameSYLTTest extends AbstractTestCase {
@Test
public void testWriteFrame() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Tag id3 = new ID3v24Tag();
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameSYTCTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameSYTCTest.java
index ae6c7cf..a16ae10 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameSYTCTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameSYTCTest.java
@@ -23,7 +23,7 @@ public static ID3v24Frame getInitialisedFrame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -63,7 +63,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_SYNC_TEMPO);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTCMPTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTCMPTest.java
index 2032dd3..732f044 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTCMPTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTCMPTest.java
@@ -99,9 +99,9 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1000.mp3")
+ "test1000.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -122,9 +122,9 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1001.mp3")
+ "test1001.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -148,9 +148,9 @@ public void testSaveEmptyFrameToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1002.mp3")
+ "test1002.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -176,9 +176,9 @@ public void testConvertV24ToV23() throws Exception {
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1003.mp3")
+ "test1003.mp3"
);
MP3File mp3File = new MP3File(testFile);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTDATTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTDATTest.java
index 8a3d661..f564e77 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTDATTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTDATTest.java
@@ -121,9 +121,9 @@ public void testConvertingPartialDate() {
@Test
public void testReadingID3AsV24Generic() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("id3asv24.mp3")
+ "id3asv24.mp3"
);
TagOptionSingleton.getInstance().setID3V2Version(ID3V2Version.ID3_V23);
AudioFile af = AudioFileIO.read(testFile);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTDRCTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTDRCTest.java
index 3c9c453..e85811b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTDRCTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTDRCTest.java
@@ -9,7 +9,7 @@ public class FrameTDRCTest extends AbstractTestCase {
@Test
public void testReadFileContainingTDRCAndTYERFrames() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue73.id3",
"testV1.mp3"
);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTDTGTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTDTGTest.java
index 9345faf..8e35562 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTDTGTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTDTGTest.java
@@ -25,10 +25,7 @@ public void testID3Specific() {
ID3v23Tag v23tag = new ID3v23Tag(tag);
assertEquals(1, v23tag.getFieldCount());
assertNotNull(v23tag.getFirst("TDTG"));
- assertTrue(
- (((AbstractID3v2Frame) v23tag.getFrame("TDTG")).getBody()) instanceof
- FrameBodyUnsupported
- );
+ assertInstanceOf(FrameBodyUnsupported.class, (((AbstractID3v2Frame) v23tag.getFrame("TDTG")).getBody()));
} catch (Exception ex) {
e = ex;
ex.printStackTrace();
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTIPLTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTIPLTest.java
index adb8570..8ecdb03 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTIPLTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTIPLTest.java
@@ -91,9 +91,9 @@ public void testCreateID3v23Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1016.mp3")
+ "test1016.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -114,9 +114,9 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveToFileOdd() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1016.mp3")
+ "test1016.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -137,9 +137,9 @@ public void testSaveToFileOdd() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1004.mp3")
+ "test1004.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -163,9 +163,9 @@ public void testSaveEmptyFrameToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1005.mp3")
+ "test1005.mp3"
);
MP3File mp3File = new MP3File(testFile);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTLANTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTLANTest.java
index 4858ab2..7b8af1b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTLANTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTLANTest.java
@@ -9,7 +9,7 @@ public class FrameTLANTest extends AbstractTestCase {
@Test
public void testWriteFileContainingTLANFrame() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue116.id3",
"testV1.mp3"
);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTMOOTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTMOOTest.java
index 621655f..b111343 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTMOOTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTMOOTest.java
@@ -24,14 +24,6 @@ public static ID3v24Frame getInitialisedFrame() {
return frame;
}
- /*public static ID3v23Frame getV23InitialisedFrame()
- {
- ID3v23Frame frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_USER_DEFINED_INFO);
- FrameBodyXSOP fb = FrameBodyXSOPTest.getInitialisedBody();
- frame.setBody(fb);
- return frame;
- } */
-
@Test
public void testCreateID3v24Frame() {
Exception exceptionCaught = null;
@@ -57,62 +49,11 @@ public void testCreateID3v24Frame() {
assertEquals(FrameBodyTMOOTest.MOOD, fb.getText());
}
- /*
-public void testCreateID3v23Frame()
-{
-Exception exceptionCaught = null;
-ID3v23Frame frame = null;
-FrameBodyXSOP fb = null;
-try
-{
-frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_ARTIST_SORT_ORDER_MUSICBRAINZ);
-fb = FrameBodyXSOPTest.getInitialisedBody();
-frame.setBody(fb);
-}
-catch (Exception e)
-{
-exceptionCaught = e;
-}
-
-assertNull(exceptionCaught);
-assertEquals(ID3v23Frames.FRAME_ID_V3_ARTIST_SORT_ORDER_MUSICBRAINZ, frame.getIdentifier());
-assertEquals(TextEncoding.ISO_8859_1, fb.getTextEncoding());
-assertTrue(ID3v23Frames.getInstanceOf().isExtensionFrames(frame.getIdentifier()));
-assertFalse(ID3v23Frames.getInstanceOf().isSupportedFrames(frame.getIdentifier()));
-assertEquals(FrameBodyTSOPTest.ARTIST_SORT, fb.getText());
-
-} */
- /*
-public void testCreateID3v22Frame()
-{
- Exception exceptionCaught = null;
- ID3v22Frame frame = null;
- FrameBodyTSOP fb = null;
- try
- {
- frame = new ID3v22Frame(ID3v22Frames.FRAME_ID_V2_ARTIST_SORT_ORDER_ITUNES);
- fb = FrameBodyTSOPTest.getInitialisedBody();
- frame.setBody(fb);
- }
- catch (Exception e)
- {
- exceptionCaught = e;
- }
-
- assertNull(exceptionCaught);
- assertEquals(ID3v22Frames.FRAME_ID_V2_ARTIST_SORT_ORDER_ITUNES, frame.getIdentifier());
- assertEquals(TextEncoding.ISO_8859_1, fb.getTextEncoding());
- assertTrue(ID3v22Frames.getInstanceOf().isExtensionFrames(frame.getIdentifier()));
- assertFalse(ID3v22Frames.getInstanceOf().isSupportedFrames(frame.getIdentifier()));
- assertEquals(FrameBodyTSOPTest.ARTIST_SORT, fb.getText());
-
-}
- */
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1016.mp3")
+ "test1016.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -133,9 +74,9 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1004.mp3")
+ "test1004.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -165,9 +106,9 @@ public void testSaveEmptyFrameToFile() throws Exception {
*/
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1005.mp3")
+ "test1005.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -193,15 +134,15 @@ public void testConvertV24ToV23() throws Exception {
//Reload
mp3File = new MP3File(testFile);
ID3v23Frame frame = (ID3v23Frame) ((List) mp3File
- .getID3v2Tag()
- .getFrame(ID3v23Frames.FRAME_ID_V3_USER_DEFINED_INFO)).get(0);
+ .getID3v2Tag()
+ .getFrame(ID3v23Frames.FRAME_ID_V3_USER_DEFINED_INFO)).get(0);
FrameBodyTXXX body = (FrameBodyTXXX) frame.getBody();
assertEquals(TextEncoding.ISO_8859_1, body.getTextEncoding());
assertEquals(FrameBodyTXXXTest.TXXX_TEST_DESC, body.getText());
frame = (ID3v23Frame) ((List) mp3File
- .getID3v2Tag()
- .getFrame(ID3v23Frames.FRAME_ID_V3_USER_DEFINED_INFO)).get(1);
+ .getID3v2Tag()
+ .getFrame(ID3v23Frames.FRAME_ID_V3_USER_DEFINED_INFO)).get(1);
body = (FrameBodyTXXX) frame.getBody();
assertEquals(TextEncoding.ISO_8859_1, body.getTextEncoding());
assertEquals(FrameBodyTMOOTest.MOOD, body.getText());
@@ -215,9 +156,9 @@ public void testConvertV24ToV23() throws Exception {
*/
@Test
public void testConvertV23ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1005.mp3")
+ "test1005.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -243,16 +184,16 @@ public void testConvertV23ToV24() throws Exception {
}
assertEquals(1, v24Tag.getFieldCount());
ID3v24Frame v24frame = (ID3v24Frame) v24Tag.getFrame("TMOO");
- assertTrue(v24frame.getBody() instanceof FrameBodyTMOO);
+ assertInstanceOf(FrameBodyTMOO.class, v24frame.getBody());
FrameBodyTMOO v24framebody = (FrameBodyTMOO) v24frame.getBody();
assertEquals("Tranquil", v24framebody.getText());
}
@Test
public void testConvertMultiV23ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1005.mp3")
+ "test1005.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -293,7 +234,7 @@ public void testConvertMultiV23ToV24() throws Exception {
assertEquals(2, v24Tag.getFieldCount());
ID3v24Frame v24frame = (ID3v24Frame) v24Tag.getFrame("TMOO");
assertNotNull(v24frame);
- assertTrue(v24frame.getBody() instanceof FrameBodyTMOO);
+ assertInstanceOf(FrameBodyTMOO.class, v24frame.getBody());
FrameBodyTMOO v24framebody = (FrameBodyTMOO) v24frame.getBody();
assertEquals("Tranquil", v24framebody.getText());
}
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTOPETest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTOPETest.java
index 10edf8d..9c62140 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTOPETest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTOPETest.java
@@ -1,6 +1,6 @@
package org.jaudiotagger.tag.id3;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import java.io.File;
import org.jaudiotagger.AbstractTestCase;
@@ -12,7 +12,7 @@ public class FrameTOPETest extends AbstractTestCase {
@Test
public void testSavingV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue122.id3",
"testV1.mp3"
);
@@ -29,6 +29,6 @@ public void testSavingV24ToV23() throws Exception {
ID3v23Frame v23frame = (ID3v23Frame) v23Tag.getFrame(
ID3v23Frames.FRAME_ID_V3_ORIGARTIST
);
- assertTrue(v23frame.getBody() instanceof FrameBodyTOPE);
+ assertInstanceOf(FrameBodyTOPE.class, v23frame.getBody());
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTPOSTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTPOSTest.java
index 571edeb..2a5f844 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTPOSTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTPOSTest.java
@@ -11,6 +11,7 @@
import org.jaudiotagger.tag.Tag;
import org.jaudiotagger.tag.TagField;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class FrameTPOSTest extends AbstractTestCase {
@@ -21,18 +22,14 @@ public void testMergingMultipleFrames() throws Exception {
tag.setField(tag.createField(FieldKey.DISC_TOTAL, "10"));
assertEquals("1", tag.getFirst(FieldKey.DISC_NO));
assertEquals("10", tag.getFirst(FieldKey.DISC_TOTAL));
- assertTrue(tag.getFrame("TPOS") instanceof AbstractID3v2Frame);
+ assertInstanceOf(AbstractID3v2Frame.class, tag.getFrame("TPOS"));
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testDiscNo() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test82.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
+ File orig = fileResource("testdata", "test82.mp3");
try {
AudioFile af = AudioFileIO.read(orig);
Tag newTags = af.getTag();
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTRCKTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTRCKTest.java
index d72e504..5445b9d 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTRCKTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTRCKTest.java
@@ -66,7 +66,7 @@ public void testCreateID3v23Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -87,7 +87,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_TRACK);
@@ -116,6 +116,6 @@ public void testMergingMultipleTrackFrames() throws Exception {
tag.setField(tag.createField(FieldKey.TRACK_TOTAL, "10"));
assertEquals("1", tag.getFirst(FieldKey.TRACK));
assertEquals("10", tag.getFirst(FieldKey.TRACK_TOTAL));
- assertTrue(tag.getFrame("TRCK") instanceof AbstractID3v2Frame);
+ assertInstanceOf(AbstractID3v2Frame.class, tag.getFrame("TRCK"));
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTSO2Test.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTSO2Test.java
index 4d4d88e..23b34c2 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTSO2Test.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTSO2Test.java
@@ -127,9 +127,9 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1017.mp3")
+ "test1017.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -150,9 +150,9 @@ public void testSaveToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1018.mp3")
+ "test1018.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -180,9 +180,9 @@ public void testConvertV24ToV23() throws Exception {
@Test
public void testConvertV24ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1019.mp3")
+ "test1019.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -210,9 +210,9 @@ public void testConvertV24ToV22() throws Exception {
@Test
public void testConvertV23ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1020.mp3")
+ "test1020.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -240,9 +240,9 @@ public void testConvertV23ToV22() throws Exception {
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1021.mp3")
+ "test1021.mp3"
);
MP3File mp3File = new MP3File(testFile);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTSOATest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTSOATest.java
index 65b7477..881b155 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTSOATest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTSOATest.java
@@ -143,7 +143,7 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -163,7 +163,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_ALBUM_SORT_ORDER);
@@ -186,7 +186,7 @@ public void testSaveEmptyFrameToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -213,7 +213,7 @@ public void testConvertV24ToV23() throws Exception {
@Test
public void testConvertV24ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -240,7 +240,7 @@ public void testConvertV24ToV22() throws Exception {
@Test
public void testConvertV23ITunesToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -267,7 +267,7 @@ public void testConvertV23ITunesToV22() throws Exception {
@Test
public void testConvertV23MusicBrainzToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -294,7 +294,7 @@ public void testConvertV23MusicBrainzToV22() throws Exception {
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTSOCTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTSOCTest.java
index b2ef206..df2b41b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTSOCTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTSOCTest.java
@@ -127,7 +127,7 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -147,7 +147,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -174,7 +174,7 @@ public void testConvertV24ToV23() throws Exception {
@Test
public void testConvertV24ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -201,7 +201,7 @@ public void testConvertV24ToV22() throws Exception {
@Test
public void testConvertV23ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -228,7 +228,7 @@ public void testConvertV23ToV22() throws Exception {
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTSOPTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTSOPTest.java
index 3c32fda..6b110b3 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTSOPTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTSOPTest.java
@@ -152,9 +152,9 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1016.mp3")
+ "test1016.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -175,9 +175,9 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1004.mp3")
+ "test1004.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -203,9 +203,9 @@ public void testSaveEmptyFrameToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1005.mp3")
+ "test1005.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -233,9 +233,9 @@ public void testConvertV24ToV23() throws Exception {
@Test
public void testConvertV24ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1006.mp3")
+ "test1006.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -263,9 +263,9 @@ public void testConvertV24ToV22() throws Exception {
@Test
public void testConvertV23ITunesToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1007.mp3")
+ "test1007.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -293,9 +293,9 @@ public void testConvertV23ITunesToV22() throws Exception {
@Test
public void testConvertV23MusicBrainzToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1008.mp3")
+ "test1008.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -323,9 +323,9 @@ public void testConvertV23MusicBrainzToV22() throws Exception {
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1009.mp3")
+ "test1009.mp3"
);
MP3File mp3File = new MP3File(testFile);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTSOTTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTSOTTest.java
index d84dadc..0aaae8b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTSOTTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTSOTTest.java
@@ -143,9 +143,9 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1010.mp3")
+ "test1010.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -166,9 +166,9 @@ public void testSaveToFile() throws Exception {
@Test
public void testSaveEmptyFrameToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1011.mp3")
+ "test1011.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -192,9 +192,9 @@ public void testSaveEmptyFrameToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1012.mp3")
+ "test1012.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -222,9 +222,9 @@ public void testConvertV24ToV23() throws Exception {
@Test
public void testConvertV24ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1013.mp3")
+ "test1013.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -252,9 +252,9 @@ public void testConvertV24ToV22() throws Exception {
@Test
public void testConvertV23ITunesToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1014.mp3")
+ "test1014.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -282,9 +282,9 @@ public void testConvertV23ITunesToV22() throws Exception {
@Test
public void testConvertV23MusicBrainzToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1015.mp3")
+ "test1015.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -312,9 +312,9 @@ public void testConvertV23MusicBrainzToV22() throws Exception {
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("test1016.mp3")
+ "test1016.mp3"
);
MP3File mp3File = new MP3File(testFile);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameTXXXTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameTXXXTest.java
index 15326f3..167861b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameTXXXTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameTXXXTest.java
@@ -115,7 +115,7 @@ public void testCreateID3v22Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -135,7 +135,7 @@ public void testSaveToFile() throws Exception {
@Test
public void testConvertV24ToV23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -162,7 +162,7 @@ public void testConvertV24ToV23() throws Exception {
@Test
public void testConvertV24ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -189,7 +189,7 @@ public void testConvertV24ToV22() throws Exception {
@Test
public void testConvertV23ToV22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -216,7 +216,7 @@ public void testConvertV23ToV22() throws Exception {
@Test
public void testConvertV22ToV24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameULSTTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameULSTTest.java
index 6613f65..7e42e37 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameULSTTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameULSTTest.java
@@ -16,7 +16,7 @@ public class FrameULSTTest extends AbstractTestCase {
@Test
public void testReadULST() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test23.mp3");
+ File testFile = copyAudioToTmp("test23.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame v24frame = (ID3v24Frame) mp3File
@@ -36,7 +36,7 @@ public void testReadULST() throws Exception {
@Test
public void testWriteULSTID3v24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test23.mp3");
+ File testFile = copyAudioToTmp("test23.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame v24frame = (ID3v24Frame) mp3File
@@ -91,7 +91,7 @@ public void testWriteULSTID3v24() throws Exception {
@Test
public void testWriteULSTID3v23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Tag tag = new ID3v23Tag();
@@ -159,7 +159,7 @@ public void testWriteULSTID3v23() throws Exception {
@Test
public void testWriteULSTID3v23Test2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Tag tag = new ID3v23Tag();
@@ -196,7 +196,7 @@ public void testWriteULSTID3v23Test2() throws Exception {
*/
@Test
public void testWriteULSTID3v23Test3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Tag tag = new ID3v23Tag();
@@ -231,7 +231,7 @@ public void testWriteULSTID3v23Test3() throws Exception {
*/
@Test
public void testWriteULSTID3v23Test4() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Tag tag = new ID3v23Tag();
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameWOARTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameWOARTest.java
index 855d8b3..5355409 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameWOARTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameWOARTest.java
@@ -66,7 +66,7 @@ public void testCreateID3v24Frame() {
exceptionCaught = e;
}
assertNull(exceptionCaught);
- assertTrue(frame.getBody() instanceof FrameBodyWOAR);
+ assertInstanceOf(FrameBodyWOAR.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_URL_ARTIST_WEB, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
@@ -83,7 +83,7 @@ public void testCreateID3v24Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -97,7 +97,7 @@ public void testSaveToFile() throws Exception {
ID3v24Frame frame = (ID3v24Frame) mp3File
.getID3v2Tag()
.getFrame(ID3v24Frames.FRAME_ID_URL_ARTIST_WEB);
- assertTrue(frame.getBody() instanceof FrameBodyWOAR);
+ assertInstanceOf(FrameBodyWOAR.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_URL_ARTIST_WEB, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
@@ -122,7 +122,7 @@ public void testCreateID3v24UnicodeFrame() {
exceptionCaught = e;
}
assertNull(exceptionCaught);
- assertTrue(frame.getBody() instanceof FrameBodyWOAR);
+ assertInstanceOf(FrameBodyWOAR.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_URL_ARTIST_WEB, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
@@ -140,7 +140,7 @@ public void testCreateID3v24UnicodeFrame() {
//This fails beccause cant save Unicode to WOAR fields
@Test
public void testSaveUnicodeToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -154,7 +154,7 @@ public void testSaveUnicodeToFile() throws Exception {
ID3v24Frame frame = (ID3v24Frame) mp3File
.getID3v2Tag()
.getFrame(ID3v24Frames.FRAME_ID_URL_ARTIST_WEB);
- assertTrue(frame.getBody() instanceof FrameBodyWOAR);
+ assertInstanceOf(FrameBodyWOAR.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_URL_ARTIST_WEB, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
@@ -172,7 +172,7 @@ public void testSaveUnicodeToFile() throws Exception {
//This fails beccause cant save Unicode to WOAR fields
@Test
public void testSaveUnicodeToFile2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -186,7 +186,7 @@ public void testSaveUnicodeToFile2() throws Exception {
ID3v24Frame frame = (ID3v24Frame) mp3File
.getID3v2Tag()
.getFrame(ID3v24Frames.FRAME_ID_URL_ARTIST_WEB);
- assertTrue(frame.getBody() instanceof FrameBodyWOAR);
+ assertInstanceOf(FrameBodyWOAR.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_URL_ARTIST_WEB, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
diff --git a/src/test/java/org/jaudiotagger/tag/id3/FrameWXXXTest.java b/src/test/java/org/jaudiotagger/tag/id3/FrameWXXXTest.java
index 8d11ec8..b8337a7 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/FrameWXXXTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/FrameWXXXTest.java
@@ -68,7 +68,7 @@ public void testCreateID3v24Frame() {
exceptionCaught = e;
}
assertNull(exceptionCaught);
- assertTrue(frame.getBody() instanceof FrameBodyWXXX);
+ assertInstanceOf(FrameBodyWXXX.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_USER_DEFINED_URL, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
@@ -82,7 +82,7 @@ public void testCreateID3v24Frame() {
@Test
public void testSaveToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -96,7 +96,7 @@ public void testSaveToFile() throws Exception {
ID3v24Frame frame = (ID3v24Frame) mp3File
.getID3v2Tag()
.getFrame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
- assertTrue(frame.getBody() instanceof FrameBodyWXXX);
+ assertInstanceOf(FrameBodyWXXX.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_USER_DEFINED_URL, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
@@ -118,7 +118,7 @@ public void testCreateID3v24UnicodeFrame() {
exceptionCaught = e;
}
assertNull(exceptionCaught);
- assertTrue(frame.getBody() instanceof FrameBodyWXXX);
+ assertInstanceOf(FrameBodyWXXX.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_USER_DEFINED_URL, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
@@ -140,7 +140,7 @@ public void testCreateID3v24UnicodeFrame() {
*/
@Test
public void testSaveUnicodeToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -154,7 +154,7 @@ public void testSaveUnicodeToFile() throws Exception {
ID3v24Frame frame = (ID3v24Frame) mp3File
.getID3v2Tag()
.getFrame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
- assertTrue(frame.getBody() instanceof FrameBodyWXXX);
+ assertInstanceOf(FrameBodyWXXX.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_USER_DEFINED_URL, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
@@ -176,7 +176,7 @@ public void testSaveUnicodeToFile() throws Exception {
*/
@Test
public void testSaveUnicodeToFile2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create and Save
@@ -190,7 +190,7 @@ public void testSaveUnicodeToFile2() throws Exception {
ID3v24Frame frame = (ID3v24Frame) mp3File
.getID3v2Tag()
.getFrame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
- assertTrue(frame.getBody() instanceof FrameBodyWXXX);
+ assertInstanceOf(FrameBodyWXXX.class, frame.getBody());
assertEquals(ID3v24Frames.FRAME_ID_USER_DEFINED_URL, frame.getIdentifier());
assertEquals(TextEncoding.ISO_8859_1, frame.getBody().getTextEncoding());
assertFalse(
diff --git a/src/test/java/org/jaudiotagger/tag/id3/ID3v11TagTest.java b/src/test/java/org/jaudiotagger/tag/id3/ID3v11TagTest.java
index a366985..5ea185a 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/ID3v11TagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/ID3v11TagTest.java
@@ -3,7 +3,8 @@
import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.TagOptionSingleton;
@@ -11,7 +12,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ID3v11TagTest {
+public class ID3v11TagTest extends AbstractBaseTestCase {
public static final String ARTIST = "artist";
public static final String ALBUM = "album";
@@ -54,7 +55,8 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
/**
*
@@ -65,7 +67,8 @@ protected void tearDown() {}
/////////////////////////////////////////////////////////////////////////
// Tests
- /////////////////////////////////////////////////////////////////////////
+
+ /// //////////////////////////////////////////////////////////////////////
@Test
public void testCreateID3v11Tag() throws Exception {
ID3v11Tag v11Tag = new ID3v11Tag();
@@ -176,8 +179,8 @@ public void testNewInterface() {
assertEquals(
"artist",
((TagTextField) (v1Tag
- .getFields(FieldKey.ARTIST.name())
- .get(0))).getContent()
+ .getFields(FieldKey.ARTIST.name())
+ .get(0))).getContent()
);
v1Tag.setField(new ID3v1TagField(FieldKey.ALBUM.name(), "album"));
@@ -301,12 +304,12 @@ public void testNewInterface() {
} catch (Exception e) {
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
@Test
public void testSaveID3v11TagToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create v11 Tag
diff --git a/src/test/java/org/jaudiotagger/tag/id3/ID3v1TagTest.java b/src/test/java/org/jaudiotagger/tag/id3/ID3v1TagTest.java
index 8c4ee63..d773e0b 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/ID3v1TagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/ID3v1TagTest.java
@@ -3,7 +3,8 @@
import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.mp3.MP3File;
@@ -14,7 +15,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ID3v1TagTest {
+public class ID3v1TagTest extends AbstractBaseTestCase {
public static final String ARTIST = "artist";
public static final String ALBUM = "album";
@@ -24,23 +25,6 @@ public class ID3v1TagTest {
public static final String GENRE_VAL = "Country";
public static final String YEAR = "1971";
- /**
- * Provides an initialised object to be used in other tests
- * to prevent code duplication
- *
- * @return ID3v1Tag
- */
- public static ID3v1Tag getInitialisedTag() {
- ID3v1Tag v1Tag = new ID3v1Tag();
- v1Tag.setArtist(ID3v1TagTest.ARTIST);
- v1Tag.setAlbum(ID3v1TagTest.ALBUM);
- v1Tag.setComment(ID3v1TagTest.COMMENT);
- v1Tag.setTitle(ID3v1TagTest.TITLE);
- v1Tag.setGenre(ID3v1TagTest.GENRE_VAL);
- v1Tag.setYear(ID3v1TagTest.YEAR);
- return v1Tag;
- }
-
/////////////////////////////////////////////////////////////////////////
// TestCase classes to override
/////////////////////////////////////////////////////////////////////////
@@ -56,7 +40,8 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
/**
*
@@ -67,7 +52,8 @@ protected void tearDown() {}
/////////////////////////////////////////////////////////////////////////
// Tests
- /////////////////////////////////////////////////////////////////////////
+
+ /// //////////////////////////////////////////////////////////////////////
@Test
public void testCreateID3v1Tag() {
ID3v1Tag v1Tag = new ID3v1Tag();
@@ -119,7 +105,7 @@ public void testCreateID3v1Tag() {
@Test
public void testSaveID3v1TagToFile() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
//Create v1 Tag
@@ -154,7 +140,7 @@ public void testSaveID3v1TagToFile() throws Exception {
@Test
public void testSaveID3v1TagToFileUsingTagInterface() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
AudioFile file = AudioFileIO.read(testFile);
//Create v1 Tag
@@ -233,8 +219,8 @@ public void testNewInterface() {
assertEquals(
"artist",
((TagTextField) (v1Tag
- .getFields(FieldKey.ARTIST.name())
- .get(0))).getContent()
+ .getFields(FieldKey.ARTIST.name())
+ .get(0))).getContent()
);
v1Tag.setField(new ID3v1TagField(FieldKey.ALBUM.name(), "album"));
@@ -320,6 +306,6 @@ public void testNewInterface() {
} catch (Exception e) {
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof IllegalArgumentException);
+ assertInstanceOf(IllegalArgumentException.class, exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/id3/ID3v22TagTest.java b/src/test/java/org/jaudiotagger/tag/id3/ID3v22TagTest.java
index 0f4d20d..be2594a 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/ID3v22TagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/ID3v22TagTest.java
@@ -4,7 +4,8 @@
import java.io.File;
import java.util.List;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.mp3.MP3File;
@@ -14,8 +15,9 @@
import org.jaudiotagger.tag.id3.framebody.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class ID3v22TagTest {
+public class ID3v22TagTest extends AbstractBaseTestCase {
/////////////////////////////////////////////////////////////////////////
// TestCase classes to override
@@ -32,7 +34,8 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
/**
*
@@ -43,7 +46,8 @@ protected void tearDown() {}
/////////////////////////////////////////////////////////////////////////
// Tests
- /////////////////////////////////////////////////////////////////////////
+
+ /// //////////////////////////////////////////////////////////////////////
@Test
public void testCreateIDv22Tag() {
ID3v22Tag v2Tag = new ID3v22Tag();
@@ -61,47 +65,47 @@ public void testCreateID3v22FromID3v11() {
assertEquals(
ID3v11TagTest.ARTIST,
((FrameBodyTPE1) ((ID3v22Frame) v2Tag.getFrame(
- ID3v22Frames.FRAME_ID_V2_ARTIST
- )).getBody()).getText()
+ ID3v22Frames.FRAME_ID_V2_ARTIST
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.ALBUM,
((FrameBodyTALB) ((ID3v22Frame) v2Tag.getFrame(
- ID3v22Frames.FRAME_ID_V2_ALBUM
- )).getBody()).getText()
+ ID3v22Frames.FRAME_ID_V2_ALBUM
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.COMMENT,
((FrameBodyCOMM) ((ID3v22Frame) v2Tag.getFrame(
- ID3v22Frames.FRAME_ID_V2_COMMENT
- )).getBody()).getText()
+ ID3v22Frames.FRAME_ID_V2_COMMENT
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.TITLE,
((FrameBodyTIT2) ((ID3v22Frame) v2Tag.getFrame(
- ID3v22Frames.FRAME_ID_V2_TITLE
- )).getBody()).getText()
+ ID3v22Frames.FRAME_ID_V2_TITLE
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.TRACK_VALUE,
String.valueOf(
((FrameBodyTRCK) ((ID3v22Frame) v2Tag.getFrame(
- ID3v22Frames.FRAME_ID_V2_TRACK
- )).getBody()).getTrackNo()
+ ID3v22Frames.FRAME_ID_V2_TRACK
+ )).getBody()).getTrackNo()
)
);
assertTrue(
((FrameBodyTCON) ((ID3v22Frame) v2Tag.getFrame(
- ID3v22Frames.FRAME_ID_V2_GENRE
- )).getBody()).getText().endsWith(ID3v11TagTest.GENRE_VAL)
+ ID3v22Frames.FRAME_ID_V2_GENRE
+ )).getBody()).getText().endsWith(ID3v11TagTest.GENRE_VAL)
);
//TODO:Note confusingly V22 YEAR Frame shave v2 identifier but use TDRC behind the scenes, is confusing
assertEquals(
ID3v11TagTest.YEAR,
((FrameBodyTDRC) ((ID3v22Frame) v2Tag.getFrame(
- ID3v22Frames.FRAME_ID_V2_TYER
- )).getBody()).getText()
+ ID3v22Frames.FRAME_ID_V2_TYER
+ )).getBody()).getText()
);
assertEquals((byte) 2, v2Tag.getRelease());
@@ -113,7 +117,7 @@ public void testCreateID3v22FromID3v11() {
public void testCreateIDv22TagAndSave() {
Exception exception = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v22Tag v2Tag = new ID3v22Tag();
v2Tag.setField(FieldKey.TITLE, "fred");
@@ -149,15 +153,11 @@ public void testCreateIDv22TagAndSave() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testv22TagWithUnneccessaryTrailingNulls() {
- File orig = new File("testdata", "test24.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception exception = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test24.mp3");
+ File testFile = copyAudioToTmp("test24.mp3");
AudioFile af = AudioFileIO.read(testFile);
MP3File m = (MP3File) af;
@@ -251,7 +251,6 @@ public void testv22TagWithUnneccessaryTrailingNulls() {
frame = (ID3v22Frame) v2Tag.getFrame(ID3v22Frames.FRAME_ID_V2_TRACK);
assertEquals("01/11:", ((FrameBodyTRCK) frame.getBody()).getText() + ":");
} catch (Exception e) {
- e.printStackTrace();
exception = e;
}
assertNull(exception);
@@ -259,7 +258,7 @@ public void testv22TagWithUnneccessaryTrailingNulls() {
@Test
public void testDeleteFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v22Tag v2Tag = new ID3v22Tag();
mp3File.setID3v2Tag(v2Tag);
@@ -295,7 +294,7 @@ public void testDeleteFields() throws Exception {
@Test
public void testWriteMultipleGenresToID3v22TagUsingDefault()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File file = null;
file = new MP3File(testFile);
assertNull(file.getID3v1Tag());
@@ -340,7 +339,7 @@ public void testWriteMultipleGenresToID3v22TagUsingDefault()
@Test
public void testWriteMultipleGenresToID3v22TagUsingCreateField()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File file = null;
file = new MP3File(testFile);
assertNull(file.getID3v1Tag());
@@ -393,7 +392,7 @@ public void testWriteMultipleGenresToID3v22TagUsingCreateField()
@Test
public void testWriteMultipleGenresToID3v22TagUsingV22CreateField()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File file = null;
file = new MP3File(testFile);
assertNull(file.getID3v1Tag());
diff --git a/src/test/java/org/jaudiotagger/tag/id3/ID3v23TagTest.java b/src/test/java/org/jaudiotagger/tag/id3/ID3v23TagTest.java
index b2f8f70..69823bc 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/ID3v23TagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/ID3v23TagTest.java
@@ -19,7 +19,6 @@
import java.io.File;
import java.util.List;
-import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.FilePermissionsTest;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
@@ -31,19 +30,18 @@
import org.jaudiotagger.tag.id3.framebody.*;
import org.junit.jupiter.api.Test;
-public class ID3v23TagTest {
+public class ID3v23TagTest extends FilePermissionsTest {
@Test
public void testReadID3v1ID3v23Tag() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v1v2.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128ID3v1v2.mp3");
MP3File mp3File = null;
try {
mp3File = new MP3File(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -55,14 +53,13 @@ public void testReadID3v1ID3v23Tag() {
@Test
public void testReadID3v23Tag() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128ID3v2.mp3");
MP3File mp3File = null;
try {
mp3File = new MP3File(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -74,7 +71,7 @@ public void testReadID3v23Tag() {
@Test
public void testReadPaddedID3v23Tag() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2pad.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128ID3v2pad.mp3");
MP3File mp3File = null;
@@ -92,7 +89,7 @@ public void testReadPaddedID3v23Tag() {
@Test
public void testDeleteID3v23Tag() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v1v2.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128ID3v1v2.mp3");
MP3File mp3File = null;
@@ -135,45 +132,45 @@ public void testCreateID3v23FromID3v11() {
assertEquals(
ID3v11TagTest.ARTIST,
((FrameBodyTPE1) ((ID3v23Frame) v2Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_ARTIST
- )).getBody()).getText()
+ ID3v23Frames.FRAME_ID_V3_ARTIST
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.ALBUM,
((FrameBodyTALB) ((ID3v23Frame) v2Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_ALBUM
- )).getBody()).getText()
+ ID3v23Frames.FRAME_ID_V3_ALBUM
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.COMMENT,
((FrameBodyCOMM) ((ID3v23Frame) v2Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_COMMENT
- )).getBody()).getText()
+ ID3v23Frames.FRAME_ID_V3_COMMENT
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.TITLE,
((FrameBodyTIT2) ((ID3v23Frame) v2Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_TITLE
- )).getBody()).getText()
+ ID3v23Frames.FRAME_ID_V3_TITLE
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.TRACK_VALUE,
String.valueOf(
((FrameBodyTRCK) ((ID3v23Frame) v2Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_TRACK
- )).getBody()).getTrackNo()
+ ID3v23Frames.FRAME_ID_V3_TRACK
+ )).getBody()).getTrackNo()
)
);
assertTrue(
((FrameBodyTCON) ((ID3v23Frame) v2Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_GENRE
- )).getBody()).getText().endsWith(ID3v11TagTest.GENRE_VAL)
+ ID3v23Frames.FRAME_ID_V3_GENRE
+ )).getBody()).getText().endsWith(ID3v11TagTest.GENRE_VAL)
);
assertEquals(
ID3v11TagTest.YEAR,
((FrameBodyTYER) ((ID3v23Frame) v2Tag.getFrame(
- ID3v23Frames.FRAME_ID_V3_TYER
- )).getBody()).getText()
+ ID3v23Frames.FRAME_ID_V3_TYER
+ )).getBody()).getText()
);
assertEquals((byte) 2, v2Tag.getRelease());
@@ -190,7 +187,7 @@ public void testCreateID3v23FromID3v11() {
*/
@Test
public void testCreateID3v23FromID3v24knownInV3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = null;
mp3File = new MP3File(testFile);
@@ -211,7 +208,7 @@ public void testCreateID3v23FromID3v24knownInV3() throws Exception {
ID3v23Tag v23tag = new ID3v23Tag(mp3File.getID3v2TagAsv24());
ID3v23Frame v23frame = (ID3v23Frame) v23tag.getFrame("TIT2");
assertNotNull(v23frame);
- assertTrue(v23frame.getBody() instanceof FrameBodyTIT2);
+ assertInstanceOf(FrameBodyTIT2.class, v23frame.getBody());
//Save as v23 tag (side effect convert v23 to v24 tag as well)
mp3File.setID3v2Tag(v23tag);
@@ -224,7 +221,7 @@ public void testCreateID3v23FromID3v24knownInV3() throws Exception {
v23tag = (ID3v23Tag) mp3File.getID3v2Tag();
v23frame = (ID3v23Frame) v23tag.getFrame("TIT2");
assertNotNull(v23frame);
- assertTrue(v23frame.getBody() instanceof FrameBodyTIT2);
+ assertInstanceOf(FrameBodyTIT2.class, v23frame.getBody());
//Save as v23 tag (side effect convert v23 to v24 tag as well)
mp3File.setID3v2Tag(v23tag);
@@ -234,8 +231,8 @@ public void testCreateID3v23FromID3v24knownInV3() throws Exception {
assertEquals(
"title",
((FrameBodyTIT2) ((ID3v24Frame) mp3File
- .getID3v2TagAsv24()
- .getFrame("TIT2")).getBody()).getText()
+ .getID3v2TagAsv24()
+ .getFrame("TIT2")).getBody()).getText()
);
}
@@ -248,7 +245,7 @@ public void testCreateID3v23FromID3v24knownInV3() throws Exception {
*/
@Test
public void testCreateID3v23FromID3v24UnknownInV3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = null;
mp3File = new MP3File(testFile);
@@ -269,7 +266,7 @@ public void testCreateID3v23FromID3v24UnknownInV3() throws Exception {
ID3v23Tag v23tag = new ID3v23Tag(mp3File.getID3v2TagAsv24());
ID3v23Frame v23frame = (ID3v23Frame) v23tag.getFrame("TDRL");
assertNotNull(v23frame);
- assertTrue(v23frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, v23frame.getBody());
//Save as v23 tag (side effect convert v23 to v24 tag as well)
mp3File.setID3v2Tag(v23tag);
@@ -282,7 +279,7 @@ public void testCreateID3v23FromID3v24UnknownInV3() throws Exception {
v23tag = (ID3v23Tag) mp3File.getID3v2Tag();
v23frame = (ID3v23Frame) v23tag.getFrame("TDRL");
assertNotNull(v23frame);
- assertTrue(v23frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, v23frame.getBody());
//Save as v23 tag (side effect convert v23 to v24 tag as well)
mp3File.setID3v2Tag(v23tag);
@@ -313,7 +310,7 @@ public void testCreateID3v23FromID3v24UnknownInV3() throws Exception {
v23tag = (ID3v23Tag) mp3File.getID3v2Tag();
v23frame = (ID3v23Frame) v23tag.getFrame("TDRL");
assertNotNull(v23frame);
- assertTrue(v23frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, v23frame.getBody());
//Check value maintained, can only see as bytes
v23FrameBody = (FrameBodyUnsupported) v23frame.getBody();
@@ -345,7 +342,7 @@ public void testCreateID3v23FromID3v24UnknownInV3() throws Exception {
v23tag = (ID3v23Tag) mp3File.getID3v2Tag();
v23frame = (ID3v23Frame) v23tag.getFrame("TDRL");
assertNotNull(v23frame);
- assertTrue(v23frame.getBody() instanceof FrameBodyUnsupported);
+ assertInstanceOf(FrameBodyUnsupported.class, v23frame.getBody());
//Check value maintained, can only see as bytes
v23FrameBody = (FrameBodyUnsupported) v23frame.getBody();
@@ -369,7 +366,7 @@ public void testCreateID3v23FromID3v24UnknownInV3() throws Exception {
@Test
public void testDeleteFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Tag v2Tag = new ID3v23Tag();
mp3File.setID3v2Tag(v2Tag);
@@ -404,7 +401,7 @@ public void testDeleteFields() throws Exception {
@Test
public void testWriteWriteProtectedFileWithCheckEnabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckEnabled(
+ runWriteWriteProtectedFileWithCheckEnabled(
"testV1Cbr128ID3v2.mp3"
);
}
@@ -412,7 +409,7 @@ public void testWriteWriteProtectedFileWithCheckEnabled() throws Exception {
@Test
public void testWriteMultipleGenresToID3v23TagUsingDefault()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1Cbr128ID3v2.mp3");
+ File testFile = copyAudioToTmp("testV1Cbr128ID3v2.mp3");
MP3File file = null;
file = new MP3File(testFile);
assertNull(file.getID3v1Tag());
@@ -456,7 +453,7 @@ public void testWriteMultipleGenresToID3v23TagUsingDefault()
@Test
public void testWriteMultipleGenresToID3v23TagUsingCreateField()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File file = null;
file = new MP3File(testFile);
assertNull(file.getID3v1Tag());
@@ -509,7 +506,7 @@ public void testWriteMultipleGenresToID3v23TagUsingCreateField()
@Test
public void testWriteMultipleGenresToID3v23TagUsingV23CreateField()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File file = null;
file = new MP3File(testFile);
assertNull(file.getID3v1Tag());
diff --git a/src/test/java/org/jaudiotagger/tag/id3/ID3v24TagTest.java b/src/test/java/org/jaudiotagger/tag/id3/ID3v24TagTest.java
index f5e2a42..7e90e79 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/ID3v24TagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/ID3v24TagTest.java
@@ -19,7 +19,8 @@
import java.io.File;
import java.util.List;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.mp3.MP3File;
@@ -29,8 +30,9 @@
import org.jaudiotagger.tag.id3.framebody.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class ID3v24TagTest {
+public class ID3v24TagTest extends AbstractBaseTestCase {
/////////////////////////////////////////////////////////////////////////
// TestCase classes to override
@@ -47,7 +49,8 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
/**
*
@@ -58,7 +61,8 @@ protected void tearDown() {}
/////////////////////////////////////////////////////////////////////////
// Tests
- /////////////////////////////////////////////////////////////////////////
+
+ /// //////////////////////////////////////////////////////////////////////
@Test
public void testCreateTag() {
ID3v24Tag tag = new ID3v24Tag();
@@ -68,14 +72,13 @@ public void testCreateTag() {
@Test
public void testCreateID3v24FromID3v11AndSave() {
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = null;
try {
mp3File = new MP3File(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -92,24 +95,22 @@ public void testCreateID3v24FromID3v11AndSave() {
try {
mp3File.save();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
assertTrue(mp3File.hasID3v1Tag());
assertTrue(mp3File.hasID3v2Tag());
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getID3v2Tag());
//Reload
try {
mp3File = new MP3File(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertTrue(mp3File.hasID3v1Tag());
assertTrue(mp3File.hasID3v2Tag());
- assertTrue(mp3File.getID3v2Tag() instanceof ID3v24Tag);
+ assertInstanceOf(ID3v24Tag.class, mp3File.getID3v2Tag());
}
@Test
@@ -129,45 +130,45 @@ public void testCreateID3v24FromID3v11() {
assertEquals(
ID3v11TagTest.ARTIST,
((FrameBodyTPE1) ((ID3v24Frame) v2Tag.getFrame(
- ID3v24Frames.FRAME_ID_ARTIST
- )).getBody()).getText()
+ ID3v24Frames.FRAME_ID_ARTIST
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.ALBUM,
((FrameBodyTALB) ((ID3v24Frame) v2Tag.getFrame(
- ID3v24Frames.FRAME_ID_ALBUM
- )).getBody()).getText()
+ ID3v24Frames.FRAME_ID_ALBUM
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.COMMENT,
((FrameBodyCOMM) ((ID3v24Frame) v2Tag.getFrame(
- ID3v24Frames.FRAME_ID_COMMENT
- )).getBody()).getText()
+ ID3v24Frames.FRAME_ID_COMMENT
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.TITLE,
((FrameBodyTIT2) ((ID3v24Frame) v2Tag.getFrame(
- ID3v24Frames.FRAME_ID_TITLE
- )).getBody()).getText()
+ ID3v24Frames.FRAME_ID_TITLE
+ )).getBody()).getText()
);
assertEquals(
ID3v11TagTest.TRACK_VALUE,
String.valueOf(
((FrameBodyTRCK) ((ID3v24Frame) v2Tag.getFrame(
- ID3v24Frames.FRAME_ID_TRACK
- )).getBody()).getTrackNo()
+ ID3v24Frames.FRAME_ID_TRACK
+ )).getBody()).getTrackNo()
)
);
assertTrue(
((FrameBodyTCON) ((ID3v24Frame) v2Tag.getFrame(
- ID3v24Frames.FRAME_ID_GENRE
- )).getBody()).getText().endsWith(ID3v11TagTest.GENRE_VAL)
+ ID3v24Frames.FRAME_ID_GENRE
+ )).getBody()).getText().endsWith(ID3v11TagTest.GENRE_VAL)
);
assertEquals(
ID3v11TagTest.YEAR,
((FrameBodyTDRC) ((ID3v24Frame) v2Tag.getFrame(
- ID3v24Frames.FRAME_ID_YEAR
- )).getBody()).getText()
+ ID3v24Frames.FRAME_ID_YEAR
+ )).getBody()).getText()
);
assertEquals((byte) 2, v2Tag.getRelease());
assertEquals((byte) 4, v2Tag.getMajorVersion());
@@ -193,8 +194,8 @@ public void testCreateID3v24FromID3v11() {
assertEquals(
ID3v11TagTest.ARTIST,
((AbstractFrameBodyTextInfo) v2Tag
- .getFirstField(ID3v24Frames.FRAME_ID_ARTIST)
- .getBody()).getFirstTextValue()
+ .getFirstField(ID3v24Frames.FRAME_ID_ARTIST)
+ .getBody()).getFirstTextValue()
);
}
@@ -207,9 +208,9 @@ public void testCreateID3v24FromID3v11() {
*/
@Test
public void testWriteMultipleTextFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteMultipleText.mp3")
+ "testWriteMultipleText.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -274,9 +275,9 @@ public void testWriteMultipleTextFields() throws Exception {
*/
@Test
public void testWriteMultipleTextTXXXFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteMultipleTextTXXX.mp3")
+ "testWriteMultipleTextTXXX.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -304,9 +305,9 @@ public void testWriteMultipleTextTXXXFields() throws Exception {
*/
@Test
public void testWriteMultipleDifferentTextTXXXFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteMultipleTextTXXX.mp3")
+ "testWriteMultipleTextTXXX.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -331,9 +332,9 @@ public void testWriteMultipleDifferentTextTXXXFields() throws Exception {
@Test
public void testWriteMultipleFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteMultiple.mp3")
+ "testWriteMultiple.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -368,7 +369,7 @@ public void testWriteMultipleFields() throws Exception {
@Test
public void testDeleteFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Tag v2Tag = new ID3v23Tag();
mp3File.setID3v2Tag(v2Tag);
@@ -407,14 +408,10 @@ public void testDeleteFields() throws Exception {
* @throws Exception
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testDeleteTag() throws Exception {
- File orig = new File("testdata", "test70.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test70.mp3");
+ File testFile = copyAudioToTmp("test70.mp3");
MP3File audioFile = new MP3File(testFile);
ID3v1Tag v1tag = audioFile.getID3v1Tag();
@@ -433,16 +430,12 @@ public void testDeleteTag() throws Exception {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteTagUsingAudioIOMethod() {
- File orig = new File("testdata", "test70.mp3");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test70.mp3");
+ File testFile = copyAudioToTmp("test70.mp3");
MP3File audioFile = new MP3File(testFile);
AudioFileIO.write(audioFile);
} catch (Exception e) {
@@ -454,9 +447,9 @@ public void testWriteTagUsingAudioIOMethod() {
@Test
public void testWriteMultipleGenresToID3v24TagUsingDefault()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteMultipleV24.mp3")
+ "testWriteMultipleV24.mp3"
);
AudioFile file = AudioFileIO.read(testFile);
assertNull(file.getTag());
@@ -499,7 +492,7 @@ public void testWriteMultipleGenresToID3v24TagUsingDefault()
@Test
public void testWriteMultipleGenresToID3v24TagUsingCreateField()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File file = null;
file = new MP3File(testFile);
assertNull(file.getID3v1Tag());
@@ -552,7 +545,7 @@ public void testWriteMultipleGenresToID3v24TagUsingCreateField()
@Test
public void testWriteMultipleGenresToID3v24TagUsingV24CreateField()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File file = null;
file = new MP3File(testFile);
assertNull(file.getID3v1Tag());
diff --git a/src/test/java/org/jaudiotagger/tag/id3/ItunesTest.java b/src/test/java/org/jaudiotagger/tag/id3/ItunesTest.java
index e1fb88a..406c8e8 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/ItunesTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/ItunesTest.java
@@ -36,7 +36,7 @@ protected void tearDown() {}
*/
@Test
public void testv24TagWithNonSyncSafeFrame() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue96-1.id3",
"testV1.mp3"
);
@@ -59,7 +59,7 @@ public void testv24TagWithNonSyncSafeFrame() throws Exception {
*/
@Test
public void testv24TagWithNonSyncSafeFrame2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue96-3.id3",
"testV1.mp3"
);
@@ -83,7 +83,7 @@ public void testv24TagWithNonSyncSafeFrame2() throws Exception {
*/
@Test
public void testv24TagWithNonSyncSafeFrame3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue96-4.id3",
"testV1.mp3"
);
@@ -105,7 +105,7 @@ public void testv24TagWithNonSyncSafeFrame3() throws Exception {
*/
@Test
public void testv24TagWithSyncSafeFrame() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue96-2.id3",
"testV1.mp3"
);
@@ -128,7 +128,7 @@ public void testv24TagWithSyncSafeFrame() throws Exception {
*/
@Test
public void testCanIgnoreSpuriousNullCharacters() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue92.id3",
"testV1.mp3"
);
@@ -191,7 +191,7 @@ public void testCanIgnoreSpuriousNullCharacters() throws Exception {
*/
@Test
public void testCanReadEmptyString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue92-2.id3",
"testV1.mp3"
);
@@ -212,7 +212,7 @@ public void testCanReadEmptyString() throws Exception {
public void testCanFindStartOfMp3AudioWithinUTF16LETag() throws Exception {
long START_OF_AUDIO_LOCATION = 2048;
int FRAME_COUNT = 11;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue104-1.id3",
"testV1.mp3"
);
@@ -238,7 +238,7 @@ public void testCanFindStartOfMp3AudioWithinUTF16LETag() throws Exception {
*/
@Test
public void testv24TagWithlargeSyncSafeFrameAndNoPadding() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"issue115.id3",
"testV1.mp3"
);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/NewInterfaceTest.java b/src/test/java/org/jaudiotagger/tag/id3/NewInterfaceTest.java
index 6070e84..1f1fdf4 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/NewInterfaceTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/NewInterfaceTest.java
@@ -11,7 +11,8 @@
import java.util.List;
import java.util.NoSuchElementException;
import javax.imageio.ImageIO;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.mp3.MP3File;
@@ -24,13 +25,13 @@
import org.jaudiotagger.tag.id3.valuepair.TextEncoding;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class NewInterfaceTest {
-
- private static final String V1_ARTIST = "V1ARTIST";
+public class NewInterfaceTest extends AbstractBaseTestCase {
public static final String ALBUM_TEST_STRING = "mellow gold";
public static final String ALBUM_TEST_STRING2 = "odelay";
+ private static final String V1_ARTIST = "V1ARTIST";
/**
*
@@ -43,15 +44,16 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
@Test
public void testBasicWrite() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testBasicWrite.mp3")
+ "testBasicWrite.mp3"
);
org.jaudiotagger.audio.AudioFile audioFile =
org.jaudiotagger.audio.AudioFileIO.read(testFile);
@@ -89,8 +91,8 @@ public void testBasicWrite() {
assertEquals("year", newTag.getFirst(FieldKey.YEAR));
assertEquals("1", newTag.getFirst(FieldKey.TRACK));
AbstractTagFrameBody body = (((ID3v23Frame) newTag.getFirstField(
- ID3v23FieldKey.ALBUM.getFrameId()
- )).getBody());
+ ID3v23FieldKey.ALBUM.getFrameId()
+ )).getBody());
assertEquals(TextEncoding.ISO_8859_1, body.getTextEncoding());
TagOptionSingleton.getInstance().setId3v23DefaultTextEncoding(
@@ -110,8 +112,8 @@ public void testBasicWrite() {
assertEquals("year", newTag.getFirst(FieldKey.YEAR));
assertEquals("1", newTag.getFirst(FieldKey.TRACK));
body = (((ID3v23Frame) newTag.getFirstField(
- ID3v23FieldKey.ALBUM.getFrameId()
- )).getBody());
+ ID3v23FieldKey.ALBUM.getFrameId()
+ )).getBody());
assertEquals(TextEncoding.UTF_16, body.getTextEncoding());
TagOptionSingleton.getInstance().setId3v23DefaultTextEncoding(
@@ -124,8 +126,8 @@ public void testBasicWrite() {
audioFile = org.jaudiotagger.audio.AudioFileIO.read(testFile);
newTag = audioFile.getTag();
body = (((ID3v23Frame) newTag.getFirstField(
- ID3v23FieldKey.ALBUM.getFrameId()
- )).getBody());
+ ID3v23FieldKey.ALBUM.getFrameId()
+ )).getBody());
assertEquals(TextEncoding.ISO_8859_1, body.getTextEncoding());
TagOptionSingleton.getInstance().setResetTextEncodingForExistingFrames(
false
@@ -140,9 +142,9 @@ public void testBasicWrite() {
@Test
public void testNewInterfaceBasicReadandWriteID3v1() throws Exception {
Exception e = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testnewIntId3v1.mp3")
+ "testnewIntId3v1.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -192,9 +194,9 @@ public void testNewInterfaceBasicReadandWriteID3v1() throws Exception {
@Test
public void testNewInterfaceBasicReadandWriteID3v24() throws Exception {
Exception e = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testnewIntId3v24.mp3")
+ "testnewIntId3v24.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -497,8 +499,8 @@ public void testNewInterfaceBasicReadandWriteID3v24() throws Exception {
assertEquals(
"releaseid",
((TagTextField) af
- .getTag()
- .getFirstField(FieldKey.MUSICBRAINZ_RELEASEID)).getContent()
+ .getTag()
+ .getFirstField(FieldKey.MUSICBRAINZ_RELEASEID)).getContent()
);
assertEquals(
"asin123456" + "\u01ff",
@@ -529,11 +531,11 @@ public void testNewInterfaceBasicReadandWriteID3v24() throws Exception {
} catch (java.lang.UnsupportedOperationException uoe) {
e = uoe;
}
- assertTrue(e instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, e);
//Add new image correctly
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -553,20 +555,20 @@ public void testNewInterfaceBasicReadandWriteID3v24() throws Exception {
assertEquals(
"image/png::18545",
((TagTextField) af
- .getTag()
- .getFirstField(FieldKey.COVER_ART)).getContent()
+ .getTag()
+ .getFirstField(FieldKey.COVER_ART)).getContent()
);
- assertTrue(tagField instanceof ID3v24Frame);
+ assertInstanceOf(ID3v24Frame.class, tagField);
ID3v24Frame apicFrame = (ID3v24Frame) tagField;
- assertTrue(apicFrame.getBody() instanceof FrameBodyAPIC);
+ assertInstanceOf(FrameBodyAPIC.class, apicFrame.getBody());
FrameBodyAPIC apicframebody = (FrameBodyAPIC) apicFrame.getBody();
assertFalse(apicframebody.isImageUrl());
assertEquals(10, af.getTag().getFieldCount());
//Add another image correctly
imageFile = new RandomAccessFile(
- new File("testdata", "coverart_small.png"),
+ fileResource("testdata", "coverart_small.png"),
"r"
);
imagedata = new byte[(int) imageFile.length()];
@@ -604,7 +606,7 @@ public void testNewInterfaceBasicReadandWriteID3v24() throws Exception {
List imageFields = af.getTag().getFields(FieldKey.COVER_ART);
tagField = imageFields.get(2);
apicFrame = (ID3v24Frame) tagField;
- assertTrue(apicFrame.getBody() instanceof FrameBodyAPIC);
+ assertInstanceOf(FrameBodyAPIC.class, apicFrame.getBody());
apicframebody = (FrameBodyAPIC) apicFrame.getBody();
assertTrue(apicframebody.isImageUrl());
assertEquals("../testdata/coverart.jpg", apicframebody.getImageUrl());
@@ -615,7 +617,7 @@ public void testNewInterfaceBasicReadandWriteID3v24() throws Exception {
Exception ex = null;
try
{
- File testFile = AbstractTestCase.copyAudioToTmp("testV1withurlimage.mp3");
+ File testFile = copyAudioToTmp("testV1withurlimage.mp3");
org.jaudiotagger.audio.AudioFile audioFile = org.jaudiotagger.audio.AudioFileIO.read(testFile);
ID3v23Tag newTag = (ID3v23Tag)audioFile.getTag();
assertEquals(1, newTag.getFields(FieldKey.COVER_ART).size());
@@ -637,9 +639,9 @@ public void testNewInterfaceBasicReadandWriteID3v24() throws Exception {
@Test
public void testNewInterfaceBasicReadandWriteID3v23() throws Exception {
Exception e = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testnewIntId3v23.mp3")
+ "testnewIntId3v23.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -927,11 +929,11 @@ public void testNewInterfaceBasicReadandWriteID3v23() throws Exception {
} catch (java.lang.UnsupportedOperationException uoe) {
e = uoe;
}
- assertTrue(e instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, e);
//Add new image correctly
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -944,7 +946,7 @@ public void testNewInterfaceBasicReadandWriteID3v23() throws Exception {
//Add another image correctly
imageFile = new RandomAccessFile(
- new File("testdata", "coverart_small.png"),
+ fileResource("testdata", "coverart_small.png"),
"r"
);
imagedata = new byte[(int) imageFile.length()];
@@ -959,9 +961,9 @@ public void testNewInterfaceBasicReadandWriteID3v23() throws Exception {
@Test
public void testNewInterfaceBasicReadandWriteID3v22() throws Exception {
Exception e = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testnewIntId3v22.mp3")
+ "testnewIntId3v22.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -1244,11 +1246,11 @@ public void testNewInterfaceBasicReadandWriteID3v22() throws Exception {
} catch (java.lang.UnsupportedOperationException uoe) {
e = uoe;
}
- assertTrue(e instanceof UnsupportedOperationException);
+ assertInstanceOf(UnsupportedOperationException.class, e);
//Add new image correctly
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -1261,7 +1263,7 @@ public void testNewInterfaceBasicReadandWriteID3v22() throws Exception {
//Add another image correctly
imageFile = new RandomAccessFile(
- new File("testdata", "coverart_small.png"),
+ fileResource("testdata", "coverart_small.png"),
"r"
);
imagedata = new byte[(int) imageFile.length()];
@@ -1281,9 +1283,9 @@ public void testNewInterfaceBasicReadandWriteID3v22() throws Exception {
@Test
public void testSettingMultipleFramesofSameType() throws Exception {
Exception e = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testSetMultiple.mp3")
+ "testSetMultiple.mp3"
);
AudioFile af = AudioFileIO.read(testFile);
MP3File mp3File = (MP3File) af;
@@ -1311,8 +1313,8 @@ public void testSettingMultipleFramesofSameType() throws Exception {
//Add third Comment
List comments = af.getTag().getFields(FieldKey.COMMENT);
((FrameBodyCOMM) ((ID3v24Frame) comments.get(
- 1
- )).getBody()).setDescription("test2");
+ 1
+ )).getBody()).setDescription("test2");
af.getTag().setField(FieldKey.COMMENT, "Comment3");
af.commit();
af = AudioFileIO.read(testFile);
@@ -1456,14 +1458,10 @@ public void testSettingMultipleFramesofSameType() throws Exception {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIterator() throws Exception {
- File orig = new File("testdata", "test26.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception e = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test26.mp3");
+ File testFile = copyAudioToTmp("test26.mp3");
MP3File mp3File = new MP3File(testFile);
assertEquals(0, mp3File.getID3v2Tag().getFieldCount());
@@ -1474,7 +1472,7 @@ public void testIterator() throws Exception {
} catch (Exception ex) {
e = ex;
}
- assertTrue(e instanceof NoSuchElementException);
+ assertInstanceOf(NoSuchElementException.class, e);
mp3File.getID3v2Tag().addField(FieldKey.ALBUM, "album");
assertEquals(1, mp3File.getID3v2Tag().getFieldCount());
@@ -1487,7 +1485,7 @@ public void testIterator() throws Exception {
i = mp3File.getID3v2Tag().getFields();
assertTrue(i.hasNext());
Object o = i.next();
- assertTrue(o instanceof ID3v23Frame);
+ assertInstanceOf(ID3v23Frame.class, o);
assertEquals(
"album",
((AbstractFrameBodyTextInfo) (((ID3v23Frame) o).getBody())).getFirstTextValue()
@@ -1498,7 +1496,7 @@ public void testIterator() throws Exception {
} catch (Exception ex) {
e = ex;
}
- assertTrue(e instanceof NoSuchElementException);
+ assertInstanceOf(NoSuchElementException.class, e);
assertFalse(i.hasNext());
//Empty frame map and force adding of empty list
@@ -1518,9 +1516,9 @@ public void testIterator() throws Exception {
public void testGenres() {
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testBasicWrite.mp3")
+ "testBasicWrite.mp3"
);
org.jaudiotagger.audio.AudioFile audioFile =
org.jaudiotagger.audio.AudioFileIO.read(testFile);
@@ -1554,21 +1552,16 @@ public void testGenres() {
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testRemoveFrameOfType() {
- File orig = new File("testdata", "test30.mp3");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp("test30.mp3");
+ File testFile = copyAudioToTmp("test30.mp3");
MP3File mp3file = null;
try {
mp3file = new MP3File(testFile);
//deleteField multiple frames starting make change to file
mp3file.getID3v2Tag().removeFrameOfType("PRIV");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/SyncSafeIntegerTest.java b/src/test/java/org/jaudiotagger/tag/id3/SyncSafeIntegerTest.java
index 1db6b87..8f3da8c 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/SyncSafeIntegerTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/SyncSafeIntegerTest.java
@@ -17,7 +17,7 @@ public class SyncSafeIntegerTest extends AbstractTestCase {
public void testReadFileContainingLargeSyncSizedFrame() {
Exception e = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"issue158.id3",
"testV1.mp3"
);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/Unicode23NullTerminatedTagTest.java b/src/test/java/org/jaudiotagger/tag/id3/Unicode23NullTerminatedTagTest.java
index 101c582..542f639 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/Unicode23NullTerminatedTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/Unicode23NullTerminatedTagTest.java
@@ -4,7 +4,8 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.TagOptionSingleton;
import org.jaudiotagger.tag.id3.framebody.FrameBodyWXXX;
@@ -13,7 +14,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class Unicode23NullTerminatedTagTest {
+public class Unicode23NullTerminatedTagTest extends AbstractBaseTestCase {
/////////////////////////////////////////////////////////////////////////
// TestCase classes to override
@@ -30,7 +31,8 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
/**
*
@@ -51,7 +53,7 @@ protected void tearDown() {}
*/
@Test
public void testCreateISO8859EncodedNullTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(
@@ -102,7 +104,7 @@ public void testCreateISO8859EncodedNullTerminatedString() throws Exception {
@Test
public void testCreateUTF16BOMLEEncodedNullTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(
@@ -154,7 +156,7 @@ public void testCreateUTF16BOMLEEncodedNullTerminatedString()
public void testCreateUTF16BOMBEEncodedNullTerminatedString()
throws Exception {
TagOptionSingleton.getInstance().setEncodeUTF16BomAsLittleEndian(false);
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(
@@ -205,7 +207,7 @@ public void testCreateUTF16BOMBEEncodedNullTerminatedString()
@Test
public void testCreateUTF16AutoEncodedNullTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(
@@ -260,7 +262,7 @@ public void testCreateUTF16AutoEncodedNullTerminatedString()
*/
@Test
public void testCreateUTF16BEEncodedNullTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(
@@ -316,7 +318,7 @@ public void testCreateUTF16BEEncodedNullTerminatedString() throws Exception {
*/
@Test
public void testCreateUTF8EncodedNullTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(
diff --git a/src/test/java/org/jaudiotagger/tag/id3/Unicode23TagTest.java b/src/test/java/org/jaudiotagger/tag/id3/Unicode23TagTest.java
index 70a7416..c0f5efd 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/Unicode23TagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/Unicode23TagTest.java
@@ -7,7 +7,8 @@
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.TagOptionSingleton;
import org.jaudiotagger.tag.datatype.DataTypes;
@@ -17,7 +18,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class Unicode23TagTest {
+public class Unicode23TagTest extends AbstractBaseTestCase {
/////////////////////////////////////////////////////////////////////////
// TestCase classes to override
@@ -34,7 +35,8 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
/**
*
@@ -51,7 +53,7 @@ protected void tearDown() {}
*/
@Test
public void testCreateISO8859EncodedSizeTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_ARTIST);
@@ -95,9 +97,9 @@ public void testCreateISO8859EncodedSizeTerminatedString() throws Exception {
@Test
public void testCreateUTF16BOMLEEncodedSizeTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testv23utf16bomle.mp3")
+ "testv23utf16bomle.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -144,9 +146,9 @@ public void testCreateUTF16BOMLEEncodedSizeTerminatedString()
public void testCreateUTF16BOMBEEncodedSizeTerminatedString()
throws Exception {
TagOptionSingleton.getInstance().setEncodeUTF16BomAsLittleEndian(false);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testv23utf16bombe.mp3")
+ "testv23utf16bombe.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -192,9 +194,9 @@ public void testCreateUTF16BOMBEEncodedSizeTerminatedString()
@Test
public void testCreateUTF16AutoEncodedSizeTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testv23utf16bomberequired.mp3")
+ "testv23utf16bomberequired.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -243,7 +245,7 @@ public void testCreateUTF16AutoEncodedSizeTerminatedString()
*/
@Test
public void testCreateUTF16BEEncodedSizeTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_ARTIST);
@@ -292,7 +294,7 @@ public void testCreateUTF16BEEncodedSizeTerminatedString() throws Exception {
*/
@Test
public void testCreateUTF8EncodedSizeTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_ARTIST);
@@ -336,7 +338,7 @@ public void testCreateUTF8EncodedSizeTerminatedString() throws Exception {
@Test
public void testFixv23TagsWithInvalidEncoding() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue109.id3",
"testV1.mp3"
);
@@ -374,7 +376,7 @@ public void testFixv23TagsWithInvalidEncoding() throws Exception {
@Test
public void testFixv23TagsWithInvalidEncodingAndDefaultOverridden()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"Issue109.id3",
"testV1.mp3"
);
@@ -428,9 +430,9 @@ public void testCreateUTF16BOMLEEvenIfNotNeededIfDefaultSetEncodedSizeTerminated
TextEncoding.UTF_16
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testv23utf16bomleoption.mp3")
+ "testv23utf16bomleoption.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -497,7 +499,7 @@ public void testCreateUTF16BOMLEEvenIfNotNeededIfDefaultSetEncodedSizeTerminated
@Test
public void testCreateUTF16AndResetEvenIfNotNeededIfDefaultSetEncodedSizeTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_ARTIST);
@@ -572,7 +574,7 @@ public void testCreateUTF16AndResetEvenIfNotNeededIfDefaultSetEncodedSizeTermina
@Test
public void testCreateUTF16AndResetEvenIfNotNeededIfDefaultSetEncodedSizeTerminatedStringUnsnced()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_ARTIST);
@@ -655,7 +657,7 @@ public void testDoesntCreateUTF16IfDefaultSetEncodedSizeTerminatedStringifOverri
TextEncoding.UTF_16
);
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v23Frame frame = new ID3v23Frame(ID3v23Frames.FRAME_ID_V3_ARTIST);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/Unicode24NullTerminatedTagTest.java b/src/test/java/org/jaudiotagger/tag/id3/Unicode24NullTerminatedTagTest.java
index dc65e1a..dd44fb0 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/Unicode24NullTerminatedTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/Unicode24NullTerminatedTagTest.java
@@ -4,7 +4,8 @@
import java.io.File;
import java.io.IOException;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.exceptions.CannotReadException;
import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException;
import org.jaudiotagger.audio.exceptions.ReadOnlyFileException;
@@ -18,7 +19,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class Unicode24NullTerminatedTagTest {
+public class Unicode24NullTerminatedTagTest extends AbstractBaseTestCase {
/////////////////////////////////////////////////////////////////////////
// TestCase classes to override
@@ -35,7 +36,8 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
/**
*
@@ -55,14 +57,14 @@ protected void tearDown() {}
public void testUTF8WithNullTerminator()
throws IOException, TagException, ReadOnlyFileException, InvalidAudioFrameException, CannotReadException, RuntimeException {
MP3File mp3File = new MP3File(
- AbstractTestCase.copyAudioToTmp("testV24-comments-utf8.mp3")
+ copyAudioToTmp("testV24-comments-utf8.mp3")
);
AbstractID3v2Tag id3v2Tag = mp3File.getID3v2Tag();
assertNotNull(id3v2Tag);
AbstractID3v2Frame frame = (AbstractID3v2Frame) id3v2Tag.getFrame("COMM");
assertNotNull(frame);
AbstractTagFrameBody frameBody = frame.getBody();
- assertTrue(frameBody instanceof FrameBodyCOMM);
+ assertInstanceOf(FrameBodyCOMM.class, frameBody);
FrameBodyCOMM commFrameBody = (FrameBodyCOMM) frameBody;
//String borodin = "\u0411\u043e\u0440\u043e\u0434\u0438\u043d";
@@ -97,7 +99,7 @@ public void testUTF8WithNullTerminator()
*/
@Test
public void testCreateISO8859EncodedNullTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
@@ -143,7 +145,7 @@ public void testCreateISO8859EncodedNullTerminatedString() throws Exception {
@Test
public void testCreateUTF16BOMLEEncodedNullTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
@@ -190,7 +192,7 @@ public void testCreateUTF16BOMLEEncodedNullTerminatedString()
public void testCreateUTF16BOMBEEncodedNullTerminatedString()
throws Exception {
TagOptionSingleton.getInstance().setEncodeUTF16BomAsLittleEndian(false);
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
@@ -236,7 +238,7 @@ public void testCreateUTF16BOMBEEncodedNullTerminatedString()
@Test
public void testCreateUTF16AutoEncodedNullTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
@@ -286,7 +288,7 @@ public void testCreateUTF16AutoEncodedNullTerminatedString()
*/
@Test
public void testCreateUTF16BEEncodedNullTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
@@ -337,7 +339,7 @@ public void testCreateUTF16BEEncodedNullTerminatedString() throws Exception {
*/
@Test
public void testCreateUTF8EncodedNullTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
+ File testFile = copyAudioToTmp("testV1.mp3");
MP3File mp3File = new MP3File(testFile);
ID3v24Frame frame = new ID3v24Frame(ID3v24Frames.FRAME_ID_USER_DEFINED_URL);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/Unicode24TagTest.java b/src/test/java/org/jaudiotagger/tag/id3/Unicode24TagTest.java
index 922a6e3..8adcd6f 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/Unicode24TagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/Unicode24TagTest.java
@@ -19,7 +19,8 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.mp3.MP3File;
import org.jaudiotagger.tag.TagOptionSingleton;
import org.jaudiotagger.tag.id3.framebody.FrameBodyTPE1;
@@ -28,7 +29,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class Unicode24TagTest {
+public class Unicode24TagTest extends AbstractBaseTestCase {
/////////////////////////////////////////////////////////////////////////
// TestCase classes to override
@@ -45,7 +46,8 @@ protected void setUp() {
/**
*
*/
- protected void tearDown() {}
+ protected void tearDown() {
+ }
/**
*
@@ -62,9 +64,9 @@ protected void tearDown() {}
*/
@Test
public void testCreateISO8859EncodedSizeTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testISO8859.mp3")
+ "testISO8859.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -109,9 +111,9 @@ public void testCreateISO8859EncodedSizeTerminatedString() throws Exception {
@Test
public void testCreateUTF16BOMLEEncodedSizeTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testutf16bomle.mp3")
+ "testutf16bomle.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -158,9 +160,9 @@ public void testCreateUTF16BOMLEEncodedSizeTerminatedString()
public void testCreateUTF16BOMBEEncodedSizeTerminatedString()
throws Exception {
TagOptionSingleton.getInstance().setEncodeUTF16BomAsLittleEndian(false);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testutf16bombe.mp3")
+ "testutf16bombe.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -206,9 +208,9 @@ public void testCreateUTF16BOMBEEncodedSizeTerminatedString()
@Test
public void testCreateUTF16BOMLEAutoEncodedSizeTerminatedString()
throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testutf16-2.mp3")
+ "testutf16-2.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -258,9 +260,9 @@ public void testCreateUTF16BOMLEAutoEncodedSizeTerminatedString()
*/
@Test
public void testCreateUTF8AutoEncodedSizeTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testutf8.mp3")
+ "testutf8.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -313,9 +315,9 @@ public void testCreateUTF8AutoEncodedSizeTerminatedString() throws Exception {
*/
@Test
public void testCreateUTF16BEEncodedSizeTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testutf16be.mp3")
+ "testutf16be.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -365,9 +367,9 @@ public void testCreateUTF16BEEncodedSizeTerminatedString() throws Exception {
*/
@Test
public void testCreateUTF8EncodedSizeTerminatedString() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testutf8enc.mp3")
+ "testutf8enc.mp3"
);
MP3File mp3File = new MP3File(testFile);
@@ -412,7 +414,7 @@ public void testCreateUTF8EncodedSizeTerminatedString() throws Exception {
@Test
public void testv24TagsWithUTF8EncodingMaintainedOnSave() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"issue109-2.id3",
"testV1.mp3"
);
@@ -447,7 +449,7 @@ public void testv24TagsWithUTF8EncodingMaintainedOnSave() throws Exception {
@Test
public void testv24TagsWithUTF8OverriddenByDefaultOnSave() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"issue109-2.id3",
"testV1.mp3"
);
@@ -488,7 +490,7 @@ public void testv24TagsWithUTF8OverriddenByDefaultOnSave() throws Exception {
@Test
public void testv24TagsWithUTF8OverriddenByDefaultsOnSave() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = prependAudioToTmp(
"issue109-2.id3",
"testV1.mp3"
);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/UnsynchronizationTest.java b/src/test/java/org/jaudiotagger/tag/id3/UnsynchronizationTest.java
index 75295e6..0c54e0e 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/UnsynchronizationTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/UnsynchronizationTest.java
@@ -29,7 +29,7 @@ public class UnsynchronizationTest extends AbstractTestCase {
*/
@Test
public void testv24TagCreateFrameUnsynced() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("Issue1.id3", "testV1.mp3");
+ File testFile = prependAudioToTmp("Issue1.id3", "testV1.mp3");
//Read file as currently stands
MP3File mp3File = new MP3File(testFile);
@@ -114,7 +114,7 @@ public void testv24TagCreateFrameUnsynced() throws Exception {
*/
@Test
public void testv23TagCreateTagUnsynced() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("Issue1.id3", "testV1.mp3");
+ File testFile = prependAudioToTmp("Issue1.id3", "testV1.mp3");
//Read file as currently stands
MP3File mp3File = new MP3File(testFile);
@@ -155,7 +155,7 @@ public void testv23TagCreateTagUnsynced() throws Exception {
*/
@Test
public void testv22TagCreateTagUnsynced() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("Issue1.id3", "testV1.mp3");
+ File testFile = prependAudioToTmp("Issue1.id3", "testV1.mp3");
//Read file as currently stands
MP3File mp3File = new MP3File(testFile);
@@ -199,10 +199,10 @@ public void testWriteLargeunsynchronizedFields() {
Exception exceptionCaught = null;
try {
- testFile = AbstractTestCase.copyAudioToTmp("testV1.mp3");
- testFile2 = AbstractTestCase.copyAudioToTmp(
+ testFile = copyAudioToTmp("testV1.mp3");
+ testFile2 = copyAudioToTmp(
"testV1.mp3",
- new File("testV1-nonsynced.mp3")
+ "testV1-nonsynced.mp3"
);
//Save Unsynced
@@ -213,7 +213,7 @@ public void testWriteLargeunsynchronizedFields() {
assertFalse(v23TagUnsynced.isUnsynchronization());
Tag unsyncedTag = af.getTag();
Artwork artworkUnsynced = ArtworkFactory.createArtworkFromFile(
- new File("testdata/coverart_large.jpg")
+ fileResource("testdata", "coverart_large.jpg")
);
unsyncedTag.setField(artworkUnsynced);
af.commit();
@@ -226,7 +226,7 @@ public void testWriteLargeunsynchronizedFields() {
assertFalse(v23TagNotsynced.isUnsynchronization());
Tag notSyncedTag = af.getTag();
Artwork artworkNotsynced = ArtworkFactory.createArtworkFromFile(
- new File("testdata/coverart_large.jpg")
+ fileResource("testdata", "coverart_large.jpg")
);
notSyncedTag.setField(artworkNotsynced);
af.commit();
@@ -262,7 +262,7 @@ public void testWriteLargeunsynchronizedFields() {
for (int i = 0; i < artworkUnsynced.getBinaryData().length; i++) {
if (
(artworkUnsynced.getBinaryData()[i]) !=
- (artworkNotsynced.getBinaryData()[i])
+ (artworkNotsynced.getBinaryData()[i])
) {
System.out.println(
i +
@@ -283,7 +283,6 @@ public void testWriteLargeunsynchronizedFields() {
new ByteArrayInputStream(artworkUnsynced.getBinaryData())
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyTIPLTest.java b/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyTIPLTest.java
index b06da1d..9e51b4a 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyTIPLTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyTIPLTest.java
@@ -60,7 +60,6 @@ public void testCreateFrameBodyodd() {
fb = new FrameBodyTIPL();
fb.setText(FrameBodyTIPLTest.INVOLVED_PEOPLE_ODD);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -121,9 +120,9 @@ public void testCreateFromIPLS() {
*/
@Test
public void testMultiArrangerIDv24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteArrangerv24.mp3")
+ "testWriteArrangerv24.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
diff --git a/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyTMCLTest.java b/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyTMCLTest.java
index dd8859f..4cbaad3 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyTMCLTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyTMCLTest.java
@@ -23,9 +23,9 @@ public class FrameBodyTMCLTest extends AbstractTestCase {
*/
@Test
public void testWritePerformersIDv24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv24.mp3")
+ "testWritePerformersv24.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -55,9 +55,9 @@ public void testWritePerformersIDv24() throws Exception {
@Test
public void testWritePerformersAndDeleteIDv24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersAndDeletev24.mp3")
+ "testWritePerformersAndDeletev24.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -83,9 +83,9 @@ public void testWritePerformersAndDeleteIDv24() throws Exception {
@Test
public void testWritePerformersIDv23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv23.mp3")
+ "testWritePerformersv23.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -115,9 +115,9 @@ public void testWritePerformersIDv23() throws Exception {
@Test
public void testWritePerformersIDv22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv22.mp3")
+ "testWritePerformersv22.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -152,9 +152,9 @@ public void testWritePerformersIDv22() throws Exception {
*/
@Test
public void testWritePerformersIDv24v2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv24.mp3")
+ "testWritePerformersv24.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -189,9 +189,9 @@ public void testWritePerformersIDv24v2() throws Exception {
*/
@Test
public void testWritePerformersIDv24v3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv24.mp3")
+ "testWritePerformersv24.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -231,9 +231,9 @@ public void testWritePerformersIDv24v3() throws Exception {
@Test
public void testWritePerformersIDv23v2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv23.mp3")
+ "testWritePerformersv23.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -263,9 +263,9 @@ public void testWritePerformersIDv23v2() throws Exception {
@Test
public void testWritePerformersIDv23v3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv23.mp3")
+ "testWritePerformersv23.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -305,9 +305,9 @@ public void testWritePerformersIDv23v3() throws Exception {
@Test
public void testWritePerformersIDv22v2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv22.mp3")
+ "testWritePerformersv22.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -337,9 +337,9 @@ public void testWritePerformersIDv22v2() throws Exception {
@Test
public void testWritePerformersIDv22v3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWritePerformersv22.mp3")
+ "testWritePerformersv22.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -379,9 +379,9 @@ public void testWritePerformersIDv22v3() throws Exception {
@Test
public void testWriteMultiplePeopleIDv24() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteMultiplePeoplev24.mp3")
+ "testWriteMultiplePeoplev24.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -422,9 +422,9 @@ public void testWriteMultiplePeopleIDv24() throws Exception {
@Test
public void testWriteMultiplePeopleIDv23() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteMultiplePeoplev23.mp3")
+ "testWriteMultiplePeoplev23.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
@@ -465,9 +465,9 @@ public void testWriteMultiplePeopleIDv23() throws Exception {
@Test
public void testWriteMultiplePeopleIDv22() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testV1.mp3",
- new File("testWriteMultiplePeoplev22.mp3")
+ "testWriteMultiplePeoplev22.mp3"
);
AudioFile f = AudioFileIO.read(testFile);
assertNull(f.getTag());
diff --git a/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyUSLTTest.java b/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyUSLTTest.java
index c9d93a1..019a56e 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyUSLTTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/framebody/FrameBodyUSLTTest.java
@@ -23,11 +23,11 @@ public void testWriteUnicodeBody() throws IOException {
);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
fb.write(baos);
- FileOutputStream fos = new FileOutputStream("testdatatmp/TEST.TXT");
+ FileOutputStream fos = new FileOutputStream(tempFileResource("TEST.TXT"));
fos.write(baos.toByteArray());
byte[] frameBody = baos.toByteArray();
byte[] correctBits = makeByteArray(
- new int[] {
+ new int[]{
0x01,
'e',
'n',
diff --git a/src/test/java/org/jaudiotagger/tag/id3/framebody/ID3v24FrameBodyTest.java b/src/test/java/org/jaudiotagger/tag/id3/framebody/ID3v24FrameBodyTest.java
index b415826..9c1510e 100755
--- a/src/test/java/org/jaudiotagger/tag/id3/framebody/ID3v24FrameBodyTest.java
+++ b/src/test/java/org/jaudiotagger/tag/id3/framebody/ID3v24FrameBodyTest.java
@@ -9,9 +9,7 @@
public class ID3v24FrameBodyTest {
- private static final Logger log = LoggerFactory.getLogger(
- ID3v24FrameBodyTest.class
- );
+ protected final Logger log = LoggerFactory.getLogger(getClass());
@Test
public void testBodyImplementationsAreComplete() throws Exception {
diff --git a/src/test/java/org/jaudiotagger/tag/mp4/ConcurrentWritesTest.java b/src/test/java/org/jaudiotagger/tag/mp4/ConcurrentWritesTest.java
index 32dd069..284efde 100755
--- a/src/test/java/org/jaudiotagger/tag/mp4/ConcurrentWritesTest.java
+++ b/src/test/java/org/jaudiotagger/tag/mp4/ConcurrentWritesTest.java
@@ -10,7 +10,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
@@ -18,7 +19,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ConcurrentWritesTest {
+
+public class ConcurrentWritesTest extends AbstractBaseTestCase {
private static final int THREADS = 100;
private final File[] files = new File[THREADS];
@@ -26,11 +28,9 @@ public class ConcurrentWritesTest {
@BeforeEach
public void setUp() {
for (int counter = 0; counter < THREADS; counter++) {
- files[counter] = AbstractTestCase.copyAudioToTmp(
+ files[counter] = copyAudioToTmp(
"test5.m4a",
- new File(
- ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".mp4"
- )
+ ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".mp4"
);
}
}
@@ -55,13 +55,7 @@ public void testConcurrentWrites() throws Exception {
}
}
- private static class WriteFileCallable implements Callable {
-
- private final File file;
-
- public WriteFileCallable(File file) {
- this.file = file;
- }
+ private record WriteFileCallable(File file) implements Callable {
public Boolean call() throws Exception {
AudioFile audiofile = AudioFileIO.read(file);
diff --git a/src/test/java/org/jaudiotagger/tag/mp4/M4aReadDrmTagTest.java b/src/test/java/org/jaudiotagger/tag/mp4/M4aReadDrmTagTest.java
index fbc2ff7..70a49f1 100755
--- a/src/test/java/org/jaudiotagger/tag/mp4/M4aReadDrmTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/mp4/M4aReadDrmTagTest.java
@@ -5,7 +5,8 @@
import java.io.File;
import java.util.List;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.mp4.EncoderType;
@@ -14,23 +15,20 @@
import org.jaudiotagger.tag.Tag;
import org.jcodec.containers.mp4.boxes.EsdsBox;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class M4aReadDrmTagTest {
+public class M4aReadDrmTagTest extends AbstractBaseTestCase {
/**
* Test to read all metadata from an Apple iTunes encoded mp4 file, note also uses fixed genre rather than
* custom genre
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFile() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test9.m4p");
- if (!orig.isFile()) {
- return;
- }
-
- File testFile = AbstractTestCase.copyAudioToTmp("test9.m4p");
+ File testFile = copyAudioToTmp("test9.m4p");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -85,7 +83,6 @@ public void testReadFile() {
//Should be one image
assertEquals(1, coverart.size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/tag/mp4/M4aReadTagTest.java b/src/test/java/org/jaudiotagger/tag/mp4/M4aReadTagTest.java
index 209ed92..869364d 100755
--- a/src/test/java/org/jaudiotagger/tag/mp4/M4aReadTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/mp4/M4aReadTagTest.java
@@ -11,7 +11,8 @@
import java.nio.charset.StandardCharsets;
import java.util.List;
import javax.imageio.ImageIO;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.exceptions.CannotReadVideoException;
@@ -26,8 +27,9 @@
import org.jcodec.containers.mp4.boxes.EsdsBox;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class M4aReadTagTest {
+public class M4aReadTagTest extends AbstractBaseTestCase {
/**
* Test to read all metadata from an Apple iTunes encoded m4a file
@@ -36,7 +38,7 @@ public class M4aReadTagTest {
public void testReadFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test.m4a");
+ File testFile = copyAudioToTmp("test.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -134,32 +136,32 @@ public void testReadFile() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
assertEquals(
Short.valueOf("1"),
@@ -168,8 +170,8 @@ public void testReadFile() {
assertEquals(
Short.valueOf("10"),
((Mp4TrackField) mp4tag.getFirstField(
- Mp4FieldKey.TRACK
- )).getTrackTotal()
+ Mp4FieldKey.TRACK
+ )).getTrackTotal()
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -177,38 +179,38 @@ public void testReadFile() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(0)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(1)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(2)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(2)
);
assertEquals(
Short.valueOf("1"),
((Mp4DiscNoField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getDiscNo()
+ Mp4FieldKey.DISCNUMBER
+ )).getDiscNo()
);
assertEquals(
Short.valueOf("10"),
((Mp4DiscNoField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getDiscTotal()
+ Mp4FieldKey.DISCNUMBER
+ )).getDiscTotal()
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -298,7 +300,6 @@ public void testReadFile() {
);
assertNotNull(bi);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -309,15 +310,9 @@ public void testReadFile() {
*/
@Test
public void testReadFileFromMediaMonkey306() {
- File orig = new File("testdata", "test38.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test38.m4a");
+ File testFile = copyAudioToTmp("test38.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -400,32 +395,32 @@ public void testReadFileFromMediaMonkey306() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
assertEquals(
Short.valueOf("1"),
@@ -434,8 +429,8 @@ public void testReadFileFromMediaMonkey306() {
assertEquals(
Short.valueOf("10"),
((Mp4TrackField) mp4tag.getFirstField(
- Mp4FieldKey.TRACK
- )).getTrackTotal()
+ Mp4FieldKey.TRACK
+ )).getTrackTotal()
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -443,38 +438,38 @@ public void testReadFileFromMediaMonkey306() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(0)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(1)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(2)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(2)
);
assertEquals(
Short.valueOf("1"),
((Mp4DiscNoField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getDiscNo()
+ Mp4FieldKey.DISCNUMBER
+ )).getDiscNo()
);
assertEquals(
Short.valueOf("10"),
((Mp4DiscNoField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getDiscTotal()
+ Mp4FieldKey.DISCNUMBER
+ )).getDiscTotal()
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -574,7 +569,6 @@ public void testReadFileFromMediaMonkey306() {
assertEquals("Slow", mp4tag.getFirst(Mp4FieldKey.MM_TEMPO));
assertEquals("Dinner", mp4tag.getFirst(Mp4FieldKey.MM_OCCASION));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -585,15 +579,10 @@ public void testReadFileFromMediaMonkey306() {
*/
@Test
public void testReadFileFromWinamp5531() {
- File orig = new File("testdata", "test39.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test39.m4a");
+ File testFile = copyAudioToTmp("test39.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -642,7 +631,6 @@ public void testReadFileFromWinamp5531() {
//These fields added by winamp
assertEquals("publisher", mp4tag.getFirst(Mp4FieldKey.WINAMP_PUBLISHER));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -658,7 +646,7 @@ public void testReadFileFromWinamp5531() {
public void testReadFile2() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test2.m4a");
+ File testFile = copyAudioToTmp("test2.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -745,32 +733,32 @@ public void testReadFile2() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -778,26 +766,26 @@ public void testReadFile2() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -911,7 +899,6 @@ public void testReadFile2() {
);
assertNotNull(bi);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -924,7 +911,7 @@ public void testReadFile2() {
public void testReadFileWithNoMetaFreeAtom() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test3.m4a");
+ File testFile = copyAudioToTmp("test3.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -1011,32 +998,32 @@ public void testReadFileWithNoMetaFreeAtom() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
assertEquals(
Short.valueOf("1"),
@@ -1045,8 +1032,8 @@ public void testReadFileWithNoMetaFreeAtom() {
assertEquals(
Short.valueOf("10"),
((Mp4TrackField) mp4tag.getFirstField(
- Mp4FieldKey.TRACK
- )).getTrackTotal()
+ Mp4FieldKey.TRACK
+ )).getTrackTotal()
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -1054,38 +1041,38 @@ public void testReadFileWithNoMetaFreeAtom() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(0)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(1)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getNumbers().get(2)
+ Mp4FieldKey.DISCNUMBER
+ )).getNumbers().get(2)
);
assertEquals(
Short.valueOf("1"),
((Mp4DiscNoField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getDiscNo()
+ Mp4FieldKey.DISCNUMBER
+ )).getDiscNo()
);
assertEquals(
Short.valueOf("10"),
((Mp4DiscNoField) mp4tag.getFirstField(
- Mp4FieldKey.DISCNUMBER
- )).getDiscTotal()
+ Mp4FieldKey.DISCNUMBER
+ )).getDiscTotal()
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -1176,7 +1163,6 @@ public void testReadFileWithNoMetaFreeAtom() {
);
assertNotNull(bi);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1186,15 +1172,11 @@ public void testReadFileWithNoMetaFreeAtom() {
* This is just an audio file , despite having three tracks
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testDetectMultiTrackAudio() {
- File orig = new File("testdata", "test7.mp4");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test7.mp4");
+ File testFile = copyAudioToTmp("test7.mp4");
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
System.out.println(json);
@@ -1212,15 +1194,11 @@ public void testDetectMultiTrackAudio() {
* This is just an audio file , despite having three tracks
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testDetectMultiTrackAudio2() {
- File orig = new File("testdata", "test86.mp4");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test86.mp4");
+ File testFile = copyAudioToTmp("test86.mp4");
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
System.out.println(json);
@@ -1238,15 +1216,11 @@ public void testDetectMultiTrackAudio2() {
* This is a video file, detected via its vmhd atom
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testDetectVideo() {
- File orig = new File("testdata", "test87.mp4");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test87.mp4");
+ File testFile = copyAudioToTmp("test87.mp4");
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
@@ -1259,7 +1233,7 @@ public void testDetectVideo() {
}
assertNotNull(exceptionCaught);
- assertTrue(exceptionCaught instanceof CannotReadVideoException);
+ assertInstanceOf(CannotReadVideoException.class, exceptionCaught);
}
/**
@@ -1269,7 +1243,7 @@ public void testDetectVideo() {
public void testMonoLowbitRateReadFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test5.m4a");
+ File testFile = copyAudioToTmp("test5.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -1291,7 +1265,6 @@ public void testMonoLowbitRateReadFile() {
audioheader.getProfile()
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1303,14 +1276,12 @@ public void testMonoLowbitRateReadFile() {
* @throws Exception
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue156() throws Exception {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "test13.m4a");
- if (!orig.isFile()) {
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("test13.m4a");
+ File orig = fileResource("testdata", "test13.m4a");
+ File testFile = copyAudioToTmp("test13.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -1335,14 +1306,13 @@ public void testIssue156() throws Exception {
assertEquals("", tag.getFirst(FieldKey.BPM));
assertEquals("", tag.getFirst(FieldKey.IS_COMPILATION));
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.m4a",
- new File("testIssue156.m4a")
+ "testIssue156.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -1353,13 +1323,13 @@ public void testIssue156() throws Exception {
//Allow calling getFirst() on binary fields, although value actually currently makes not much sense
assertEquals("COVERART_JPEG:8445bytes", tag.getFirst(FieldKey.COVER_ART));
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue163() {
Exception exceptionCaught = null;
try {
@@ -1380,11 +1350,7 @@ public void testIssue163() {
System.out.println("ISO-8859-1 byte value is " + (bb.get(0) & 0xFF));
}
- File orig = new File("testdata", "unable_to_read.m4a");
- if (!orig.isFile()) {
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("unable_to_read.m4a");
+ File testFile = copyAudioToTmp("unable_to_read.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -1398,7 +1364,6 @@ public void testIssue163() {
tag.getFirst(FieldKey.YEAR);
System.out.println(tag);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1411,7 +1376,6 @@ public void testGenre() {
assertNull(GenreTypes.getInstanceOf().getIdForValue("fred"));
Mp4GenreField.isValidGenre("fred");
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1424,7 +1388,7 @@ public void testGenre() {
public void testIssue182() throws Exception {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test16.m4a");
+ File testFile = copyAudioToTmp("test16.m4a");
AudioFile f = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) f.getTag();
@@ -1435,7 +1399,6 @@ public void testIssue182() throws Exception {
assertEquals("Suerte", tag.getFirst(FieldKey.ARTIST));
assertEquals("Kogani", tag.getFirst(FieldKey.TITLE));
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1447,15 +1410,11 @@ public void testIssue182() throws Exception {
* @throws Exception
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue198() throws Exception {
- File orig = new File("testdata", "test27.m4a");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test27.m4a");
+ File testFile = copyAudioToTmp("test27.m4a");
AudioFile f = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) f.getTag();
@@ -1471,7 +1430,6 @@ public void testIssue198() throws Exception {
assertEquals(1, tag.get(Mp4FieldKey.CDDB_TRACKNUMBER).size());
assertEquals(1, tag.get(Mp4FieldKey.CDDB_IDS).size());
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1483,16 +1441,12 @@ public void testIssue198() throws Exception {
* @throws Exception
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testIssue227() throws Exception {
- File orig = new File("testdata", "test31.m4a");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
//Read Image
- File testFile = AbstractTestCase.copyAudioToTmp("test31.m4a");
+ File testFile = copyAudioToTmp("test31.m4a");
AudioFile f = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) f.getTag();
@@ -1526,7 +1480,6 @@ public void testIssue227() throws Exception {
assertEquals(Mp4FieldType.COVERART_PNG, artwork.getFieldType());
assertEquals("C3", tag.getFirst(FieldKey.COMPOSER_SORT));
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1542,7 +1495,7 @@ public void testIssue226Mono() throws Exception {
Exception exceptionCaught = null;
try {
//Read Image
- File testFile = AbstractTestCase.copyAudioToTmp("test32.m4a");
+ File testFile = copyAudioToTmp("test32.m4a");
AudioFile f = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) f.getTag();
@@ -1559,46 +1512,36 @@ public void testIssue226Mono() throws Exception {
f.getAudioHeader().getEncodingType()
);
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testNumericGenres() throws Exception {
- File orig = new File("testdata", "test75.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
assertTrue(Mp4GenreField.isValidGenre("Rock"));
//Read Image
- File testFile = AbstractTestCase.copyAudioToTmp("test75.m4a");
+ File testFile = copyAudioToTmp("test75.m4a");
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
Mp4Tag tagReader = new Mp4TagReader().read(raf);
assertEquals("Rock", tagReader.getFirst(FieldKey.GENRE));
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFile3() throws Exception {
- File orig = new File("testdata", "test84.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test84.m4a");
+ File testFile = copyAudioToTmp("test84.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals("6", tag.getFirst(FieldKey.TRACK));
@@ -1615,70 +1558,54 @@ public void testReadFile3() throws Exception {
assertEquals("8", tag.getFirst(FieldKey.TRACK));
assertEquals("12", tag.getFirst(FieldKey.TRACK_TOTAL));
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFile4() throws Exception {
- File orig = new File("testdata", "test86.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test86.m4a");
+ File testFile = copyAudioToTmp("test86.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals("Away From The Sun", tag.getFirst(FieldKey.TITLE));
System.out.println(f.getAudioHeader());
System.out.println(tag);
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadAudioBook() throws Exception {
- File orig = new File("testdata", "test147.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
+ File orig = fileResource("testdata", "test147.m4a");
MP4Util.Movie mp4 = MP4Util.parseFullMovie(orig);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
System.out.println(json);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test147.m4a");
+ File testFile = copyAudioToTmp("test147.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
//assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteHighTrackNo() throws Exception {
- File orig = new File("testdata", "test84.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test84.m4a");
+ File testFile = copyAudioToTmp("test84.m4a");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals("6", tag.getFirst(FieldKey.TRACK));
@@ -1696,7 +1623,6 @@ public void testWriteHighTrackNo() throws Exception {
assertEquals("6", tag.getFirst(FieldKey.TRACK_TOTAL));
assertEquals("6", tag.getFirst(FieldKey.TRACK));
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/tag/mp4/M4aWriteDataBeforeMoovTagTest.java b/src/test/java/org/jaudiotagger/tag/mp4/M4aWriteDataBeforeMoovTagTest.java
index f2a0cab..d3d744e 100755
--- a/src/test/java/org/jaudiotagger/tag/mp4/M4aWriteDataBeforeMoovTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/mp4/M4aWriteDataBeforeMoovTagTest.java
@@ -4,7 +4,8 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
@@ -13,7 +14,7 @@
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
-public class M4aWriteDataBeforeMoovTagTest {
+public class M4aWriteDataBeforeMoovTagTest extends AbstractBaseTestCase {
/**
* Test to write file that has MDAT at start BEFORE MOOV atom, this is what Facc 1.25 does
@@ -23,9 +24,9 @@ public class M4aWriteDataBeforeMoovTagTest {
public void testWriteFileOption1SameSize() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test15.m4a",
- new File("testWriteWhenMDatAtStart1.m4a")
+ "testWriteWhenMDatAtStart1.m4a"
);
//First lets just createField tree
@@ -53,7 +54,6 @@ public void testWriteFileOption1SameSize() {
//Ease of use methods for common fields
assertEquals("AUTHOR", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -67,9 +67,9 @@ public void testWriteFileOption1SameSize() {
public void testWriteFileOption3SmallerSizeCreateFree() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test15.m4a",
- new File("testWriteWhenMDatAtStart2.m4a")
+ "testWriteWhenMDatAtStart2.m4a"
);
//First lets just createField tree
@@ -102,7 +102,6 @@ public void testWriteFileOption3SmallerSizeCreateFree() {
assertEquals("AL", tag.getFirst(FieldKey.ALBUM));
assertEquals("T", tag.getFirst(FieldKey.TITLE));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -116,9 +115,9 @@ public void testWriteFileOption3SmallerSizeCreateFree() {
public void testWriteFileOption4SmallerSizeNoFree() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test15.m4a",
- new File("testWriteWhenMDatAtStart3.m4a")
+ "testWriteWhenMDatAtStart3.m4a"
);
//First lets just createField tree
@@ -146,7 +145,6 @@ public void testWriteFileOption4SmallerSizeNoFree() {
//Ease of use methods for common fields
assertEquals("AR", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -161,9 +159,9 @@ public void testWriteFileOption4SmallerSizeNoFree() {
public void testWriteFileOption8CannoutUseTopLevelFree() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test15.m4a",
- new File("testWriteWhenMDatAtStart8.m4a")
+ "testWriteWhenMDatAtStart8.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -244,7 +242,6 @@ public void testWriteFileOption8CannoutUseTopLevelFree() {
assertEquals("9", tag.getFirst(FieldKey.MUSICIP_ID));
assertEquals("Classic Rock", tag.getFirst(FieldKey.GENRE));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -258,9 +255,9 @@ public void testWriteFileOption8CannoutUseTopLevelFree() {
public void testWriteFileOption9CannotUseTopLevelFree() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test19.m4a",
- new File("testWriteWhenMDatAtStart9.m4a")
+ "testWriteWhenMDatAtStart9.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -330,7 +327,6 @@ public void testWriteFileOption9CannotUseTopLevelFree() {
assertEquals("9", tag.getFirst(FieldKey.MUSICIP_ID));
assertEquals("Classic Rock", tag.getFirst(FieldKey.GENRE));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/tag/mp4/M4aWriteTagTest.java b/src/test/java/org/jaudiotagger/tag/mp4/M4aWriteTagTest.java
index ac5a54c..96426ed 100755
--- a/src/test/java/org/jaudiotagger/tag/mp4/M4aWriteTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/mp4/M4aWriteTagTest.java
@@ -8,6 +8,8 @@
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.List;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
@@ -24,8 +26,9 @@
import org.jcodec.containers.mp4.MP4Util;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class M4aWriteTagTest {
+public class M4aWriteTagTest extends AbstractBaseTestCase {
private static final long TEST_FILE1_SIZE = 3883555;
private static final long TEST_FILE2_SIZE = 3884505;
@@ -38,9 +41,9 @@ public class M4aWriteTagTest {
public void testWriteFileSameSize() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testWriteFileSameSize.m4a")
+ "testWriteFileSameSize.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -128,32 +131,32 @@ public void testWriteFileSameSize() {
assertEquals(
"2/12",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("2"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("12"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -161,26 +164,26 @@ public void testWriteFileSameSize() {
assertEquals(
"4/15",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("4"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("15"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -263,7 +266,6 @@ public void testWriteFileSameSize() {
assertEquals(0xff, coverArtField.getData()[2] & 0xff);
assertEquals(0xe0, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -276,9 +278,9 @@ public void testWriteFileSameSize() {
public void testWriteFileSmallerSize() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testWriteFileSmallerSize.m4a")
+ "testWriteFileSmallerSize.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -355,32 +357,32 @@ public void testWriteFileSmallerSize() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -388,26 +390,26 @@ public void testWriteFileSmallerSize() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -490,7 +492,6 @@ public void testWriteFileSmallerSize() {
assertEquals(0xff, coverArtField.getData()[2] & 0xff);
assertEquals(0xe0, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -504,9 +505,9 @@ public void testWriteFileSmallerSize() {
public void testWriteFileLargerSize() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testWriteFileLargerSize.m4a")
+ "testWriteFileLargerSize.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -583,32 +584,32 @@ public void testWriteFileLargerSize() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -616,26 +617,26 @@ public void testWriteFileLargerSize() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -718,7 +719,6 @@ public void testWriteFileLargerSize() {
assertEquals(0xff, coverArtField.getData()[2] & 0xff);
assertEquals(0xe0, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -733,9 +733,9 @@ public void testWriteFileLargerSize() {
public void testWriteFileAlotLargerSize() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testWriteFileAlot.m4a")
+ "testWriteFileAlot.m4a"
);
//Starting filesize
@@ -746,7 +746,7 @@ public void testWriteFileAlotLargerSize() {
//Add new image
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart_small.png"),
+ fileResource("testdata", "coverart_small.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -823,26 +823,26 @@ public void testWriteFileAlotLargerSize() {
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -850,26 +850,26 @@ public void testWriteFileAlotLargerSize() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -961,7 +961,6 @@ public void testWriteFileAlotLargerSize() {
assertEquals(0x4e, coverArtField.getData()[2] & 0xff);
assertEquals(0x47, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -976,9 +975,9 @@ public void testWriteFileAlotLargerSize() {
public void testWriteFileMuchLargerSize() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testWriteFileMuchLargerSize.m4a")
+ "testWriteFileMuchLargerSize.m4a"
);
//Starting filesize
@@ -989,7 +988,7 @@ public void testWriteFileMuchLargerSize() {
//Add new image
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -1069,26 +1068,26 @@ public void testWriteFileMuchLargerSize() {
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -1096,26 +1095,26 @@ public void testWriteFileMuchLargerSize() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -1207,7 +1206,6 @@ public void testWriteFileMuchLargerSize() {
assertEquals(0x4e, coverArtField.getData()[2] & 0xff);
assertEquals(0x47, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1220,9 +1218,9 @@ public void testWriteFileMuchLargerSize() {
public void testDeleteTag() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testDeleteMeta.m4a")
+ "testDeleteMeta.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
AudioFileIO.delete(f);
@@ -1232,7 +1230,6 @@ public void testDeleteTag() {
System.out.println(f.getTag());
assertEquals(0, f.getTag().getFieldCount());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1245,9 +1242,9 @@ public void testDeleteTag() {
public void testDeleteTag2() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.m4a",
- new File("testDeleteMeta2.m4a")
+ "testDeleteMeta2.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
AudioFileIO.delete(f);
@@ -1257,7 +1254,6 @@ public void testDeleteTag2() {
System.out.println(f.getTag());
assertEquals(0, f.getTag().getFieldCount());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1270,9 +1266,9 @@ public void testDeleteTag2() {
public void testWriteFileSameSizeNoMetaFreeAtom() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.m4a",
- new File("testWriteFileSameSizeNoMetaFree.m4a")
+ "testWriteFileSameSizeNoMetaFree.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -1355,32 +1351,32 @@ public void testWriteFileSameSizeNoMetaFreeAtom() {
assertEquals(
"2/12",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("2"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("12"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -1388,26 +1384,26 @@ public void testWriteFileSameSizeNoMetaFreeAtom() {
assertEquals(
"4/15",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("4"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("15"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -1490,7 +1486,6 @@ public void testWriteFileSameSizeNoMetaFreeAtom() {
assertEquals(0xff, coverArtField.getData()[2] & 0xff);
assertEquals(0xe0, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1503,9 +1498,9 @@ public void testWriteFileSameSizeNoMetaFreeAtom() {
public void testWriteFileSmallerSizeMoreThanEightBytesSmallerNoMetaFreeAtom() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.m4a",
- new File("testWriteFileSmallerSizeNoMetaFreeMoreThanEight.m4a")
+ "testWriteFileSmallerSizeNoMetaFreeMoreThanEight.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -1583,32 +1578,32 @@ public void testWriteFileSmallerSizeMoreThanEightBytesSmallerNoMetaFreeAtom() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -1616,26 +1611,26 @@ public void testWriteFileSmallerSizeMoreThanEightBytesSmallerNoMetaFreeAtom() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -1718,7 +1713,6 @@ public void testWriteFileSmallerSizeMoreThanEightBytesSmallerNoMetaFreeAtom() {
assertEquals(0xff, coverArtField.getData()[2] & 0xff);
assertEquals(0xe0, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1732,9 +1726,9 @@ public void testWriteFileSmallerSizeMoreThanEightBytesSmallerNoMetaFreeAtom() {
public void testWriteFileSmallerSizeLessThanEightBytesNoMetaFreeAtom() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.m4a",
- new File("testWriteFileLessThanEight2.m4a")
+ "testWriteFileLessThanEight2.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -1810,32 +1804,32 @@ public void testWriteFileSmallerSizeLessThanEightBytesNoMetaFreeAtom() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -1843,26 +1837,26 @@ public void testWriteFileSmallerSizeLessThanEightBytesNoMetaFreeAtom() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -1945,7 +1939,6 @@ public void testWriteFileSmallerSizeLessThanEightBytesNoMetaFreeAtom() {
assertEquals(0xff, coverArtField.getData()[2] & 0xff);
assertEquals(0xe0, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1959,9 +1952,9 @@ public void testWriteFileSmallerSizeLessThanEightBytesNoMetaFreeAtom() {
public void testWriteFileSmallerSizeLessThanEightBytesNoFreeAtoms() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test8.m4a",
- new File("testWriteFileLessThanEight3.m4a")
+ "testWriteFileLessThanEight3.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -2037,32 +2030,32 @@ public void testWriteFileSmallerSizeLessThanEightBytesNoFreeAtoms() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -2070,26 +2063,26 @@ public void testWriteFileSmallerSizeLessThanEightBytesNoFreeAtoms() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -2172,7 +2165,6 @@ public void testWriteFileSmallerSizeLessThanEightBytesNoFreeAtoms() {
assertEquals(0xff, coverArtField.getData()[2] & 0xff);
assertEquals(0xe0, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -2186,9 +2178,9 @@ public void testWriteFileSmallerSizeLessThanEightBytesNoFreeAtoms() {
public void testWriteFileSmallerNoFreeAtoms() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test8.m4a",
- new File("testWriteFileNoFreeAtom2.m4a")
+ "testWriteFileNoFreeAtom2.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -2268,32 +2260,32 @@ public void testWriteFileSmallerNoFreeAtoms() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -2301,26 +2293,26 @@ public void testWriteFileSmallerNoFreeAtoms() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -2394,7 +2386,6 @@ public void testWriteFileSmallerNoFreeAtoms() {
//Should be one image
assertEquals(2, coverart.size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -2402,9 +2393,9 @@ public void testWriteFileSmallerNoFreeAtoms() {
@Test
public void testWriteFragmented() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testFragmentedTemp.m4a")
+ "testFragmentedTemp.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -2427,9 +2418,9 @@ public void testWriteFileLargerSizeNoMetaFreeAtom() {
TagOptionSingleton.getInstance().setWriteChunkSize(1000000);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.m4a",
- new File("testWriteFileLargerSizeNoMetaFree.m4a")
+ "testWriteFileLargerSizeNoMetaFree.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -2504,32 +2495,32 @@ public void testWriteFileLargerSizeNoMetaFreeAtom() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -2537,26 +2528,26 @@ public void testWriteFileLargerSizeNoMetaFreeAtom() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -2639,7 +2630,6 @@ public void testWriteFileLargerSizeNoMetaFreeAtom() {
assertEquals(0xff, coverArtField.getData()[2] & 0xff);
assertEquals(0xe0, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -2652,9 +2642,9 @@ public void testWriteFileLargerSizeNoMetaFreeAtom() {
public void testWriteFileWhichHasUtdataMetaAndHdlrButNotIlst() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test4.m4a",
- new File("testWriteNewMetadata.m4a")
+ "testWriteNewMetadata.m4a"
);
MP4Util.Movie mp4 = MP4Util.parseFullMovie(testFile);
String json = new JSONObject(mp4.getMoov().toString()).toString(2);
@@ -2669,7 +2659,7 @@ public void testWriteFileWhichHasUtdataMetaAndHdlrButNotIlst() {
//Add new image
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -2678,7 +2668,7 @@ public void testWriteFileWhichHasUtdataMetaAndHdlrButNotIlst() {
//Add second image
imageFile = new RandomAccessFile(
- new File("testdata", "coverart_small.png"),
+ fileResource("testdata", "coverart_small.png"),
"r"
);
imagedata = new byte[(int) imageFile.length()];
@@ -2721,7 +2711,6 @@ public void testWriteFileWhichHasUtdataMetaAndHdlrButNotIlst() {
assertEquals(0x4e, coverArtField.getData()[2] & 0xff);
assertEquals(0x47, coverArtField.getData()[3] & 0xff);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -2731,17 +2720,13 @@ public void testWriteFileWhichHasUtdataMetaAndHdlrButNotIlst() {
* Test to write tag data, there is no top level free atom (there is a meta free atom).
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteFileLargerSizeNoTopLevelFreeAtom() {
- File orig = new File("testdata", "test6.m4p");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test6.m4a",
- new File("testWriteNoTopFree.m4a")
+ "testWriteNoTopFree.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -2776,7 +2761,6 @@ public void testWriteFileLargerSizeNoTopLevelFreeAtom() {
tag.getFirst(FieldKey.MUSICBRAINZ_ARTISTID)
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -2790,9 +2774,9 @@ public void testWriteFileLargerSizeNoTopLevelFreeAtom() {
public void testWriteFileLargerSizeEqualToTopLevelFreeSpace() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.m4a",
- new File("testWriteFileEqualToFreeSpace.m4a")
+ "testWriteFileEqualToFreeSpace.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -2872,32 +2856,32 @@ public void testWriteFileLargerSizeEqualToTopLevelFreeSpace() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getContent()
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(2)
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.TRACK)
- .get(0)).getNumbers().get(3)
+ .get(Mp4FieldKey.TRACK)
+ .get(0)).getNumbers().get(3)
);
//Not sure why there are 4 values, only understand 2nd and third
@@ -2905,26 +2889,26 @@ public void testWriteFileLargerSizeEqualToTopLevelFreeSpace() {
assertEquals(
"1/10",
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getContent()
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getContent()
);
assertEquals(
Short.valueOf("0"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(0)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(0)
);
assertEquals(
Short.valueOf("1"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(1)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(1)
);
assertEquals(
Short.valueOf("10"),
((Mp4TagTextNumberField) mp4tag
- .get(Mp4FieldKey.DISCNUMBER)
- .get(0)).getNumbers().get(2)
+ .get(Mp4FieldKey.DISCNUMBER)
+ .get(0)).getNumbers().get(2)
);
assertEquals("composer", mp4tag.getFirst(Mp4FieldKey.COMPOSER));
@@ -2998,7 +2982,6 @@ public void testWriteFileLargerSizeEqualToTopLevelFreeSpace() {
//Should be one image
assertEquals(2, coverart.size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -3013,9 +2996,9 @@ public void testWriteFileLargerSizeEqualToTopLevelFreeSpace() {
public void testWriteAllFields() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test5.m4a",
- new File("testWriteAllFields.m4a")
+ "testWriteAllFields.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -3169,7 +3152,6 @@ public void testWriteAllFields() {
assertEquals("1/11", tag.getFirst("trkn"));
assertEquals("1/3", tag.getFirst("disk"));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -3180,9 +3162,9 @@ public void testWriteAllFields() {
*/
@Test
public void testWriteGenres() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test5.m4a",
- new File("testWriteGenres0.m4a")
+ "testWriteGenres0.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) f.getTag();
@@ -3247,9 +3229,9 @@ public void testWriteGenres() throws Exception {
public void testWriteGenres2() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test5.m4a",
- new File("testWriteGenres2.m4a")
+ "testWriteGenres2.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) f.getTag();
@@ -3274,7 +3256,6 @@ public void testWriteGenres2() {
assertEquals("", tag.getFirst(Mp4FieldKey.GENRE));
assertEquals("Slimey", tag.getFirst(Mp4FieldKey.GENRE_CUSTOM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -3289,9 +3270,9 @@ public void testWriteGenres2() {
*/
@Test
public void testWriteGenres3() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test5.m4a",
- new File("testWriteGenres3.m4a")
+ "testWriteGenres3.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) f.getTag();
@@ -3319,9 +3300,9 @@ public void testWriteGenres3() throws Exception {
public void testWriteGenres4() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test5.m4a",
- new File("testWriteGenres4.m4a")
+ "testWriteGenres4.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
Mp4Tag tag = (Mp4Tag) f.getTag();
@@ -3338,7 +3319,6 @@ public void testWriteGenres4() {
assertEquals("", tag.getFirst(Mp4FieldKey.GENRE));
assertEquals("Tangoey", tag.getFirst(Mp4FieldKey.GENRE_CUSTOM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -3349,41 +3329,34 @@ public void testWriteGenres4() {
* way round or there is no free atom.
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteWhenFreeisAfterMdat() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "unable_to_write.m4p");
- if (!orig.isFile()) {
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("unable_to_write.m4p");
+ File testFile = copyAudioToTmp("unable_to_write.m4p");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
tag.setField(FieldKey.TITLE, "tit2");
f.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteMuchLargerWhenFreeIsAfterMdat() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "unable_to_write.m4p");
- if (!orig.isFile()) {
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("unable_to_write.m4p");
+ File testFile = copyAudioToTmp("unable_to_write.m4p");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -3391,21 +3364,18 @@ public void testWriteMuchLargerWhenFreeIsAfterMdat() {
tag.addField(((Mp4Tag) tag).createArtworkField(imagedata));
f.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteFileLargerSizeLessThanTopLevelFreeWhenFreeAafterMdat() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "unable_to_write.m4p");
- if (!orig.isFile()) {
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("unable_to_write.m4p");
+ File orig = fileResource("testdata", "unable_to_write.m4p");
+ File testFile = copyAudioToTmp("unable_to_write.m4p");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -3421,21 +3391,17 @@ public void testWriteFileLargerSizeLessThanTopLevelFreeWhenFreeAafterMdat() {
tag.addField(((Mp4Tag) tag).createArtworkField(imagedata));
f.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteFileLargerSizeEqualToTopLevelFreeWhenFreeAafterMdat() {
Exception exceptionCaught = null;
try {
- File orig = new File("testdata", "unable_to_write.m4p");
- if (!orig.isFile()) {
- return;
- }
- File testFile = AbstractTestCase.copyAudioToTmp("unable_to_write.m4p");
+ File testFile = copyAudioToTmp("unable_to_write.m4p");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -3451,7 +3417,6 @@ public void testWriteFileLargerSizeEqualToTopLevelFreeWhenFreeAafterMdat() {
tag.addField(((Mp4Tag) tag).createArtworkField(imagedata));
f.commit();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -3461,17 +3426,13 @@ public void testWriteFileLargerSizeEqualToTopLevelFreeWhenFreeAafterMdat() {
* Test writing mp4 file.
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWritingIssue198() throws Exception {
- File orig = new File("testdata", "test27.m4a");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test27.m4a",
- new File("rvdnswithoutdata.m4a")
+ "rvdnswithoutdata.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -3497,7 +3458,6 @@ public void testWritingIssue198() throws Exception {
System.out.println(f.getAudioHeader());
System.out.println(tag);
} catch (IOException e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -3505,9 +3465,9 @@ public void testWritingIssue198() throws Exception {
@Test
public void testWriteMultipleFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testWriteMultiple.m4a")
+ "testWriteMultiple.m4a"
);
AudioFile f = AudioFileIO.read(testFile);
List tagFields = f.getTag().getFields(FieldKey.ALBUM_ARTIST_SORT);
@@ -3522,9 +3482,9 @@ public void testWriteMultipleFields() throws Exception {
@Test
public void testDeleteFields() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testDeleteFields.m4a")
+ "testDeleteFields.m4a"
);
//Delete using generic key
@@ -3555,9 +3515,9 @@ public void testDeleteFields() throws Exception {
@Test
public void testReadWriteM4a() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.m4a",
- new File("testDeleteFields.m4a")
+ "testDeleteFields.m4a"
);
AudioFile audioFile = AudioFileIO.read(testFile);
audioFile.commit();
diff --git a/src/test/java/org/jaudiotagger/tag/mp4/ReadMp4MovementTagsTest.java b/src/test/java/org/jaudiotagger/tag/mp4/ReadMp4MovementTagsTest.java
index 45ecaad..59ef07e 100755
--- a/src/test/java/org/jaudiotagger/tag/mp4/ReadMp4MovementTagsTest.java
+++ b/src/test/java/org/jaudiotagger/tag/mp4/ReadMp4MovementTagsTest.java
@@ -8,20 +8,17 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class ReadMp4MovementTagsTest extends AbstractTestCase {
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadMovementFieldsFromITunes() {
- File orig = new File("testdata", "test161.m4a");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception ex = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test161.m4a");
+ File testFile = copyAudioToTmp("test161.m4a");
AudioFile af = AudioFileIO.read(testFile);
assertNotNull(af.getTag());
assertEquals(
@@ -44,7 +41,6 @@ public void testReadMovementFieldsFromITunes() {
assertEquals("1", af.getTag().getFirst(FieldKey.MOVEMENT_NO));
assertEquals("7", af.getTag().getFirst(FieldKey.MOVEMENT_TOTAL));
} catch (Exception e) {
- e.printStackTrace();
ex = e;
}
assertNull(ex);
diff --git a/src/test/java/org/jaudiotagger/tag/real/RealReadTagTest.java b/src/test/java/org/jaudiotagger/tag/real/RealReadTagTest.java
index b2ae326..df04fb0 100755
--- a/src/test/java/org/jaudiotagger/tag/real/RealReadTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/real/RealReadTagTest.java
@@ -20,7 +20,7 @@ public class RealReadTagTest extends AbstractTestCase {
@Test
public void test01()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test01.ra");
+ File testFile = copyAudioToTmp("test01.ra");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -32,7 +32,7 @@ public void test01()
@Test
public void test02()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test02.ra");
+ File testFile = copyAudioToTmp("test02.ra");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -47,7 +47,7 @@ public void test02()
@Test
public void test03()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test03.ra");
+ File testFile = copyAudioToTmp("test03.ra");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -59,7 +59,7 @@ public void test03()
@Test
public void test04()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test04.ra");
+ File testFile = copyAudioToTmp("test04.ra");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -71,7 +71,7 @@ public void test04()
@Test
public void test05ra()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test05.ra");
+ File testFile = copyAudioToTmp("test05.ra");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -89,7 +89,7 @@ public void test05ra()
@Test
public void test05rm()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test05.rm");
+ File testFile = copyAudioToTmp("test05.rm");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -107,7 +107,7 @@ public void test05rm()
@Test
public void test06()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test06.rm");
+ File testFile = copyAudioToTmp("test06.rm");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -122,7 +122,7 @@ public void test06()
@Test
public void test07()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test07.rm");
+ File testFile = copyAudioToTmp("test07.rm");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -143,7 +143,7 @@ public void test07()
@Test
public void test08()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test08.rm");
+ File testFile = copyAudioToTmp("test08.rm");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -164,7 +164,7 @@ public void test08()
@Test
public void test09()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test09.rm");
+ File testFile = copyAudioToTmp("test09.rm");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
@@ -179,7 +179,7 @@ public void test09()
@Test
public void test10()
throws InvalidAudioFrameException, IOException, ReadOnlyFileException, TagException, CannotReadException {
- File testFile = AbstractTestCase.copyAudioToTmp("test10.rm");
+ File testFile = copyAudioToTmp("test10.rm");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(3, tag.getFieldCount()); // If this line fails we need to update our test as the RealMedia tag parser has been augmented
diff --git a/src/test/java/org/jaudiotagger/tag/vorbiscomment/ConcurrentWritesTest.java b/src/test/java/org/jaudiotagger/tag/vorbiscomment/ConcurrentWritesTest.java
index 5bea127..9e615ae 100755
--- a/src/test/java/org/jaudiotagger/tag/vorbiscomment/ConcurrentWritesTest.java
+++ b/src/test/java/org/jaudiotagger/tag/vorbiscomment/ConcurrentWritesTest.java
@@ -10,7 +10,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
@@ -18,7 +19,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ConcurrentWritesTest {
+
+public class ConcurrentWritesTest extends AbstractBaseTestCase {
private static final int THREADS = 100;
private final File[] files = new File[THREADS];
@@ -26,11 +28,9 @@ public class ConcurrentWritesTest {
@BeforeEach
public void setUp() {
for (int counter = 0; counter < THREADS; counter++) {
- files[counter] = AbstractTestCase.copyAudioToTmp(
+ files[counter] = copyAudioToTmp(
"test.ogg",
- new File(
- ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".ogg"
- )
+ ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".ogg"
);
}
}
@@ -55,13 +55,7 @@ public void testConcurrentWrites() throws Exception {
}
}
- private static class WriteFileCallable implements Callable {
-
- private final File file;
-
- public WriteFileCallable(File file) {
- this.file = file;
- }
+ private record WriteFileCallable(File file) implements Callable {
public Boolean call() throws Exception {
AudioFile audiofile = AudioFileIO.read(file);
diff --git a/src/test/java/org/jaudiotagger/tag/vorbiscomment/OpusVorbisReadTagTest.java b/src/test/java/org/jaudiotagger/tag/vorbiscomment/OpusVorbisReadTagTest.java
index c2ff44e..81f142c 100755
--- a/src/test/java/org/jaudiotagger/tag/vorbiscomment/OpusVorbisReadTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/vorbiscomment/OpusVorbisReadTagTest.java
@@ -2,7 +2,8 @@
import java.io.File;
import java.io.RandomAccessFile;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.opus.OpusFileReader;
@@ -11,11 +12,11 @@
import org.jaudiotagger.tag.Tag;
import org.junit.jupiter.api.Test;
-public class OpusVorbisReadTagTest {
+public class OpusVorbisReadTagTest extends AbstractBaseTestCase {
@Test
public void testReadOggOpus() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.opus");
+ File testFile = copyAudioToTmp("test.opus");
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
OpusFileReader opusFileReader = new OpusFileReader();
opusFileReader.summarizeOggPageHeaders(testFile);
@@ -24,7 +25,7 @@ public void testReadOggOpus() throws Exception {
@Test
public void testReadTagFromOgg() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp("test.opus");
+ File testFile = copyAudioToTmp("test.opus");
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
OpusVorbisTagReader tagReader = new OpusVorbisTagReader();
Tag vorbisTag = tagReader.read(raf);
@@ -33,9 +34,9 @@ public void testReadTagFromOgg() throws Exception {
@Test
public void testWriteBigTagToOgg() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.opus",
- new File("test-opus-file-big.opus")
+ "test-opus-file-big.opus"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
@@ -46,9 +47,9 @@ public void testWriteBigTagToOgg() throws Exception {
@Test
public void testWriteSmallTagToOgg() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.opus",
- new File("test-opus-file-small.opus")
+ "test-opus-file-small.opus"
);
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
diff --git a/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisImageTest.java b/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisImageTest.java
index f7efd6f..289d3a8 100755
--- a/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisImageTest.java
+++ b/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisImageTest.java
@@ -15,6 +15,7 @@
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.images.Artwork;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
public class VorbisImageTest extends AbstractTestCase {
@@ -27,7 +28,7 @@ public class VorbisImageTest extends AbstractTestCase {
public void testReadFileWithSmallImageTag() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testsmallimage.ogg");
+ File testFile = copyAudioToTmp("testsmallimage.ogg");
AudioFile f = AudioFileIO.read(testFile);
String mimeType = ((VorbisCommentTag) f.getTag()).getFirst(
VorbisCommentFieldKey.COVERARTMIME
@@ -54,7 +55,7 @@ public void testReadFileWithSmallImageTag() {
public void testReadFileWithLargeImageTag() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("testlargeimage.ogg");
+ File testFile = copyAudioToTmp("testlargeimage.ogg");
AudioFile f = AudioFileIO.read(testFile);
String mimeType = ((VorbisCommentTag) f.getTag()).getFirst(
VorbisCommentFieldKey.COVERARTMIME
@@ -67,7 +68,6 @@ public void testReadFileWithLargeImageTag() {
assertEquals(1013576, imageRawData.length());
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -79,16 +79,16 @@ public void testReadFileWithLargeImageTag() {
@Test
public void testWriteImage1() {
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWriteImage1.ogg")
+ "testWriteImage1.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Add new image, requires two fields in oggVorbis with data in base64 encoded form
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -122,7 +122,6 @@ public void testWriteImage1() {
);
assertNotNull(bi);
} catch (Exception e) {
- e.printStackTrace();
}
}
@@ -132,16 +131,16 @@ public void testWriteImage1() {
@Test
public void testWriteImage2() {
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWriteImage2.ogg")
+ "testWriteImage2.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Add new image using purpose built method
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -171,7 +170,6 @@ public void testWriteImage2() {
);
assertNotNull(bi);
} catch (Exception e) {
- e.printStackTrace();
}
}
@@ -181,16 +179,16 @@ public void testWriteImage2() {
@Test
public void testWriteImage3() {
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWriteImage3.ogg")
+ "testWriteImage3.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Add new image, requires two fields in oggVorbis with data in base64 encoded form
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.png"),
+ fileResource("testdata", "coverart.png"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -215,7 +213,6 @@ public void testWriteImage3() {
);
assertNotNull(bi);
} catch (Exception e) {
- e.printStackTrace();
}
}
@@ -223,23 +220,19 @@ public void testWriteImage3() {
* Test can read file with base64 encoded image which has newlines in it
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFileWithNewlinesInBase64() {
- File orig = new File("testdata", "testnewlineimage.small.ogg");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"testnewlineimage.small.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
List artwork = f.getTag().getArtworkList();
assertEquals(1, artwork.size());
final Artwork next = artwork.iterator().next();
- final FileOutputStream fos = new FileOutputStream(new File("test.jpg"));
+ final FileOutputStream fos = new FileOutputStream("test.jpg");
for (byte b : next.getBinaryData()) {
fos.write(b);
}
diff --git a/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisReadTagTest.java b/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisReadTagTest.java
index 857b356..d426f8b 100755
--- a/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisReadTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisReadTagTest.java
@@ -1,8 +1,5 @@
package org.jaudiotagger.tag.vorbiscomment;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.io.RandomAccessFile;
import org.jaudiotagger.AbstractTestCase;
@@ -12,6 +9,9 @@
import org.jaudiotagger.audio.ogg.OggFileReader;
import org.jaudiotagger.tag.FieldKey;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+
+import static org.junit.jupiter.api.Assertions.*;
public class VorbisReadTagTest extends AbstractTestCase {
@@ -20,22 +20,17 @@ public class VorbisReadTagTest extends AbstractTestCase {
* so no error found in this test.
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadCorruptOgg() {
- File orig = new File("testdata", "test6.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
//Can summarize file
- File testFile = AbstractTestCase.copyAudioToTmp("test6.ogg");
+ File testFile = copyAudioToTmp("test6.ogg");
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
OggFileReader oggFileReader = new OggFileReader();
oggFileReader.summarizeOggPageHeaders(testFile);
raf.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -46,22 +41,17 @@ public void testReadCorruptOgg() {
* are 6 it should throw appropriate error
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadCorruptOgg2() {
- File orig = new File("testdata", "test6.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
//Can summarize file
- File testFile = AbstractTestCase.copyAudioToTmp("test6.ogg");
+ File testFile = copyAudioToTmp("test6.ogg");
AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
/**
@@ -72,9 +62,9 @@ public void testReadCorruptOgg2() {
public void testCreateCorruptFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWithEmptyField.ogg")
+ "testWithEmptyField.ogg"
);
AudioFile file = AudioFileIO.read(testFile);
file.getTag().setField(FieldKey.YEAR, "");
diff --git a/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisWriteTagTest.java b/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisWriteTagTest.java
index 82afe82..e8c0311 100755
--- a/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisWriteTagTest.java
+++ b/src/test/java/org/jaudiotagger/tag/vorbiscomment/VorbisWriteTagTest.java
@@ -6,7 +6,8 @@
import java.io.RandomAccessFile;
import java.util.Base64;
import java.util.List;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.ogg.OggFileReader;
@@ -15,8 +16,9 @@
import org.jaudiotagger.tag.TagField;
import org.jaudiotagger.tag.TagOptionSingleton;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class VorbisWriteTagTest {
+public class VorbisWriteTagTest extends AbstractBaseTestCase {
/**
* Can summarize file
@@ -25,16 +27,15 @@ public class VorbisWriteTagTest {
public void testSummarizeFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testSummarizeFile.ogg")
+ "testSummarizeFile.ogg"
);
RandomAccessFile raf = new RandomAccessFile(testFile, "r");
OggFileReader oggFileReader = new OggFileReader();
oggFileReader.summarizeOggPageHeaders(testFile);
raf.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -45,25 +46,20 @@ public void testSummarizeFile() {
*/
@Test
public void testWriteToFileMuchLarger() {
- File orig = new File("testdata", "test.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWriteTagTestRequiresTwoPages.ogg")
+ "testWriteTagTestRequiresTwoPages.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Add new image, requires two fields in oggVorbis with data in base64 encoded form
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.bmp"),
+ fileResource("testdata", "coverart.bmp"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -96,7 +92,6 @@ public void testWriteToFileMuchLarger() {
System.out.println(oggFileReader.readOggPageHeader(raf, 2));
raf.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -107,20 +102,15 @@ public void testWriteToFileMuchLarger() {
*/
@Test
public void testWriteToFileMuchLargerSetupHeaderSplit() {
- File orig = new File("testdata", "test.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWriteTagTestRequiresTwoPagesHeaderSplit.ogg")
+ "testWriteTagTestRequiresTwoPagesHeaderSplit.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Add new pretend image to force split of setup header
@@ -158,7 +148,6 @@ public void testWriteToFileMuchLargerSetupHeaderSplit() {
raf.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -169,17 +158,13 @@ public void testWriteToFileMuchLargerSetupHeaderSplit() {
* comment data is changed but size of comment header is same length
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeader() {
- File orig = new File("testdata", "test2.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test2.ogg",
- new File("testWriteTagWithExtraPacketsHeaderSameSize.ogg")
+ "testWriteTagWithExtraPacketsHeaderSameSize.ogg"
);
OggFileReader oggFileReader = new OggFileReader();
@@ -190,7 +175,7 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeader() {
raf.close();
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//These have methods coz common over all formats
@@ -213,7 +198,6 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeader() {
raf.close();
assertEquals(packetsInSecondPageCount, pageHeader.getPacketList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -224,17 +208,15 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeader() {
* so that comment is larger, but the comment, header and extra packets can still all fit on page 2
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderLarger() {
- File orig = new File("testdata", "test2.ogg");
- if (!orig.isFile()) {
- return;
- }
+ File orig = fileResource("testdata", "test2.ogg");
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test2.ogg",
- new File("testWriteTagWithExtraPacketsHeaderLargerSize.ogg")
+ "testWriteTagWithExtraPacketsHeaderLargerSize.ogg"
);
OggFileReader oggFileReader = new OggFileReader();
@@ -245,7 +227,7 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderLarger() {
raf.close();
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//These have methods coz common over all formats
@@ -268,7 +250,6 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderLarger() {
raf.close();
assertEquals(packetsInSecondPageCount, pageHeader.getPacketList().size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -279,26 +260,22 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderLarger() {
* so that comment is much larger, so that comment, header and extra packets can no longer fit on page 2
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderMuchLarger() {
- File orig = new File("testdata", "test2.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWriteTagWithExtraPacketsHeaderMuchLargerSize.ogg")
+ "testWriteTagWithExtraPacketsHeaderMuchLargerSize.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Add new image, requires two fields in oggVorbis with data in base64 encoded form
RandomAccessFile imageFile = new RandomAccessFile(
- new File("testdata", "coverart.bmp"),
+ fileResource("testdata", "coverart.bmp"),
"r"
);
byte[] imagedata = new byte[(int) imageFile.length()];
@@ -331,7 +308,6 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderMuchLarger() {
//oggFileReader.readOggPageHeader(raf,4);
raf.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -343,21 +319,17 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderMuchLarger() {
* setup header is also split over two
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderMuchLargerAndSplit() {
- File orig = new File("testdata", "test2.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test2.ogg",
- new File("testWriteTagWithExtraPacketsHeaderMuchLargerSizeAndSplit.ogg")
+ "testWriteTagWithExtraPacketsHeaderMuchLargerSizeAndSplit.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Add new pretend image to force split of setup header
@@ -396,7 +368,6 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderMuchLargerAndS
//assertEquals(1,tag.getFields(VorbisCommentFieldKey.COVERART).size());
//assertEquals(1,tag.getFields(VorbisCommentFieldKey.COVERARTMIME).size());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -407,20 +378,15 @@ public void testWriteToFileWithExtraPacketsOnSamePageAsSetupHeaderMuchLargerAndS
*/
@Test
public void testWriteToFileNoLongerRequiresTwoPages() {
- File orig = new File("testdata", "test3.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test3.ogg",
- new File("testWriteTagTestNoLongerRequiresTwoPages.ogg")
+ "testWriteTagTestNoLongerRequiresTwoPages.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Delete Large Image
@@ -447,7 +413,6 @@ public void testWriteToFileNoLongerRequiresTwoPages() {
System.out.println(oggFileReader.readOggPageHeader(raf, 2));
raf.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -458,20 +423,17 @@ public void testWriteToFileNoLongerRequiresTwoPages() {
*/
@Test
public void testWriteToFileNoLongerRequiresTwoPagesNorSplit() {
- File orig = new File("testdata", "test5.ogg");
- if (!orig.isFile()) {
- return;
- }
+ File orig = fileResource("testdata", "test5.ogg");
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test5.ogg",
- new File("testWriteTagTestNoLongerRequiresTwoPagesNorSplit.ogg")
+ "testWriteTagTestNoLongerRequiresTwoPagesNorSplit.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Delete Large Image
@@ -498,7 +460,6 @@ public void testWriteToFileNoLongerRequiresTwoPagesNorSplit() {
System.out.println(oggFileReader.readOggPageHeader(raf, 2));
raf.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -508,21 +469,17 @@ public void testWriteToFileNoLongerRequiresTwoPagesNorSplit() {
* Test writing to file, comments was too large for one page but not anymore
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWriteToFileWriteToFileWithExtraPacketsNoLongerRequiresTwoPages() {
- File orig = new File("testdata", "test4.ogg");
- if (!orig.isFile()) {
- return;
- }
-
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test4.ogg",
- new File("testWriteTagTestWithPacketsNoLongerRequiresTwoPages.ogg")
+ "testWriteTagTestWithPacketsNoLongerRequiresTwoPages.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof VorbisCommentTag);
+ assertInstanceOf(VorbisCommentTag.class, f.getTag());
VorbisCommentTag tag = (VorbisCommentTag) f.getTag();
//Delete Large Image
@@ -551,7 +508,6 @@ public void testWriteToFileWriteToFileWithExtraPacketsNoLongerRequiresTwoPages()
System.out.println(oggFileReader.readOggPageHeader(raf, 2));
raf.close();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -559,9 +515,9 @@ public void testWriteToFileWriteToFileWithExtraPacketsNoLongerRequiresTwoPages()
@Test
public void testDeleteTag() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testDelete.ogg")
+ "testDelete.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
f.setTag(VorbisCommentTag.createNewTag());
@@ -574,9 +530,9 @@ public void testDeleteTag() throws Exception {
@Test
public void testDeleteTag2() throws Exception {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testDelete2.ogg")
+ "testDelete2.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
AudioFileIO.delete(f);
@@ -595,9 +551,9 @@ public void testWriteMultipleFields() throws Exception {
VorbisAlbumArtistSaveOptions.WRITE_ALBUMARTIST
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testWriteMultiple.ogg")
+ "testWriteMultiple.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
f.getTag().addField(FieldKey.ALBUM_ARTIST, "artist1");
@@ -611,9 +567,9 @@ public void testWriteMultipleFields() throws Exception {
@Test
public void testDeleteFields() throws Exception {
//Delete using generic key
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test.ogg",
- new File("testDeleteFields.ogg")
+ "testDeleteFields.ogg"
);
AudioFile f = AudioFileIO.read(testFile);
List tagFields = f.getTag().getFields(FieldKey.ALBUM_ARTIST_SORT);
diff --git a/src/test/java/org/jaudiotagger/tag/wav/WavMetadataNewTagsId3BeforeInfoTest.java b/src/test/java/org/jaudiotagger/tag/wav/WavMetadataNewTagsId3BeforeInfoTest.java
index f34821c..d32d345 100755
--- a/src/test/java/org/jaudiotagger/tag/wav/WavMetadataNewTagsId3BeforeInfoTest.java
+++ b/src/test/java/org/jaudiotagger/tag/wav/WavMetadataNewTagsId3BeforeInfoTest.java
@@ -31,9 +31,9 @@ public void testModifyFileMetadataSaveBoth() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveBothNew.wav")
+ "test123ModifyMetadataSaveBothNew.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -41,7 +41,7 @@ public void testModifyFileMetadataSaveBoth() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -71,7 +71,7 @@ public void testModifyFileMetadataSaveBoth() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -89,7 +89,6 @@ public void testModifyFileMetadataSaveBoth() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(18L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -110,9 +109,9 @@ public void testModifyFileWithMoreMetadataSaveBoth() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMoreMetadataNew.wav")
+ "test123ModifyMoreMetadataNew.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -120,7 +119,7 @@ public void testModifyFileWithMoreMetadataSaveBoth() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -156,7 +155,7 @@ public void testModifyFileWithMoreMetadataSaveBoth() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals(
@@ -181,7 +180,6 @@ public void testModifyFileWithMoreMetadataSaveBoth() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(18L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -201,9 +199,9 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveExistingActiveId3New.wav")
+ "test123ModifyMetadataSaveExistingActiveId3New.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -211,7 +209,7 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -242,7 +240,7 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -260,7 +258,6 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(34L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -281,9 +278,9 @@ public void testModifyFileMetadataSaveActiveId3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveActiveId3New.wav")
+ "test123ModifyMetadataSaveActiveId3New.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -291,7 +288,7 @@ public void testModifyFileMetadataSaveActiveId3() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -322,7 +319,7 @@ public void testModifyFileMetadataSaveActiveId3() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -339,7 +336,6 @@ public void testModifyFileMetadataSaveActiveId3() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(34L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -360,9 +356,9 @@ public void testModifyFileMetadataSaveActiveId32() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126ModifyMetadataSaveActiveId3New.wav")
+ "test126ModifyMetadataSaveActiveId3New.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -370,7 +366,7 @@ public void testModifyFileMetadataSaveActiveId32() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertFalse(tag.isExistingInfoTag());
@@ -395,7 +391,7 @@ public void testModifyFileMetadataSaveActiveId32() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
@@ -413,7 +409,6 @@ public void testModifyFileMetadataSaveActiveId32() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(34L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -428,11 +423,6 @@ public void testModifyFileMetadataSaveActiveId32() {
public void testFileDeleteWithInfoAndOddLengthData() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test129.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -442,15 +432,14 @@ public void testFileDeleteWithInfoAndOddLengthData() {
WavSaveOrder.ID3_THEN_INFO
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test129.wav",
- new File("test128OddData.wav")
+ "test128OddData.wav"
);
try {
AudioFile f = AudioFileIO.read(testFile);
f.delete();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/tag/wav/WavMetadataNewTagsInfobeforeId3Test.java b/src/test/java/org/jaudiotagger/tag/wav/WavMetadataNewTagsInfobeforeId3Test.java
index b4344ac..fbf710e 100755
--- a/src/test/java/org/jaudiotagger/tag/wav/WavMetadataNewTagsInfobeforeId3Test.java
+++ b/src/test/java/org/jaudiotagger/tag/wav/WavMetadataNewTagsInfobeforeId3Test.java
@@ -31,9 +31,9 @@ public void testModifyFileMetadataSaveBoth() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveBothNew.wav")
+ "test123ModifyMetadataSaveBothNew.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -41,7 +41,7 @@ public void testModifyFileMetadataSaveBoth() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -71,7 +71,7 @@ public void testModifyFileMetadataSaveBoth() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -89,7 +89,6 @@ public void testModifyFileMetadataSaveBoth() {
assertEquals(926552L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(18L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -110,9 +109,9 @@ public void testModifyFileWithMoreMetadataSaveBoth() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMoreMetadataNew.wav")
+ "test123ModifyMoreMetadataNew.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -120,7 +119,7 @@ public void testModifyFileWithMoreMetadataSaveBoth() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -156,7 +155,7 @@ public void testModifyFileWithMoreMetadataSaveBoth() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals(
@@ -181,7 +180,6 @@ public void testModifyFileWithMoreMetadataSaveBoth() {
assertEquals(926700L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(18L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -202,9 +200,9 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveExistingActiveId3New.wav")
+ "test123ModifyMetadataSaveExistingActiveId3New.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -212,7 +210,7 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -243,7 +241,7 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -261,7 +259,6 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
assertEquals(926560L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(34L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -282,9 +279,9 @@ public void testModifyFileMetadataSaveActiveId3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveActiveId3New.wav")
+ "test123ModifyMetadataSaveActiveId3New.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -292,7 +289,7 @@ public void testModifyFileMetadataSaveActiveId3() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -323,7 +320,7 @@ public void testModifyFileMetadataSaveActiveId3() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -340,7 +337,6 @@ public void testModifyFileMetadataSaveActiveId3() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(34L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -361,9 +357,9 @@ public void testModifyFileMetadataSaveActiveId32() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126ModifyMetadataSaveActiveId3New.wav")
+ "test126ModifyMetadataSaveActiveId3New.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -371,7 +367,7 @@ public void testModifyFileMetadataSaveActiveId32() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertFalse(tag.isExistingInfoTag());
@@ -396,7 +392,7 @@ public void testModifyFileMetadataSaveActiveId32() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
@@ -414,7 +410,6 @@ public void testModifyFileMetadataSaveActiveId32() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(34L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -429,11 +424,6 @@ public void testModifyFileMetadataSaveActiveId32() {
public void testFileDeleteWithInfoAndOddLengthData() {
Exception exceptionCaught = null;
- File orig = new File("testdata", "test129.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -443,15 +433,14 @@ public void testFileDeleteWithInfoAndOddLengthData() {
WavSaveOrder.INFO_THEN_ID3
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test129.wav",
- new File("test128OddData.wav")
+ "test128OddData.wav"
);
try {
AudioFile f = AudioFileIO.read(testFile);
f.delete();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
diff --git a/src/test/java/org/jaudiotagger/tag/wav/WavMetadataTest.java b/src/test/java/org/jaudiotagger/tag/wav/WavMetadataTest.java
index df91f33..c3c5dbc 100755
--- a/src/test/java/org/jaudiotagger/tag/wav/WavMetadataTest.java
+++ b/src/test/java/org/jaudiotagger/tag/wav/WavMetadataTest.java
@@ -18,8 +18,11 @@
import org.jaudiotagger.tag.id3.AbstractID3v2Tag;
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
-public class WavMetadataTest extends AbstractTestCase {
+public class WavMetadataTest extends FilePermissionsTest {
/**
* Read file with metadata added by MediaMonkey
@@ -35,7 +38,7 @@ public void testReadFileWithListInfoMetadata() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -43,7 +46,7 @@ public void testReadFileWithListInfoMetadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
//Ease of use methods for common fields
@@ -75,7 +78,6 @@ public void testReadFileWithListInfoMetadata() {
assertEquals(0L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(0L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -98,9 +100,9 @@ public void testModifyFileMetadataSaveBoth() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveBoth.wav")
+ "test123ModifyMetadataSaveBoth.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -109,7 +111,7 @@ public void testModifyFileMetadataSaveBoth() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -135,7 +137,7 @@ public void testModifyFileMetadataSaveBoth() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -160,7 +162,6 @@ public void testModifyFileMetadataSaveBoth() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -170,6 +171,7 @@ public void testModifyFileMetadataSaveBoth() {
* Read file with metadata added by MediaMonkey
*/
@Test
+ @EnabledOnOs(OS.WINDOWS) // gives unexpected results on github ubunto build machine
public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -180,9 +182,9 @@ public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMoreMetadataInfoId3.wav")
+ "test123ModifyMoreMetadataInfoId3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -192,7 +194,7 @@ public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -224,7 +226,7 @@ public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(f.getTag());
@@ -258,13 +260,13 @@ public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
f = AudioFileIO.read(testFile);
System.out.println(tag.getInfoTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledOnOs(OS.WINDOWS) // gives unexpected results on github ubunto build machine
public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -275,9 +277,9 @@ public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMoreMetadataId3Info.wav")
+ "test123ModifyMoreMetadataId3Info.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -287,7 +289,7 @@ public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -319,7 +321,7 @@ public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals(
@@ -363,7 +365,6 @@ public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
assertEquals(428L, tag.getInfoTag().getSizeOfTag());
assertEquals(926648L, testFile.length());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -380,9 +381,9 @@ public void testDeleteFileInfoMetadata() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123DeleteMetadata.wav")
+ "test123DeleteMetadata.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -390,7 +391,7 @@ public void testDeleteFileInfoMetadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -417,7 +418,7 @@ public void testDeleteFileInfoMetadata() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -431,7 +432,6 @@ public void testDeleteFileInfoMetadata() {
assertEquals(0L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(0L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -448,9 +448,9 @@ public void testDeleteFileId3Metadata() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126DeleteId3Metadata.wav")
+ "test126DeleteId3Metadata.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -458,7 +458,7 @@ public void testDeleteFileId3Metadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -479,7 +479,7 @@ public void testDeleteFileId3Metadata() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -493,7 +493,6 @@ public void testDeleteFileId3Metadata() {
assertEquals(0L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(0L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -513,7 +512,7 @@ public void testReadFileWithID3AndListInfoMetadata() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -521,7 +520,7 @@ public void testReadFileWithID3AndListInfoMetadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
//Ease of use methods for common fields
@@ -545,7 +544,7 @@ public void testReadFileWithID3AndListInfoMetadata() {
assertTrue(tag.isID3Tag());
AbstractID3v2Tag id3tag = tag.getID3Tag();
- assertTrue(id3tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, id3tag);
assertEquals("id3artistName", id3tag.getFirst(FieldKey.ARTIST));
assertEquals("id3albumName", id3tag.getFirst(FieldKey.ALBUM));
assertEquals("test123", id3tag.getFirst(FieldKey.TITLE));
@@ -567,7 +566,6 @@ public void testReadFileWithID3AndListInfoMetadata() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(243L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -588,9 +586,9 @@ public void testDeleteFileInfoAndID3Metadata() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test125.wav",
- new File("test125DeleteMetadata.wav")
+ "test125DeleteMetadata.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -598,7 +596,7 @@ public void testDeleteFileInfoAndID3Metadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -612,14 +610,13 @@ public void testDeleteFileInfoAndID3Metadata() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
assertFalse(tag.isExistingInfoTag());
assertFalse(tag.isExistingId3Tag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -636,7 +633,7 @@ public void testWavReadOptionsHasId3AndInfo() {
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_INFO_ONLY
);
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -653,7 +650,7 @@ public void testWavReadOptionsHasId3AndInfo() {
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_ONLY
);
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -670,7 +667,7 @@ public void testWavReadOptionsHasId3AndInfo() {
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
);
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -687,7 +684,7 @@ public void testWavReadOptionsHasId3AndInfo() {
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_INFO_UNLESS_ONLY_ID3
);
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -700,7 +697,6 @@ public void testWavReadOptionsHasId3AndInfo() {
assertEquals("rock\0", tag.getFirst(FieldKey.GENRE));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -724,7 +720,7 @@ public void testWavReadOptionsHasInfoOnly() {
WavSaveOrder.INFO_THEN_ID3
);
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -741,7 +737,7 @@ public void testWavReadOptionsHasInfoOnly() {
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_ONLY
);
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -761,7 +757,7 @@ public void testWavReadOptionsHasInfoOnly() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_EXISTING_AND_ACTIVE
);
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -781,7 +777,7 @@ public void testWavReadOptionsHasInfoOnly() {
TagOptionSingleton.getInstance().setWavSaveOptions(
WavSaveOptions.SAVE_EXISTING_AND_ACTIVE
);
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -794,7 +790,6 @@ public void testWavReadOptionsHasInfoOnly() {
assertEquals("rock\0", tag.getFirst(FieldKey.GENRE));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -804,6 +799,7 @@ public void testWavReadOptionsHasInfoOnly() {
* Read file with metadata added by MediaMonkey
*/
@Test
+ @EnabledOnOs(OS.WINDOWS) // gives unexpected results on github ubunto build machine
public void testModifyFileMetadataSaveActive() {
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -815,9 +811,9 @@ public void testModifyFileMetadataSaveActive() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveActive.wav")
+ "test123ModifyMetadataSaveActive.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -825,7 +821,7 @@ public void testModifyFileMetadataSaveActive() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -851,7 +847,7 @@ public void testModifyFileMetadataSaveActive() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -876,7 +872,6 @@ public void testModifyFileMetadataSaveActive() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -886,6 +881,7 @@ public void testModifyFileMetadataSaveActive() {
* Read file with metadata added by MediaMonkey
*/
@Test
+ @EnabledOnOs(OS.WINDOWS) // gives unexpected results on github ubunto build machine
public void testModifyFileWithMoreMetadataSaveActive() {
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -897,9 +893,9 @@ public void testModifyFileWithMoreMetadataSaveActive() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMoreMetadataSaveActive.wav")
+ "test123ModifyMoreMetadataSaveActive.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -907,7 +903,7 @@ public void testModifyFileWithMoreMetadataSaveActive() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -939,7 +935,7 @@ public void testModifyFileWithMoreMetadataSaveActive() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals(
@@ -964,7 +960,6 @@ public void testModifyFileWithMoreMetadataSaveActive() {
assertEquals(0L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(0L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -985,9 +980,9 @@ public void testModifyFileMetadataSaveExistingActiveInfo() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveExistingActive.wav")
+ "test123ModifyMetadataSaveExistingActive.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -995,7 +990,7 @@ public void testModifyFileMetadataSaveExistingActiveInfo() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -1021,7 +1016,7 @@ public void testModifyFileMetadataSaveExistingActiveInfo() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -1046,7 +1041,6 @@ public void testModifyFileMetadataSaveExistingActiveInfo() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1067,9 +1061,9 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveExistingActiveId3.wav")
+ "test123ModifyMetadataSaveExistingActiveId3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1077,7 +1071,7 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -1104,7 +1098,7 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -1129,7 +1123,6 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1150,9 +1143,9 @@ public void testModifyFileMetadataSaveActiveId3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveActiveId3.wav")
+ "test123ModifyMetadataSaveActiveId3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1160,7 +1153,7 @@ public void testModifyFileMetadataSaveActiveId3() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -1187,7 +1180,7 @@ public void testModifyFileMetadataSaveActiveId3() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -1211,7 +1204,6 @@ public void testModifyFileMetadataSaveActiveId3() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1232,9 +1224,9 @@ public void testModifyFileMetadataSaveActiveId32() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126ModifyMetadataSaveActiveId3.wav")
+ "test126ModifyMetadataSaveActiveId3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1242,7 +1234,7 @@ public void testModifyFileMetadataSaveActiveId32() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertFalse(tag.isExistingInfoTag());
@@ -1263,7 +1255,7 @@ public void testModifyFileMetadataSaveActiveId32() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
@@ -1288,7 +1280,6 @@ public void testModifyFileMetadataSaveActiveId32() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1306,9 +1297,9 @@ public void testWriteNumberedOddSaveActive() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test125.wav",
- new File("test125ID3OddNumberedActive.wav")
+ "test125ID3OddNumberedActive.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1317,7 +1308,7 @@ public void testWriteNumberedOddSaveActive() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -1350,13 +1341,13 @@ public void testWriteNumberedOddSaveActive() {
System.out.println(f.getTag());
assertEquals("a nice long artist s", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledOnOs(OS.WINDOWS) // gives unexpected results on github ubunto build machine
public void testWriteNumberedOddSaveBoth() {
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_ID3_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -1367,9 +1358,9 @@ public void testWriteNumberedOddSaveBoth() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test125.wav",
- new File("test125ID3OddNumberedBoth.wav")
+ "test125ID3OddNumberedBoth.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1378,7 +1369,7 @@ public void testWriteNumberedOddSaveBoth() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals("id3artistName", tag.getFirst(FieldKey.ARTIST));
@@ -1438,7 +1429,6 @@ public void testWriteNumberedOddSaveBoth() {
assertEquals("a nice long artist s", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1448,12 +1438,8 @@ public void testWriteNumberedOddSaveBoth() {
* This file has three bytes of padding data at end of file
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFileWithPaddingAtEndOfListInfoMetadata() {
- File orig = new File("testdata", "test146.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -1465,7 +1451,7 @@ public void testReadFileWithPaddingAtEndOfListInfoMetadata() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test146.wav");
+ File testFile = copyAudioToTmp("test146.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -1481,19 +1467,14 @@ public void testReadFileWithPaddingAtEndOfListInfoMetadata() {
assertEquals("Coffee Pot, Part 2", f.getTag().getFirst(FieldKey.TITLE));
assertEquals("Hippy", f.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testNaimRip() {
- File orig = new File("testdata", "test149.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1504,12 +1485,11 @@ public void testNaimRip() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test149.wav");
+ File testFile = copyAudioToTmp("test149.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1517,37 +1497,27 @@ public void testNaimRip() {
@Test
public void testCreationOfDefaultTag() {
- File orig = new File("testdata", "test126.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test126.wav");
+ File testFile = copyAudioToTmp("test126.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
f.createDefaultTag();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testRip2() {
- File orig = new File("testdata", "test500.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1558,7 +1528,7 @@ public void testRip2() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test500.wav");
+ File testFile = copyAudioToTmp("test500.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1569,19 +1539,14 @@ public void testRip2() {
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testRip3() {
- File orig = new File("testdata", "test501.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1592,25 +1557,20 @@ public void testRip3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test501.wav");
+ File testFile = copyAudioToTmp("test501.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testRip4() {
- File orig = new File("testdata", "test502.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1621,13 +1581,12 @@ public void testRip4() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test502.wav");
+ File testFile = copyAudioToTmp("test502.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1637,12 +1596,8 @@ public void testRip4() {
* When chunk header has negative size we know something has gone wrong and should throw exception accordingly
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWavWithCorruptDataAfterDataChunkHeaderSize() {
- File orig = new File("testdata", "test503.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1653,25 +1608,20 @@ public void testWavWithCorruptDataAfterDataChunkHeaderSize() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test503.wav");
+ File testFile = copyAudioToTmp("test503.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assert (exceptionCaught instanceof CannotReadException);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testCleanAndThenWriteWavWithCorruptDataChunkHeaderSize() {
- File orig = new File("testdata", "test504.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1681,15 +1631,14 @@ public void testCleanAndThenWriteWavWithCorruptDataChunkHeaderSize() {
);
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test504.wav",
- new File("test504clean.wav")
+ "test504clean.wav"
);
try {
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -1706,19 +1655,14 @@ public void testCleanAndThenWriteWavWithCorruptDataChunkHeaderSize() {
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught2 = e;
}
assertNull(exceptionCaught2);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWavRead() {
- File orig = new File("testdata", "test505.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1729,24 +1673,19 @@ public void testWavRead() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test505.wav");
+ File testFile = copyAudioToTmp("test505.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWavReadNew() {
- File orig = new File("testdata", "test506.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1757,7 +1696,7 @@ public void testWavReadNew() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test506.wav");
+ File testFile = copyAudioToTmp("test506.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1767,38 +1706,33 @@ public void testWavReadNew() {
f.commit();
f = AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
@Test
public void testWriteWriteProtectedFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckDisabled(
+ runWriteWriteProtectedFileWithCheckDisabled(
"test123.wav"
);
}
@Test
public void testWriteWriteProtectedFileWithCheckEnabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckEnabled(
+ runWriteWriteProtectedFileWithCheckEnabled(
"test123.wav"
);
}
@Test
public void testWriteReadOnlyFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteReadOnlyFileWithCheckDisabled("test123.wav");
+ runWriteReadOnlyFileWithCheckDisabled("test123.wav");
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadJacobPavluk() {
- File orig = new File("testdata", "GreenLight.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1811,7 +1745,7 @@ public void testReadJacobPavluk() {
);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("GreenLight.wav");
+ File testFile = copyAudioToTmp("GreenLight.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -1822,7 +1756,6 @@ public void testReadJacobPavluk() {
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
}
@@ -1837,21 +1770,17 @@ public void testTrackNumbersSyncedWhenNullTerminated() throws Exception {
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO_AND_SYNC
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"bug153.wav",
- new File("bug153.wav")
+ "bug153.wav"
);
AudioFile f = AudioFileIO.read(testFile);
assertEquals("7", f.getTag().getFirst(FieldKey.TRACK));
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWavRead2() {
- File orig = new File("testdata", "test160.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1862,7 +1791,7 @@ public void testWavRead2() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test160.wav");
+ File testFile = copyAudioToTmp("test160.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1872,9 +1801,8 @@ public void testWavRead2() {
f.commit();
f = AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/wav/WavMetadataTwonkyTrckTest.java b/src/test/java/org/jaudiotagger/tag/wav/WavMetadataTwonkyTrckTest.java
index 99ce475..47a1c85 100755
--- a/src/test/java/org/jaudiotagger/tag/wav/WavMetadataTwonkyTrckTest.java
+++ b/src/test/java/org/jaudiotagger/tag/wav/WavMetadataTwonkyTrckTest.java
@@ -3,7 +3,6 @@
import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
-import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.FilePermissionsTest;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
@@ -18,8 +17,9 @@
import org.jaudiotagger.tag.id3.AbstractID3v2Tag;
import org.jaudiotagger.tag.id3.ID3v23Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
-public class WavMetadataTwonkyTrckTest extends AbstractTestCase {
+public class WavMetadataTwonkyTrckTest extends FilePermissionsTest {
/**
* Read file with metadata added by MediaMonkey
@@ -36,7 +36,7 @@ public void testReadFileWithListInfoMetadata() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -44,7 +44,7 @@ public void testReadFileWithListInfoMetadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
//Ease of use methods for common fields
@@ -76,7 +76,6 @@ public void testReadFileWithListInfoMetadata() {
assertEquals(0L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(0L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -100,9 +99,9 @@ public void testModifyFileMetadataSaveBoth() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveBoth.wav")
+ "test123ModifyMetadataSaveBoth.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -111,7 +110,7 @@ public void testModifyFileMetadataSaveBoth() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -137,7 +136,7 @@ public void testModifyFileMetadataSaveBoth() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -162,7 +161,6 @@ public void testModifyFileMetadataSaveBoth() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -183,9 +181,9 @@ public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMoreMetadataInfoId3.wav")
+ "test123ModifyMoreMetadataInfoId3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -195,7 +193,7 @@ public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -227,7 +225,7 @@ public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(f.getTag());
@@ -261,7 +259,6 @@ public void testModifyFileWithMoreMetadataSaveBothInfoThenId3() {
f = AudioFileIO.read(testFile);
System.out.println(tag.getInfoTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -279,9 +276,9 @@ public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMoreMetadataId3Info.wav")
+ "test123ModifyMoreMetadataId3Info.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -291,7 +288,7 @@ public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -323,7 +320,7 @@ public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals(
@@ -367,7 +364,6 @@ public void testModifyFileWithMoreMetadataSaveBothId3ThenInfo() {
assertEquals(438L, tag.getInfoTag().getSizeOfTag());
assertEquals(926668L, testFile.length());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -385,9 +381,9 @@ public void testDeleteFileInfoMetadata() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123DeleteMetadata.wav")
+ "test123DeleteMetadata.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -395,7 +391,7 @@ public void testDeleteFileInfoMetadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -422,7 +418,7 @@ public void testDeleteFileInfoMetadata() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -436,7 +432,6 @@ public void testDeleteFileInfoMetadata() {
assertEquals(0L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(0L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -454,9 +449,9 @@ public void testDeleteFileId3Metadata() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126DeleteId3Metadata.wav")
+ "test126DeleteId3Metadata.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -464,7 +459,7 @@ public void testDeleteFileId3Metadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -485,7 +480,7 @@ public void testDeleteFileId3Metadata() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -499,7 +494,6 @@ public void testDeleteFileId3Metadata() {
assertEquals(0L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(0L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -520,7 +514,7 @@ public void testReadFileWithID3AndListInfoMetadata() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -528,7 +522,7 @@ public void testReadFileWithID3AndListInfoMetadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
//Ease of use methods for common fields
@@ -552,7 +546,7 @@ public void testReadFileWithID3AndListInfoMetadata() {
assertTrue(tag.isID3Tag());
AbstractID3v2Tag id3tag = tag.getID3Tag();
- assertTrue(id3tag instanceof ID3v23Tag);
+ assertInstanceOf(ID3v23Tag.class, id3tag);
assertEquals("id3artistName", id3tag.getFirst(FieldKey.ARTIST));
assertEquals("id3albumName", id3tag.getFirst(FieldKey.ALBUM));
assertEquals("test123", id3tag.getFirst(FieldKey.TITLE));
@@ -574,7 +568,6 @@ public void testReadFileWithID3AndListInfoMetadata() {
assertEquals(926264L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(243L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -596,9 +589,9 @@ public void testDeleteFileInfoAndID3Metadata() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test125.wav",
- new File("test125DeleteMetadata.wav")
+ "test125DeleteMetadata.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -606,7 +599,7 @@ public void testDeleteFileInfoAndID3Metadata() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
@@ -620,14 +613,13 @@ public void testDeleteFileInfoAndID3Metadata() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
assertTrue(tag.isInfoTag());
assertTrue(tag.isID3Tag());
assertFalse(tag.isExistingInfoTag());
assertFalse(tag.isExistingId3Tag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -645,7 +637,7 @@ public void testWavReadOptionsHasId3AndInfo() {
WavOptions.READ_INFO_ONLY
);
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -663,7 +655,7 @@ public void testWavReadOptionsHasId3AndInfo() {
WavOptions.READ_ID3_ONLY
);
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -681,7 +673,7 @@ public void testWavReadOptionsHasId3AndInfo() {
WavOptions.READ_ID3_UNLESS_ONLY_INFO
);
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -699,7 +691,7 @@ public void testWavReadOptionsHasId3AndInfo() {
WavOptions.READ_INFO_UNLESS_ONLY_ID3
);
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
- File testFile = AbstractTestCase.copyAudioToTmp("test125.wav");
+ File testFile = copyAudioToTmp("test125.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -712,7 +704,6 @@ public void testWavReadOptionsHasId3AndInfo() {
assertEquals("rock\0", tag.getFirst(FieldKey.GENRE));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -737,7 +728,7 @@ public void testWavReadOptionsHasInfoOnly() {
);
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -754,7 +745,7 @@ public void testWavReadOptionsHasInfoOnly() {
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_ONLY
);
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -776,7 +767,7 @@ public void testWavReadOptionsHasInfoOnly() {
);
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -798,7 +789,7 @@ public void testWavReadOptionsHasInfoOnly() {
);
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
- File testFile = AbstractTestCase.copyAudioToTmp("test123.wav");
+ File testFile = copyAudioToTmp("test123.wav");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
//Ease of use methods for common fields
@@ -811,7 +802,6 @@ public void testWavReadOptionsHasInfoOnly() {
assertEquals("rock\0", tag.getFirst(FieldKey.GENRE));
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -833,9 +823,9 @@ public void testModifyFileMetadataSaveActive() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveActive.wav")
+ "test123ModifyMetadataSaveActive.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -843,7 +833,7 @@ public void testModifyFileMetadataSaveActive() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -869,7 +859,7 @@ public void testModifyFileMetadataSaveActive() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -894,7 +884,6 @@ public void testModifyFileMetadataSaveActive() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -916,9 +905,9 @@ public void testModifyFileWithMoreMetadataSaveActive() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMoreMetadataSaveActive.wav")
+ "test123ModifyMoreMetadataSaveActive.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -926,7 +915,7 @@ public void testModifyFileWithMoreMetadataSaveActive() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -958,7 +947,7 @@ public void testModifyFileWithMoreMetadataSaveActive() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals(
@@ -983,7 +972,6 @@ public void testModifyFileWithMoreMetadataSaveActive() {
assertEquals(0L, tag.getStartLocationInFileOfId3Chunk());
assertEquals(0L, tag.getSizeOfID3TagIncludingChunkHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1005,9 +993,9 @@ public void testModifyFileMetadataSaveExistingActiveInfo() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveExistingActive.wav")
+ "test123ModifyMetadataSaveExistingActive.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1015,7 +1003,7 @@ public void testModifyFileMetadataSaveExistingActiveInfo() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -1041,7 +1029,7 @@ public void testModifyFileMetadataSaveExistingActiveInfo() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -1066,7 +1054,6 @@ public void testModifyFileMetadataSaveExistingActiveInfo() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1088,9 +1075,9 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveExistingActiveId3.wav")
+ "test123ModifyMetadataSaveExistingActiveId3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1098,7 +1085,7 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -1125,7 +1112,7 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -1150,7 +1137,6 @@ public void testModifyFileMetadataSaveExistingActiveId3Info() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1171,9 +1157,9 @@ public void testModifyFileMetadataSaveActiveId3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test123.wav",
- new File("test123ModifyMetadataSaveActiveId3.wav")
+ "test123ModifyMetadataSaveActiveId3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1181,7 +1167,7 @@ public void testModifyFileMetadataSaveActiveId3() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertTrue(tag.isExistingInfoTag());
@@ -1208,7 +1194,7 @@ public void testModifyFileMetadataSaveActiveId3() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
assertEquals("fred", tag.getFirst(FieldKey.ARTIST));
@@ -1232,7 +1218,6 @@ public void testModifyFileMetadataSaveActiveId3() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1254,9 +1239,9 @@ public void testModifyFileMetadataSaveActiveId32() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test126.wav",
- new File("test126ModifyMetadataSaveActiveId3.wav")
+ "test126ModifyMetadataSaveActiveId3.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1264,7 +1249,7 @@ public void testModifyFileMetadataSaveActiveId32() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertFalse(tag.isExistingInfoTag());
@@ -1285,7 +1270,7 @@ public void testModifyFileMetadataSaveActiveId32() {
//Read modified metadata now in file
f = AudioFileIO.read(testFile);
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
tag = (WavTag) f.getTag();
System.out.println(tag.getInfoTag());
@@ -1310,7 +1295,6 @@ public void testModifyFileMetadataSaveActiveId32() {
f = AudioFileIO.read(testFile);
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1329,9 +1313,9 @@ public void testWriteNumberedOddSaveActive() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test125.wav",
- new File("test125ID3OddNumberedActive.wav")
+ "test125ID3OddNumberedActive.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1340,7 +1324,7 @@ public void testWriteNumberedOddSaveActive() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals(
@@ -1373,7 +1357,6 @@ public void testWriteNumberedOddSaveActive() {
System.out.println(f.getTag());
assertEquals("a nice long artist s", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1391,9 +1374,9 @@ public void testWriteNumberedOddSaveBoth() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test125.wav",
- new File("test125ID3OddNumberedBoth.wav")
+ "test125ID3OddNumberedBoth.wav"
);
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1402,7 +1385,7 @@ public void testWriteNumberedOddSaveBoth() {
assertEquals("1", f.getAudioHeader().getChannels());
assertEquals("22050", f.getAudioHeader().getSampleRate());
- assertTrue(f.getTag() instanceof WavTag);
+ assertInstanceOf(WavTag.class, f.getTag());
WavTag tag = (WavTag) f.getTag();
assertEquals("id3artistName", tag.getFirst(FieldKey.ARTIST));
@@ -1462,7 +1445,6 @@ public void testWriteNumberedOddSaveBoth() {
assertEquals("a nice long artist s", tag.getFirst(FieldKey.ARTIST));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1472,12 +1454,8 @@ public void testWriteNumberedOddSaveBoth() {
* This file has three bytes of padding data at end of file
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadFileWithPaddingAtEndOfListInfoMetadata() {
- File orig = new File("testdata", "test146.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(WavOptions.READ_INFO_ONLY);
TagOptionSingleton.getInstance().setWavSaveOptions(
@@ -1490,7 +1468,7 @@ public void testReadFileWithPaddingAtEndOfListInfoMetadata() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test146.wav");
+ File testFile = copyAudioToTmp("test146.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -1506,19 +1484,14 @@ public void testReadFileWithPaddingAtEndOfListInfoMetadata() {
assertEquals("Coffee Pot, Part 2", f.getTag().getFirst(FieldKey.TITLE));
assertEquals("Hippy", f.getTag().getFirst(FieldKey.ALBUM));
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testNaimRip() {
- File orig = new File("testdata", "test149.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1529,12 +1502,11 @@ public void testNaimRip() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test149.wav");
+ File testFile = copyAudioToTmp("test149.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1542,11 +1514,6 @@ public void testNaimRip() {
@Test
public void testCreationOfDefaultTag() {
- File orig = new File("testdata", "test126.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1554,26 +1521,21 @@ public void testCreationOfDefaultTag() {
TagOptionSingleton.getInstance().setWriteWavForTwonky(true);
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test126.wav");
+ File testFile = copyAudioToTmp("test126.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
f.createDefaultTag();
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testRip2() {
- File orig = new File("testdata", "test500.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1584,7 +1546,7 @@ public void testRip2() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test500.wav");
+ File testFile = copyAudioToTmp("test500.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1595,19 +1557,14 @@ public void testRip2() {
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testRip3() {
- File orig = new File("testdata", "test501.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1619,25 +1576,20 @@ public void testRip3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test501.wav");
+ File testFile = copyAudioToTmp("test501.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testRip4() {
- File orig = new File("testdata", "test502.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1648,13 +1600,12 @@ public void testRip4() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test502.wav");
+ File testFile = copyAudioToTmp("test502.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -1664,12 +1615,8 @@ public void testRip4() {
* When chunk header has negative size we know something has gone wrong and should throw exception accordingly
*/
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWavWithCorruptDataAfterDataChunkHeaderSize() {
- File orig = new File("testdata", "test503.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1681,25 +1628,20 @@ public void testWavWithCorruptDataAfterDataChunkHeaderSize() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test503.wav");
+ File testFile = copyAudioToTmp("test503.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assert (exceptionCaught instanceof CannotReadException);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testCleanAndThenWriteWavWithCorruptDataChunkHeaderSize() {
- File orig = new File("testdata", "test504.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1709,15 +1651,14 @@ public void testCleanAndThenWriteWavWithCorruptDataChunkHeaderSize() {
);
Exception exceptionCaught = null;
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test504.wav",
- new File("test504clean.wav")
+ "test504clean.wav"
);
try {
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
@@ -1734,19 +1675,14 @@ public void testCleanAndThenWriteWavWithCorruptDataChunkHeaderSize() {
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught2 = e;
}
assertNull(exceptionCaught2);
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWavRead() {
- File orig = new File("testdata", "test505.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1758,24 +1694,19 @@ public void testWavRead() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test505.wav");
+ File testFile = copyAudioToTmp("test505.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWavReadNew() {
- File orig = new File("testdata", "test506.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1787,7 +1718,7 @@ public void testWavReadNew() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test506.wav");
+ File testFile = copyAudioToTmp("test506.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1797,38 +1728,33 @@ public void testWavReadNew() {
f.commit();
f = AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
@Test
public void testWriteWriteProtectedFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckDisabled(
+ runWriteWriteProtectedFileWithCheckDisabled(
"test123.wav"
);
}
@Test
public void testWriteWriteProtectedFileWithCheckEnabled() throws Exception {
- FilePermissionsTest.runWriteWriteProtectedFileWithCheckEnabled(
+ runWriteWriteProtectedFileWithCheckEnabled(
"test123.wav"
);
}
@Test
public void testWriteReadOnlyFileWithCheckDisabled() throws Exception {
- FilePermissionsTest.runWriteReadOnlyFileWithCheckDisabled("test123.wav");
+ runWriteReadOnlyFileWithCheckDisabled("test123.wav");
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testReadJacobPavluk() {
- File orig = new File("testdata", "GreenLight.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1843,7 +1769,7 @@ public void testReadJacobPavluk() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("GreenLight.wav");
+ File testFile = copyAudioToTmp("GreenLight.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
@@ -1854,7 +1780,6 @@ public void testReadJacobPavluk() {
System.out.println(f.getAudioHeader());
System.out.println(f.getTag());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
}
@@ -1869,21 +1794,17 @@ public void testTrackNumbersSyncedWhenNullTerminated() throws Exception {
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO_AND_SYNC
);
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"bug153.wav",
- new File("bug153.wav")
+ "bug153.wav"
);
AudioFile f = AudioFileIO.read(testFile);
assertEquals("7", f.getTag().getFirst(FieldKey.TRACK));
}
@Test
+ @EnabledIf("executeAlsoWithMissingResources") // to be configured in AbsractBaseTestCase
public void testWavRead2() {
- File orig = new File("testdata", "test160.wav");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
TagOptionSingleton.getInstance().setWavOptions(
WavOptions.READ_ID3_UNLESS_ONLY_INFO
@@ -1894,7 +1815,7 @@ public void testWavRead2() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test160.wav");
+ File testFile = copyAudioToTmp("test160.wav");
AudioFile f = AudioFileIO.read(testFile);
System.out.println(f.getAudioHeader());
@@ -1904,9 +1825,8 @@ public void testWavRead2() {
f.commit();
f = AudioFileIO.read(testFile);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
- assertTrue(exceptionCaught instanceof CannotReadException);
+ assertInstanceOf(CannotReadException.class, exceptionCaught);
}
}
diff --git a/src/test/java/org/jaudiotagger/tag/wma/ConcurrentWritesTest.java b/src/test/java/org/jaudiotagger/tag/wma/ConcurrentWritesTest.java
index 2a25388..e648502 100755
--- a/src/test/java/org/jaudiotagger/tag/wma/ConcurrentWritesTest.java
+++ b/src/test/java/org/jaudiotagger/tag/wma/ConcurrentWritesTest.java
@@ -10,7 +10,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.jaudiotagger.AbstractTestCase;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey;
@@ -18,7 +19,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ConcurrentWritesTest {
+public class ConcurrentWritesTest extends AbstractBaseTestCase {
private static final int THREADS = 5;
private final File[] files = new File[THREADS];
@@ -26,11 +27,9 @@ public class ConcurrentWritesTest {
@BeforeEach
public void setUp() {
for (int counter = 0; counter < THREADS; counter++) {
- files[counter] = AbstractTestCase.copyAudioToTmp(
+ files[counter] = copyAudioToTmp(
"test1.wma",
- new File(
- ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".wma"
- )
+ ConcurrentWritesTest.class.getSimpleName() + "-" + counter + ".wma"
);
}
}
@@ -55,13 +54,7 @@ public void testConcurrentWrites() throws Exception {
}
}
- private static class WriteFileCallable implements Callable {
-
- private final File file;
-
- public WriteFileCallable(File file) {
- this.file = file;
- }
+ private record WriteFileCallable(File file) implements Callable {
public Boolean call() throws Exception {
AudioFile audiofile = AudioFileIO.read(file);
diff --git a/src/test/java/org/jaudiotagger/tag/wma/WmaContainerTest.java b/src/test/java/org/jaudiotagger/tag/wma/WmaContainerTest.java
index aaab7d1..3a0e134 100755
--- a/src/test/java/org/jaudiotagger/tag/wma/WmaContainerTest.java
+++ b/src/test/java/org/jaudiotagger/tag/wma/WmaContainerTest.java
@@ -57,7 +57,7 @@ public void testReadWriteEquality() throws IOException {
assertEquals(GUID.GUID_EXTENDED_CONTENT_DESCRIPTION, readGUID);
Chunk read1 = reader.read(GUID.GUID_EXTENDED_CONTENT_DESCRIPTION, bis, 0);
System.out.println(read1);
- assertTrue(read1 instanceof MetadataContainer);
+ assertInstanceOf(MetadataContainer.class, read1);
assertEquals(
tmp.length,
((MetadataContainer) read1).getCurrentAsfChunkSize()
diff --git a/src/test/java/org/jaudiotagger/tag/wma/WmaDescriptionLocationTest.java b/src/test/java/org/jaudiotagger/tag/wma/WmaDescriptionLocationTest.java
index d339c2d..a5b4e68 100755
--- a/src/test/java/org/jaudiotagger/tag/wma/WmaDescriptionLocationTest.java
+++ b/src/test/java/org/jaudiotagger/tag/wma/WmaDescriptionLocationTest.java
@@ -42,6 +42,26 @@ public WmaDescriptionLocationTest() throws Exception {
);
}
+ /**
+ * Tests the locations of the metadata descriptor object and the extended metadata descriptor object, upon
+ * some deep ASF manipulations.
+ *
+ * @throws Exception On I/O Errors
+ */
+ @Test
+ public void testChunkLocations() throws Exception {
+ File testFile = prepareTestFile(null);
+ AudioFile read = AudioFileIO.read(testFile);
+ AudioFileIO.delete(read);
+ read.setTag(testTag);
+ read.commit();
+ checkExcpectations(testFile, true, true, false, false);
+ applyTag(testFile, false, false);
+ applyTag(testFile, false, true);
+ applyTag(testFile, true, false);
+ applyTag(testFile, true, true);
+ }
+
/**
* Applies {@link #testTag} to the given audio file, and allows to specify at which location the
* content description and extended content description are to be added.
@@ -131,24 +151,4 @@ private void checkExcpectations(
readHeader.getExtendedHeader().getExtendedContentDescription() != null
);
}
-
- /**
- * Tests the locations of the metadata descriptor object and the extended metadata descriptor object, upon
- * some deep ASF manipulations.
- *
- * @throws Exception On I/O Errors
- */
- @Test
- public void testChunkLocations() throws Exception {
- File testFile = prepareTestFile(null);
- AudioFile read = AudioFileIO.read(testFile);
- AudioFileIO.delete(read);
- read.setTag(testTag);
- read.commit();
- checkExcpectations(testFile, true, true, false, false);
- applyTag(testFile, false, false);
- applyTag(testFile, false, true);
- applyTag(testFile, true, false);
- applyTag(testFile, true, true);
- }
}
diff --git a/src/test/java/org/jaudiotagger/tag/wma/WmaSimpleTest.java b/src/test/java/org/jaudiotagger/tag/wma/WmaSimpleTest.java
index 5096b8d..d325014 100755
--- a/src/test/java/org/jaudiotagger/tag/wma/WmaSimpleTest.java
+++ b/src/test/java/org/jaudiotagger/tag/wma/WmaSimpleTest.java
@@ -25,19 +25,13 @@ public class WmaSimpleTest extends AbstractTestCase {
@Test
public void testReadFileFromPicardQtInvalidHeaderSizeException() {
- File orig = new File("testdata", "test2.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test2.wma");
+ File testFile = copyAudioToTmp("test2.wma");
AudioFile f = AudioFileIO.read(testFile);
//Now
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -53,7 +47,7 @@ public void testReadFileFromPicardQtInvalidHeaderSizeException() {
public void testReadFileFromMediaMonkey3() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ File testFile = copyAudioToTmp("test1.wma");
AudioFile f = AudioFileIO.read(testFile);
assertEquals("32", f.getAudioHeader().getBitRate());
@@ -65,7 +59,7 @@ public void testReadFileFromMediaMonkey3() {
assertEquals("32000", f.getAudioHeader().getSampleRate());
assertFalse(f.getAudioHeader().isVariableBitRate());
- assertTrue(f.getTag() instanceof AsfTag);
+ assertInstanceOf(AsfTag.class, f.getTag());
AsfTag tag = (AsfTag) f.getTag();
System.out.println(tag);
@@ -124,7 +118,6 @@ public void testReadFileFromMediaMonkey3() {
//assertEquals("remixer", tag.getFirst(FieldKey.REMIXER));
//Now
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -138,15 +131,10 @@ public void testReadFileFromMediaMonkey3() {
*/
@Test
public void testReadFileFromPicardQt() {
- File orig = new File("testdata", "test2.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test2.wma");
+ File testFile = copyAudioToTmp("test2.wma");
AudioFile f = AudioFileIO.read(testFile);
assertEquals("128", f.getAudioHeader().getBitRate());
@@ -158,7 +146,7 @@ public void testReadFileFromPicardQt() {
assertEquals("44100", f.getAudioHeader().getSampleRate());
assertFalse(f.getAudioHeader().isVariableBitRate());
- assertTrue(f.getTag() instanceof AsfTag);
+ assertInstanceOf(AsfTag.class, f.getTag());
AsfTag tag = (AsfTag) f.getTag();
System.out.println(tag);
@@ -305,7 +293,6 @@ public void testReadFileFromPicardQt() {
//Now
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -315,9 +302,9 @@ public void testReadFileFromPicardQt() {
public void testWriteFile() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test1.wma",
- new File("testwrite1.wma")
+ "testwrite1.wma"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -330,7 +317,7 @@ public void testWriteFile() {
assertEquals("32000", f.getAudioHeader().getSampleRate());
assertFalse(f.getAudioHeader().isVariableBitRate());
- assertTrue(f.getTag() instanceof AsfTag);
+ assertInstanceOf(AsfTag.class, f.getTag());
AsfTag tag = (AsfTag) f.getTag();
//Write some new values and save
@@ -441,7 +428,6 @@ public void testWriteFile() {
assertFalse(f.getAudioHeader().isVariableBitRate());
assertTrue(tag.isEmpty());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -454,9 +440,9 @@ public void testWriteFile() {
public void testTagFieldKeyWrite() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test1.wma",
- new File("testwrite1.wma")
+ "testwrite1.wma"
);
AudioFile f = AudioFileIO.read(testFile);
@@ -495,7 +481,6 @@ public void testTagFieldKeyWrite() {
}
}
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -508,9 +493,9 @@ public void testTagFieldKeyWrite() {
public void testTagFieldKeyWrite2() {
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test1.wma",
- new File("testwrite1.wma")
+ "testwrite1.wma"
);
AudioFile f = AudioFileIO.read(testFile);
AudioFileIO.delete(f);
@@ -563,7 +548,6 @@ public void testTagFieldKeyWrite2() {
((TagTextField) tf).getEncoding()
);
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -579,20 +563,14 @@ public void testIsMultiValues() {
*/
@Test
public void testReadFileWithHeaderSizeDoesntMatchFileSize() {
- File orig = new File("testdata", "test3.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test3.wma");
+ File testFile = copyAudioToTmp("test3.wma");
AudioFile f = AudioFileIO.read(testFile);
assertEquals("Glass", f.getTag().getFirst(FieldKey.TITLE));
//Now
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -600,15 +578,10 @@ public void testReadFileWithHeaderSizeDoesntMatchFileSize() {
@Test
public void testReadFileWithGifArtwork() {
- File orig = new File("testdata", "test1.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test1.wma");
+ File testFile = copyAudioToTmp("test1.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(1, tag.getFields(FieldKey.COVER_ART).size());
@@ -618,7 +591,7 @@ public void testReadFileWithGifArtwork() {
assertEquals(14550, tagField.getRawContent().length);
//Should have been loaded as special field to make things easier
- assertTrue(tagField instanceof AsfTagCoverField);
+ assertInstanceOf(AsfTagCoverField.class, tagField);
AsfTagCoverField coverartField = (AsfTagCoverField) tagField;
assertEquals("image/gif", coverartField.getMimeType());
assertEquals("coverart", coverartField.getDescription());
@@ -645,7 +618,7 @@ public void testReadFileWithGifArtwork() {
while (count < tagField.getRawContent().length - 1) {
if (
tagField.getRawContent()[count] == 0 &&
- tagField.getRawContent()[count + 1] == 0
+ tagField.getRawContent()[count + 1] == 0
) {
if (mimeType == null) {
mimeType = new String(
@@ -687,7 +660,6 @@ public void testReadFileWithGifArtwork() {
assertEquals(200, bi.getHeight());
assertEquals(BufferedImage.TYPE_BYTE_INDEXED, bi.getType());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -698,15 +670,10 @@ public void testReadFileWithGifArtwork() {
*/
@Test
public void testReadFileWithGifArtworkNoDescription() {
- File orig = new File("testdata", "test4.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test4.wma");
+ File testFile = copyAudioToTmp("test4.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(1, tag.getFields(FieldKey.COVER_ART).size());
@@ -716,7 +683,7 @@ public void testReadFileWithGifArtworkNoDescription() {
assertEquals(14534, tagField.getRawContent().length);
//Should have been loaded as special field to make things easier
- assertTrue(tagField instanceof AsfTagCoverField);
+ assertInstanceOf(AsfTagCoverField.class, tagField);
AsfTagCoverField coverartField = (AsfTagCoverField) tagField;
assertEquals("image/gif", coverartField.getMimeType());
assertEquals("", coverartField.getDescription());
@@ -741,7 +708,7 @@ public void testReadFileWithGifArtworkNoDescription() {
while (count < tagField.getRawContent().length - 1) {
if (
tagField.getRawContent()[count] == 0 &&
- tagField.getRawContent()[count + 1] == 0
+ tagField.getRawContent()[count + 1] == 0
) {
if (mimeType == null) {
mimeType = new String(
@@ -782,7 +749,6 @@ public void testReadFileWithGifArtworkNoDescription() {
assertEquals(200, bi.getHeight());
assertEquals(BufferedImage.TYPE_BYTE_INDEXED, bi.getType());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -790,15 +756,10 @@ public void testReadFileWithGifArtworkNoDescription() {
@Test
public void testReadFileWithPngArtwork() {
- File orig = new File("testdata", "test5.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test5.wma");
+ File testFile = copyAudioToTmp("test5.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(1, tag.getFields(FieldKey.COVER_ART).size());
@@ -808,7 +769,7 @@ public void testReadFileWithPngArtwork() {
assertEquals(18590, tagField.getRawContent().length);
//Should have been loaded as special field to make things easier
- assertTrue(tagField instanceof AsfTagCoverField);
+ assertInstanceOf(AsfTagCoverField.class, tagField);
AsfTagCoverField coverartField = (AsfTagCoverField) tagField;
assertEquals("image/png", coverartField.getMimeType());
assertEquals(3, coverartField.getPictureType());
@@ -832,7 +793,7 @@ public void testReadFileWithPngArtwork() {
while (count < tagField.getRawContent().length - 1) {
if (
tagField.getRawContent()[count] == 0 &&
- tagField.getRawContent()[count + 1] == 0
+ tagField.getRawContent()[count + 1] == 0
) {
if (mimeType == null) {
mimeType = new String(
@@ -874,7 +835,6 @@ public void testReadFileWithPngArtwork() {
assertEquals(200, bi.getHeight());
// assertEquals(BufferedImage.TYPE_CUSTOM, bi.getType());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -882,15 +842,10 @@ public void testReadFileWithPngArtwork() {
@Test
public void testReadFileWithJpgArtwork() {
- File orig = new File("testdata", "test6.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- return;
- }
Exception exceptionCaught = null;
try {
- File testFile = AbstractTestCase.copyAudioToTmp("test6.wma");
+ File testFile = copyAudioToTmp("test6.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(1, tag.getFields(FieldKey.COVER_ART).size());
@@ -900,7 +855,7 @@ public void testReadFileWithJpgArtwork() {
assertEquals(5093, tagField.getRawContent().length);
//Should have been loaded as special field to make things easier
- assertTrue(tagField instanceof AsfTagCoverField);
+ assertInstanceOf(AsfTagCoverField.class, tagField);
AsfTagCoverField coverartField = (AsfTagCoverField) tagField;
assertEquals("image/jpeg", coverartField.getMimeType());
assertEquals("coveerart", coverartField.getDescription());
@@ -935,7 +890,7 @@ public void testReadFileWithJpgArtwork() {
while (count < tagField.getRawContent().length - 1) {
if (
tagField.getRawContent()[count] == 0 &&
- tagField.getRawContent()[count + 1] == 0
+ tagField.getRawContent()[count + 1] == 0
) {
if (mimeType == null) {
mimeType = new String(
@@ -977,7 +932,6 @@ public void testReadFileWithJpgArtwork() {
assertEquals(200, bi.getHeight());
assertEquals(BufferedImage.TYPE_3BYTE_BGR, bi.getType());
} catch (Exception e) {
- e.printStackTrace();
exceptionCaught = e;
}
assertNull(exceptionCaught);
@@ -988,22 +942,17 @@ public void testReadFileWithJpgArtwork() {
*/
@Test
public void testWritePngArtworkToFile() {
- File orig = new File("testdata", "test7.wma");
- if (!orig.isFile()) {
- System.err.println("Unable to test file - not available");
- }
-
/* TODO Why does it fail
Exception exceptionCaught = null;
try
{
- File testFile = AbstractTestCase.copyAudioToTmp("test7.wma");
+ File testFile = copyAudioToTmp("test7.wma");
AudioFile f = AudioFileIO.read(testFile);
Tag tag = f.getTag();
assertEquals(0, tag.getFields(FieldKey.COVER_ART).size());
//Now createField artwork field
- RandomAccessFile imageFile = new RandomAccessFile(new File("testdata", "coverart.png"), "r");
+ RandomAccessFile imageFile = new RandomAccessFile(fileResource("testdata", "coverart.png"), "r");
byte[] imagedata = new byte[(int) imageFile.length()];
imageFile.read(imagedata);
AsfTag asftag = (AsfTag) tag;
@@ -1028,7 +977,6 @@ public void testWritePngArtworkToFile() {
}
catch (Exception e)
{
- e.printStackTrace();
exceptionCaught = e;
}
@@ -1041,7 +989,7 @@ public void testWritePngArtworkToFile() {
@Test
public void testWriteMultipleFields() throws Exception
{
- File testFile = AbstractTestCase.copyAudioToTmp("test1.wma", new File("testWriteMultiple.wma"));
+ File testFile = copyAudioToTmp("test1.wma", "testWriteMultiple.wma");
AudioFile f = AudioFileIO.read(testFile);
List tagFields = f.getTag().getFields(FieldKey.ALBUM_ARTIST_SORT);
assertEquals(tagFields.size(),0);
@@ -1057,9 +1005,9 @@ public void testWriteMultipleFields() throws Exception
@Test
public void testDeleteFields() throws Exception {
//Delete using generic key
- File testFile = AbstractTestCase.copyAudioToTmp(
+ File testFile = copyAudioToTmp(
"test1.wma",
- new File("testDeleteFields.wma")
+ "testDeleteFields.wma"
);
AudioFile f = AudioFileIO.read(testFile);
List tagFields = f.getTag().getFields(FieldKey.ALBUM_ARTIST_SORT);
diff --git a/src/test/java/org/jaudiotagger/tag/wma/WmaTestCase.java b/src/test/java/org/jaudiotagger/tag/wma/WmaTestCase.java
index 33dfdf0..73319ac 100755
--- a/src/test/java/org/jaudiotagger/tag/wma/WmaTestCase.java
+++ b/src/test/java/org/jaudiotagger/tag/wma/WmaTestCase.java
@@ -3,6 +3,8 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
+
+import org.jaudiotagger.AbstractBaseTestCase;
import org.jaudiotagger.AbstractTestCase;
import org.jaudiotagger.audio.AudioFile;
import org.jaudiotagger.audio.AudioFileIO;
@@ -15,7 +17,7 @@
*
* @author Christian Laireiter
*/
-public abstract class WmaTestCase {
+public abstract class WmaTestCase extends AbstractBaseTestCase {
/**
* Stores the audio file instance of {@link #testFile}.
@@ -73,12 +75,12 @@ public File prepareTestFile(String fileName) {
assertNotNull(sourceTestFile);
File result = null;
if (!Utils.isBlank(fileName)) {
- result = AbstractTestCase.copyAudioToTmp(
+ result = copyAudioToTmp(
sourceTestFile,
- new File(fileName)
+ fileName
);
} else {
- result = AbstractTestCase.copyAudioToTmp(sourceTestFile);
+ result = copyAudioToTmp(sourceTestFile);
}
return result;
}
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
new file mode 100644
index 0000000..4bb09c1
--- /dev/null
+++ b/src/test/resources/logback.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/testdata/01.mp3 b/src/test/resources/testdata/01.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/01.mp3
rename to src/test/resources/testdata/01.mp3
diff --git a/testdata/CreateTestData.bat b/src/test/resources/testdata/CreateTestData.bat
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/CreateTestData.bat
rename to src/test/resources/testdata/CreateTestData.bat
diff --git a/testdata/Issue79.mp3 b/src/test/resources/testdata/Issue79.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/Issue79.mp3
rename to src/test/resources/testdata/Issue79.mp3
diff --git a/testdata/Issue81.mp3 b/src/test/resources/testdata/Issue81.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/Issue81.mp3
rename to src/test/resources/testdata/Issue81.mp3
diff --git a/testdata/bug153.wav b/src/test/resources/testdata/bug153.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/bug153.wav
rename to src/test/resources/testdata/bug153.wav
diff --git a/testdata/corrupt.mp3 b/src/test/resources/testdata/corrupt.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/corrupt.mp3
rename to src/test/resources/testdata/corrupt.mp3
diff --git a/testdata/coverart.bmp b/src/test/resources/testdata/coverart.bmp
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/coverart.bmp
rename to src/test/resources/testdata/coverart.bmp
diff --git a/testdata/coverart.gif b/src/test/resources/testdata/coverart.gif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/coverart.gif
rename to src/test/resources/testdata/coverart.gif
diff --git a/testdata/coverart.jpg b/src/test/resources/testdata/coverart.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/coverart.jpg
rename to src/test/resources/testdata/coverart.jpg
diff --git a/testdata/coverart.png b/src/test/resources/testdata/coverart.png
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/coverart.png
rename to src/test/resources/testdata/coverart.png
diff --git a/testdata/coverart_large.jpg b/src/test/resources/testdata/coverart_large.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/coverart_large.jpg
rename to src/test/resources/testdata/coverart_large.jpg
diff --git a/testdata/coverart_small.png b/src/test/resources/testdata/coverart_small.png
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/coverart_small.png
rename to src/test/resources/testdata/coverart_small.png
diff --git a/testdata/issue-198.m4a b/src/test/resources/testdata/issue-198.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/issue-198.m4a
rename to src/test/resources/testdata/issue-198.m4a
diff --git a/testdata/issue52.mp3 b/src/test/resources/testdata/issue52.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/issue52.mp3
rename to src/test/resources/testdata/issue52.mp3
diff --git a/testdata/test.flac b/src/test/resources/testdata/test.flac
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test.flac
rename to src/test/resources/testdata/test.flac
diff --git a/testdata/test.m4a b/src/test/resources/testdata/test.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test.m4a
rename to src/test/resources/testdata/test.m4a
diff --git a/testdata/test.ogg b/src/test/resources/testdata/test.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test.ogg
rename to src/test/resources/testdata/test.ogg
diff --git a/testdata/test.opus b/src/test/resources/testdata/test.opus
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test.opus
rename to src/test/resources/testdata/test.opus
diff --git a/testdata/test.stem.mp4 b/src/test/resources/testdata/test.stem.mp4
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test.stem.mp4
rename to src/test/resources/testdata/test.stem.mp4
diff --git a/testdata/test.wav b/src/test/resources/testdata/test.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test.wav
rename to src/test/resources/testdata/test.wav
diff --git a/testdata/test01.ra b/src/test/resources/testdata/test01.ra
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test01.ra
rename to src/test/resources/testdata/test01.ra
diff --git a/testdata/test02.ra b/src/test/resources/testdata/test02.ra
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test02.ra
rename to src/test/resources/testdata/test02.ra
diff --git a/testdata/test03.ra b/src/test/resources/testdata/test03.ra
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test03.ra
rename to src/test/resources/testdata/test03.ra
diff --git a/testdata/test04.ra b/src/test/resources/testdata/test04.ra
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test04.ra
rename to src/test/resources/testdata/test04.ra
diff --git a/testdata/test05.ra b/src/test/resources/testdata/test05.ra
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test05.ra
rename to src/test/resources/testdata/test05.ra
diff --git a/testdata/test05.rm b/src/test/resources/testdata/test05.rm
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test05.rm
rename to src/test/resources/testdata/test05.rm
diff --git a/testdata/test06.rm b/src/test/resources/testdata/test06.rm
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test06.rm
rename to src/test/resources/testdata/test06.rm
diff --git a/testdata/test07.rm b/src/test/resources/testdata/test07.rm
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test07.rm
rename to src/test/resources/testdata/test07.rm
diff --git a/testdata/test08.rm b/src/test/resources/testdata/test08.rm
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test08.rm
rename to src/test/resources/testdata/test08.rm
diff --git a/testdata/test09.rm b/src/test/resources/testdata/test09.rm
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test09.rm
rename to src/test/resources/testdata/test09.rm
diff --git a/testdata/test1.wma b/src/test/resources/testdata/test1.wma
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test1.wma
rename to src/test/resources/testdata/test1.wma
diff --git a/testdata/test10.rm b/src/test/resources/testdata/test10.rm
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test10.rm
rename to src/test/resources/testdata/test10.rm
diff --git a/testdata/test119.aif b/src/test/resources/testdata/test119.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test119.aif
rename to src/test/resources/testdata/test119.aif
diff --git a/testdata/test120.aif b/src/test/resources/testdata/test120.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test120.aif
rename to src/test/resources/testdata/test120.aif
diff --git a/testdata/test121.aif b/src/test/resources/testdata/test121.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test121.aif
rename to src/test/resources/testdata/test121.aif
diff --git a/testdata/test122.dsf b/src/test/resources/testdata/test122.dsf
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test122.dsf
rename to src/test/resources/testdata/test122.dsf
diff --git a/testdata/test123.wav b/src/test/resources/testdata/test123.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test123.wav
rename to src/test/resources/testdata/test123.wav
diff --git a/testdata/test124.aif b/src/test/resources/testdata/test124.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test124.aif
rename to src/test/resources/testdata/test124.aif
diff --git a/testdata/test125.wav b/src/test/resources/testdata/test125.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test125.wav
rename to src/test/resources/testdata/test125.wav
diff --git a/testdata/test126.wav b/src/test/resources/testdata/test126.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test126.wav
rename to src/test/resources/testdata/test126.wav
diff --git a/testdata/test127.wav b/src/test/resources/testdata/test127.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test127.wav
rename to src/test/resources/testdata/test127.wav
diff --git a/testdata/test128.wav b/src/test/resources/testdata/test128.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test128.wav
rename to src/test/resources/testdata/test128.wav
diff --git a/testdata/test129.wav b/src/test/resources/testdata/test129.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test129.wav
rename to src/test/resources/testdata/test129.wav
diff --git a/testdata/test130.wav b/src/test/resources/testdata/test130.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test130.wav
rename to src/test/resources/testdata/test130.wav
diff --git a/testdata/test131.wav b/src/test/resources/testdata/test131.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test131.wav
rename to src/test/resources/testdata/test131.wav
diff --git a/testdata/test132.aif b/src/test/resources/testdata/test132.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test132.aif
rename to src/test/resources/testdata/test132.aif
diff --git a/testdata/test133.aif b/src/test/resources/testdata/test133.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test133.aif
rename to src/test/resources/testdata/test133.aif
diff --git a/testdata/test134.aif b/src/test/resources/testdata/test134.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test134.aif
rename to src/test/resources/testdata/test134.aif
diff --git a/testdata/test135.aif b/src/test/resources/testdata/test135.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test135.aif
rename to src/test/resources/testdata/test135.aif
diff --git a/testdata/test136.aif b/src/test/resources/testdata/test136.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test136.aif
rename to src/test/resources/testdata/test136.aif
diff --git a/testdata/test137.aif b/src/test/resources/testdata/test137.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test137.aif
rename to src/test/resources/testdata/test137.aif
diff --git a/testdata/test138.aiff b/src/test/resources/testdata/test138.aiff
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test138.aiff
rename to src/test/resources/testdata/test138.aiff
diff --git a/testdata/test14.m4a b/src/test/resources/testdata/test14.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test14.m4a
rename to src/test/resources/testdata/test14.m4a
diff --git a/testdata/test15.m4a b/src/test/resources/testdata/test15.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test15.m4a
rename to src/test/resources/testdata/test15.m4a
diff --git a/testdata/test151.aif b/src/test/resources/testdata/test151.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test151.aif
rename to src/test/resources/testdata/test151.aif
diff --git a/testdata/test152.aiff b/src/test/resources/testdata/test152.aiff
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test152.aiff
rename to src/test/resources/testdata/test152.aiff
diff --git a/testdata/test153.wav b/src/test/resources/testdata/test153.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test153.wav
rename to src/test/resources/testdata/test153.wav
diff --git a/testdata/test156.dsf b/src/test/resources/testdata/test156.dsf
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test156.dsf
rename to src/test/resources/testdata/test156.dsf
diff --git a/testdata/test157.aif b/src/test/resources/testdata/test157.aif
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test157.aif
rename to src/test/resources/testdata/test157.aif
diff --git a/testdata/test16.m4a b/src/test/resources/testdata/test16.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test16.m4a
rename to src/test/resources/testdata/test16.m4a
diff --git a/testdata/test19.m4a b/src/test/resources/testdata/test19.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test19.m4a
rename to src/test/resources/testdata/test19.m4a
diff --git a/testdata/test2.flac b/src/test/resources/testdata/test2.flac
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test2.flac
rename to src/test/resources/testdata/test2.flac
diff --git a/testdata/test2.m4a b/src/test/resources/testdata/test2.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test2.m4a
rename to src/test/resources/testdata/test2.m4a
diff --git a/testdata/test2.wma b/src/test/resources/testdata/test2.wma
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test2.wma
rename to src/test/resources/testdata/test2.wma
diff --git a/testdata/test21.m4a b/src/test/resources/testdata/test21.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test21.m4a
rename to src/test/resources/testdata/test21.m4a
diff --git a/testdata/test23.mp3 b/src/test/resources/testdata/test23.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test23.mp3
rename to src/test/resources/testdata/test23.mp3
diff --git a/testdata/test3.flac b/src/test/resources/testdata/test3.flac
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test3.flac
rename to src/test/resources/testdata/test3.flac
diff --git a/testdata/test3.m4a b/src/test/resources/testdata/test3.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test3.m4a
rename to src/test/resources/testdata/test3.m4a
diff --git a/testdata/test3.ogg b/src/test/resources/testdata/test3.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test3.ogg
rename to src/test/resources/testdata/test3.ogg
diff --git a/testdata/test3.wma b/src/test/resources/testdata/test3.wma
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test3.wma
rename to src/test/resources/testdata/test3.wma
diff --git a/testdata/test32.m4a b/src/test/resources/testdata/test32.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test32.m4a
rename to src/test/resources/testdata/test32.m4a
diff --git a/testdata/test33.m4a b/src/test/resources/testdata/test33.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test33.m4a
rename to src/test/resources/testdata/test33.m4a
diff --git a/testdata/test36.ogg b/src/test/resources/testdata/test36.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test36.ogg
rename to src/test/resources/testdata/test36.ogg
diff --git a/testdata/test38.m4a b/src/test/resources/testdata/test38.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test38.m4a
rename to src/test/resources/testdata/test38.m4a
diff --git a/testdata/test39.m4a b/src/test/resources/testdata/test39.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test39.m4a
rename to src/test/resources/testdata/test39.m4a
diff --git a/testdata/test4.m4a b/src/test/resources/testdata/test4.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test4.m4a
rename to src/test/resources/testdata/test4.m4a
diff --git a/testdata/test4.wma b/src/test/resources/testdata/test4.wma
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test4.wma
rename to src/test/resources/testdata/test4.wma
diff --git a/testdata/test41.m4a b/src/test/resources/testdata/test41.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test41.m4a
rename to src/test/resources/testdata/test41.m4a
diff --git a/testdata/test42.m4a b/src/test/resources/testdata/test42.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test42.m4a
rename to src/test/resources/testdata/test42.m4a
diff --git a/testdata/test44.m4a b/src/test/resources/testdata/test44.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test44.m4a
rename to src/test/resources/testdata/test44.m4a
diff --git a/testdata/test47.mp3 b/src/test/resources/testdata/test47.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test47.mp3
rename to src/test/resources/testdata/test47.mp3
diff --git a/testdata/test48.mp3 b/src/test/resources/testdata/test48.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test48.mp3
rename to src/test/resources/testdata/test48.mp3
diff --git a/testdata/test5.m4a b/src/test/resources/testdata/test5.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test5.m4a
rename to src/test/resources/testdata/test5.m4a
diff --git a/testdata/test5.ogg b/src/test/resources/testdata/test5.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test5.ogg
rename to src/test/resources/testdata/test5.ogg
diff --git a/testdata/test5.wma b/src/test/resources/testdata/test5.wma
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test5.wma
rename to src/test/resources/testdata/test5.wma
diff --git a/testdata/test508.ogg b/src/test/resources/testdata/test508.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test508.ogg
rename to src/test/resources/testdata/test508.ogg
diff --git a/testdata/test509.wma b/src/test/resources/testdata/test509.wma
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test509.wma
rename to src/test/resources/testdata/test509.wma
diff --git a/testdata/test51.mp3 b/src/test/resources/testdata/test51.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test51.mp3
rename to src/test/resources/testdata/test51.mp3
diff --git a/testdata/test52.mp3 b/src/test/resources/testdata/test52.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test52.mp3
rename to src/test/resources/testdata/test52.mp3
diff --git a/testdata/test53.mp3 b/src/test/resources/testdata/test53.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test53.mp3
rename to src/test/resources/testdata/test53.mp3
diff --git a/testdata/test6.wma b/src/test/resources/testdata/test6.wma
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test6.wma
rename to src/test/resources/testdata/test6.wma
diff --git a/testdata/test7.wma b/src/test/resources/testdata/test7.wma
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test7.wma
rename to src/test/resources/testdata/test7.wma
diff --git a/testdata/test74.mp3 b/src/test/resources/testdata/test74.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test74.mp3
rename to src/test/resources/testdata/test74.mp3
diff --git a/testdata/test76.ogg b/src/test/resources/testdata/test76.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test76.ogg
rename to src/test/resources/testdata/test76.ogg
diff --git a/testdata/test77.ogg b/src/test/resources/testdata/test77.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test77.ogg
rename to src/test/resources/testdata/test77.ogg
diff --git a/testdata/test8.m4a b/src/test/resources/testdata/test8.m4a
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/test8.m4a
rename to src/test/resources/testdata/test8.m4a
diff --git a/testdata/testV1.mp3 b/src/test/resources/testdata/testV1.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1.mp3
rename to src/test/resources/testdata/testV1.mp3
diff --git a/testdata/testV1Cbr128.mp3 b/src/test/resources/testdata/testV1Cbr128.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1Cbr128.mp3
rename to src/test/resources/testdata/testV1Cbr128.mp3
diff --git a/testdata/testV1Cbr128ID3v1.mp3 b/src/test/resources/testdata/testV1Cbr128ID3v1.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1Cbr128ID3v1.mp3
rename to src/test/resources/testdata/testV1Cbr128ID3v1.mp3
diff --git a/testdata/testV1Cbr128ID3v1v2.mp3 b/src/test/resources/testdata/testV1Cbr128ID3v1v2.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1Cbr128ID3v1v2.mp3
rename to src/test/resources/testdata/testV1Cbr128ID3v1v2.mp3
diff --git a/testdata/testV1Cbr128ID3v2.mp3 b/src/test/resources/testdata/testV1Cbr128ID3v2.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1Cbr128ID3v2.mp3
rename to src/test/resources/testdata/testV1Cbr128ID3v2.mp3
diff --git a/testdata/testV1Cbr128ID3v2pad.mp3 b/src/test/resources/testdata/testV1Cbr128ID3v2pad.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1Cbr128ID3v2pad.mp3
rename to src/test/resources/testdata/testV1Cbr128ID3v2pad.mp3
diff --git a/testdata/testV1Cbr192.mp3 b/src/test/resources/testdata/testV1Cbr192.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1Cbr192.mp3
rename to src/test/resources/testdata/testV1Cbr192.mp3
diff --git a/testdata/testV1L2mono.mp3 b/src/test/resources/testdata/testV1L2mono.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1L2mono.mp3
rename to src/test/resources/testdata/testV1L2mono.mp3
diff --git a/testdata/testV1L2stereo.mp3 b/src/test/resources/testdata/testV1L2stereo.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1L2stereo.mp3
rename to src/test/resources/testdata/testV1L2stereo.mp3
diff --git a/testdata/testV1vbrNew0.mp3 b/src/test/resources/testdata/testV1vbrNew0.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew0.mp3
rename to src/test/resources/testdata/testV1vbrNew0.mp3
diff --git a/testdata/testV1vbrNew1.mp3 b/src/test/resources/testdata/testV1vbrNew1.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew1.mp3
rename to src/test/resources/testdata/testV1vbrNew1.mp3
diff --git a/testdata/testV1vbrNew2.mp3 b/src/test/resources/testdata/testV1vbrNew2.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew2.mp3
rename to src/test/resources/testdata/testV1vbrNew2.mp3
diff --git a/testdata/testV1vbrNew3.mp3 b/src/test/resources/testdata/testV1vbrNew3.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew3.mp3
rename to src/test/resources/testdata/testV1vbrNew3.mp3
diff --git a/testdata/testV1vbrNew4.mp3 b/src/test/resources/testdata/testV1vbrNew4.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew4.mp3
rename to src/test/resources/testdata/testV1vbrNew4.mp3
diff --git a/testdata/testV1vbrNew5.mp3 b/src/test/resources/testdata/testV1vbrNew5.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew5.mp3
rename to src/test/resources/testdata/testV1vbrNew5.mp3
diff --git a/testdata/testV1vbrNew6.mp3 b/src/test/resources/testdata/testV1vbrNew6.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew6.mp3
rename to src/test/resources/testdata/testV1vbrNew6.mp3
diff --git a/testdata/testV1vbrNew7.mp3 b/src/test/resources/testdata/testV1vbrNew7.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew7.mp3
rename to src/test/resources/testdata/testV1vbrNew7.mp3
diff --git a/testdata/testV1vbrNew8.mp3 b/src/test/resources/testdata/testV1vbrNew8.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew8.mp3
rename to src/test/resources/testdata/testV1vbrNew8.mp3
diff --git a/testdata/testV1vbrNew9.mp3 b/src/test/resources/testdata/testV1vbrNew9.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrNew9.mp3
rename to src/test/resources/testdata/testV1vbrNew9.mp3
diff --git a/testdata/testV1vbrOld0.mp3 b/src/test/resources/testdata/testV1vbrOld0.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld0.mp3
rename to src/test/resources/testdata/testV1vbrOld0.mp3
diff --git a/testdata/testV1vbrOld2.mp3 b/src/test/resources/testdata/testV1vbrOld2.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld2.mp3
rename to src/test/resources/testdata/testV1vbrOld2.mp3
diff --git a/testdata/testV1vbrOld3.mp3 b/src/test/resources/testdata/testV1vbrOld3.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld3.mp3
rename to src/test/resources/testdata/testV1vbrOld3.mp3
diff --git a/testdata/testV1vbrOld4.mp3 b/src/test/resources/testdata/testV1vbrOld4.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld4.mp3
rename to src/test/resources/testdata/testV1vbrOld4.mp3
diff --git a/testdata/testV1vbrOld5.mp3 b/src/test/resources/testdata/testV1vbrOld5.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld5.mp3
rename to src/test/resources/testdata/testV1vbrOld5.mp3
diff --git a/testdata/testV1vbrOld6.mp3 b/src/test/resources/testdata/testV1vbrOld6.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld6.mp3
rename to src/test/resources/testdata/testV1vbrOld6.mp3
diff --git a/testdata/testV1vbrOld7.mp3 b/src/test/resources/testdata/testV1vbrOld7.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld7.mp3
rename to src/test/resources/testdata/testV1vbrOld7.mp3
diff --git a/testdata/testV1vbrOld8.mp3 b/src/test/resources/testdata/testV1vbrOld8.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld8.mp3
rename to src/test/resources/testdata/testV1vbrOld8.mp3
diff --git a/testdata/testV1vbrOld9.mp3 b/src/test/resources/testdata/testV1vbrOld9.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrOld9.mp3
rename to src/test/resources/testdata/testV1vbrOld9.mp3
diff --git a/testdata/testV1vbrold1.mp3 b/src/test/resources/testdata/testV1vbrold1.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV1vbrold1.mp3
rename to src/test/resources/testdata/testV1vbrold1.mp3
diff --git a/testdata/testV24-comments-utf8.mp3 b/src/test/resources/testdata/testV24-comments-utf8.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV24-comments-utf8.mp3
rename to src/test/resources/testdata/testV24-comments-utf8.mp3
diff --git a/testdata/testV25.mp3 b/src/test/resources/testdata/testV25.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV25.mp3
rename to src/test/resources/testdata/testV25.mp3
diff --git a/testdata/testV25.wav b/src/test/resources/testdata/testV25.wav
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV25.wav
rename to src/test/resources/testdata/testV25.wav
diff --git a/testdata/testV25vbrNew0.mp3 b/src/test/resources/testdata/testV25vbrNew0.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV25vbrNew0.mp3
rename to src/test/resources/testdata/testV25vbrNew0.mp3
diff --git a/testdata/testV25vbrOld0.mp3 b/src/test/resources/testdata/testV25vbrOld0.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV25vbrOld0.mp3
rename to src/test/resources/testdata/testV25vbrOld0.mp3
diff --git a/testdata/testV2Cbr128.mp3 b/src/test/resources/testdata/testV2Cbr128.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV2Cbr128.mp3
rename to src/test/resources/testdata/testV2Cbr128.mp3
diff --git a/testdata/testV2L2.mp3 b/src/test/resources/testdata/testV2L2.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV2L2.mp3
rename to src/test/resources/testdata/testV2L2.mp3
diff --git a/testdata/testV2L3Stereo.mp3 b/src/test/resources/testdata/testV2L3Stereo.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV2L3Stereo.mp3
rename to src/test/resources/testdata/testV2L3Stereo.mp3
diff --git a/testdata/testV2vbrNew0.mp3 b/src/test/resources/testdata/testV2vbrNew0.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV2vbrNew0.mp3
rename to src/test/resources/testdata/testV2vbrNew0.mp3
diff --git a/testdata/testV2vbrOld0.mp3 b/src/test/resources/testdata/testV2vbrOld0.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testV2vbrOld0.mp3
rename to src/test/resources/testdata/testV2vbrOld0.mp3
diff --git a/testdata/testfiles.txt b/src/test/resources/testdata/testfiles.txt
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testfiles.txt
rename to src/test/resources/testdata/testfiles.txt
diff --git a/testdata/testlargeimage.ogg b/src/test/resources/testdata/testlargeimage.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testlargeimage.ogg
rename to src/test/resources/testdata/testlargeimage.ogg
diff --git a/testdata/testsmallimage.ogg b/src/test/resources/testdata/testsmallimage.ogg
old mode 100755
new mode 100644
similarity index 100%
rename from testdata/testsmallimage.ogg
rename to src/test/resources/testdata/testsmallimage.ogg
diff --git a/testtagdata/Issue1.id3 b/src/test/resources/testtagdata/Issue1.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue1.id3
rename to src/test/resources/testtagdata/Issue1.id3
diff --git a/testtagdata/Issue104-1.id3 b/src/test/resources/testtagdata/Issue104-1.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue104-1.id3
rename to src/test/resources/testtagdata/Issue104-1.id3
diff --git a/testtagdata/Issue108.id3 b/src/test/resources/testtagdata/Issue108.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue108.id3
rename to src/test/resources/testtagdata/Issue108.id3
diff --git a/testtagdata/Issue109.id3 b/src/test/resources/testtagdata/Issue109.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue109.id3
rename to src/test/resources/testtagdata/Issue109.id3
diff --git a/testtagdata/Issue116.id3 b/src/test/resources/testtagdata/Issue116.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue116.id3
rename to src/test/resources/testtagdata/Issue116.id3
diff --git a/testtagdata/Issue122-1.id3 b/src/test/resources/testtagdata/Issue122-1.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue122-1.id3
rename to src/test/resources/testtagdata/Issue122-1.id3
diff --git a/testtagdata/Issue122-2.id3 b/src/test/resources/testtagdata/Issue122-2.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue122-2.id3
rename to src/test/resources/testtagdata/Issue122-2.id3
diff --git a/testtagdata/Issue122.id3 b/src/test/resources/testtagdata/Issue122.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue122.id3
rename to src/test/resources/testtagdata/Issue122.id3
diff --git a/testtagdata/Issue72.id3 b/src/test/resources/testtagdata/Issue72.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue72.id3
rename to src/test/resources/testtagdata/Issue72.id3
diff --git a/testtagdata/Issue73.id3 b/src/test/resources/testtagdata/Issue73.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue73.id3
rename to src/test/resources/testtagdata/Issue73.id3
diff --git a/testtagdata/Issue77.id3 b/src/test/resources/testtagdata/Issue77.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue77.id3
rename to src/test/resources/testtagdata/Issue77.id3
diff --git a/testtagdata/Issue80.id3 b/src/test/resources/testtagdata/Issue80.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue80.id3
rename to src/test/resources/testtagdata/Issue80.id3
diff --git a/testtagdata/Issue88.id3 b/src/test/resources/testtagdata/Issue88.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue88.id3
rename to src/test/resources/testtagdata/Issue88.id3
diff --git a/testtagdata/Issue92-2.id3 b/src/test/resources/testtagdata/Issue92-2.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue92-2.id3
rename to src/test/resources/testtagdata/Issue92-2.id3
diff --git a/testtagdata/Issue92.id3 b/src/test/resources/testtagdata/Issue92.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue92.id3
rename to src/test/resources/testtagdata/Issue92.id3
diff --git a/testtagdata/Issue96-1.id3 b/src/test/resources/testtagdata/Issue96-1.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue96-1.id3
rename to src/test/resources/testtagdata/Issue96-1.id3
diff --git a/testtagdata/Issue96-2.id3 b/src/test/resources/testtagdata/Issue96-2.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue96-2.id3
rename to src/test/resources/testtagdata/Issue96-2.id3
diff --git a/testtagdata/Issue96-3.id3 b/src/test/resources/testtagdata/Issue96-3.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue96-3.id3
rename to src/test/resources/testtagdata/Issue96-3.id3
diff --git a/testtagdata/Issue96-4.id3 b/src/test/resources/testtagdata/Issue96-4.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue96-4.id3
rename to src/test/resources/testtagdata/Issue96-4.id3
diff --git a/testtagdata/Issue98-1.id3 b/src/test/resources/testtagdata/Issue98-1.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue98-1.id3
rename to src/test/resources/testtagdata/Issue98-1.id3
diff --git a/testtagdata/Issue98-2.id3 b/src/test/resources/testtagdata/Issue98-2.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue98-2.id3
rename to src/test/resources/testtagdata/Issue98-2.id3
diff --git a/testtagdata/Issue98-3.id3 b/src/test/resources/testtagdata/Issue98-3.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/Issue98-3.id3
rename to src/test/resources/testtagdata/Issue98-3.id3
diff --git a/testtagdata/issue109-2.id3 b/src/test/resources/testtagdata/issue109-2.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/issue109-2.id3
rename to src/test/resources/testtagdata/issue109-2.id3
diff --git a/testtagdata/issue115.id3 b/src/test/resources/testtagdata/issue115.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/issue115.id3
rename to src/test/resources/testtagdata/issue115.id3
diff --git a/testtagdata/issue158.id3 b/src/test/resources/testtagdata/issue158.id3
old mode 100755
new mode 100644
similarity index 100%
rename from testtagdata/issue158.id3
rename to src/test/resources/testtagdata/issue158.id3