X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FFileIOTester.java;h=6b7de7751e75f732f7eb341513abfdf009666c7c;hb=c93b9ad2ebfab4cad4608a8890132918589576be;hp=7f0e72f67648d1d29f2ee8cd64046a0d61aee6d7;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/test/jalview/io/FileIOTester.java b/test/jalview/io/FileIOTester.java index 7f0e72f..6b7de77 100644 --- a/test/jalview/io/FileIOTester.java +++ b/test/jalview/io/FileIOTester.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,14 +20,13 @@ */ package jalview.io; -import static org.junit.Assert.*; - import java.io.File; import java.io.IOException; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.testng.AssertJUnit; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; /** * @author jimp @@ -68,9 +67,9 @@ public class FileIOTester private void assertValidFormat(String fmt, String src, FileParse fp) { - assertTrue("Couldn't resolve " + src + " as a valid file", fp.isValid()); + AssertJUnit.assertTrue("Couldn't resolve " + src + " as a valid file", fp.isValid()); String type = new IdentifyFile().Identify(fp); - assertTrue("Data from '" + src + "' Expected to be '" + fmt + AssertJUnit.assertTrue("Data from '" + src + "' Expected to be '" + fmt + "' identified as '" + type + "'", type.equalsIgnoreCase(fmt)); }