X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FPhylipFileTests.java;fp=test%2Fjalview%2Fio%2FPhylipFileTests.java;h=d3357316e69b9176c360aabf1ddb819a4b2a92e9;hb=c9df5bd6e95c23c9b560c0a59003d1f4043f8055;hp=e411272607e4f26f19c9bdb422912e4a226105fc;hpb=f59ae49cdd2bb8f6721424ea6ce167e8245e7d15;p=jalview.git diff --git a/test/jalview/io/PhylipFileTests.java b/test/jalview/io/PhylipFileTests.java index e411272..d335731 100644 --- a/test/jalview/io/PhylipFileTests.java +++ b/test/jalview/io/PhylipFileTests.java @@ -1,15 +1,16 @@ package jalview.io; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import jalview.datamodel.Alignment; +import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertTrue; + +import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.testng.annotations.Test; /** * Test file for {@link PhylipFile}. @@ -105,7 +106,7 @@ public class PhylipFileTests private void testDataExtraction(String file) throws IOException { AppletFormatAdapter rf = new AppletFormatAdapter(); - Alignment al = rf.readFile(file, AppletFormatAdapter.FILE, + AlignmentI al = rf.readFile(file, AppletFormatAdapter.FILE, PhylipFile.FILE_DESC); assertNotNull("Couldn't read supplied alignment data.", al); @@ -150,13 +151,13 @@ public class PhylipFileTests public void testIO(String file) throws IOException { AppletFormatAdapter rf = new AppletFormatAdapter(); - Alignment al = rf.readFile(file, AppletFormatAdapter.FILE, + AlignmentI al = rf.readFile(file, AppletFormatAdapter.FILE, PhylipFile.FILE_DESC); assertNotNull("Couldn't read supplied alignment data.", al); String outputfile = rf.formatSequences(PhylipFile.FILE_DESC, al, true); - Alignment al_input = new AppletFormatAdapter().readFile(outputfile, + AlignmentI al_input = new AppletFormatAdapter().readFile(outputfile, AppletFormatAdapter.PASTE, PhylipFile.FILE_DESC); assertNotNull("Couldn't parse reimported alignment data.", al_input);