X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fparadise%2FTestAnnotate3D.java;h=c2be67ec89f89c7b83eed2d1444c7dfea7d1b0a2;hb=8dd4255a671e95df3fc6d6bc4d5d6b172f682c5d;hp=411086363a3f3cb90a8bd1370e5fa03cbffa4b93;hpb=e53e39aae1128c6e11e5a3b1529521e86ca6f9d8;p=jalview.git diff --git a/test/jalview/ext/paradise/TestAnnotate3D.java b/test/jalview/ext/paradise/TestAnnotate3D.java index 4110863..c2be67e 100644 --- a/test/jalview/ext/paradise/TestAnnotate3D.java +++ b/test/jalview/ext/paradise/TestAnnotate3D.java @@ -24,7 +24,9 @@ import static org.testng.AssertJUnit.assertTrue; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; +import jalview.io.DataSourceType; import jalview.io.FastaFile; +import jalview.io.FileFormat; import jalview.io.FormatAdapter; import java.io.BufferedReader; @@ -101,7 +103,7 @@ public class TestAnnotate3D public void testPDBfileVsRNAML() throws Exception { PDBfile pdbf = new PDBfile(true, false, true, "examples/2GIS.pdb", - FormatAdapter.FILE); + DataSourceType.FILE); Assert.assertTrue(pdbf.isValid()); // Comment - should add new FileParse constructor like new FileParse(Reader // ..). for direct reading @@ -128,7 +130,7 @@ public class TestAnnotate3D assertTrue("No data returned by Annotate3D", sb.length() > 0); final String lines = sb.toString(); AlignmentI al = new FormatAdapter().readFile(lines, - FormatAdapter.PASTE, "RNAML"); + DataSourceType.PASTE, FileFormat.Rnaml); if (al == null || al.getHeight() == 0) { System.out.println(lines);