X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2Fscoremodels%2FFeatureScoreModelTest.java;h=66eb5a51241dfa1c1143a94fabce71820d869d5b;hb=33984e02c5687dc011d13da4b17cb0815970e0f5;hp=1da23eadd9178ad844445fc7ceea80feb8c2ce7a;hpb=19424d4e1623bfcdcf30567f7a233fe81c4a9e4e;p=jalview.git diff --git a/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java b/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java index 1da23ea..66eb5a5 100644 --- a/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java +++ b/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java @@ -25,8 +25,8 @@ import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; import jalview.gui.JvOptionPane; +import jalview.io.DataSourceType; import jalview.io.FileLoader; -import jalview.io.FormatAdapter; import java.util.Arrays; @@ -55,7 +55,7 @@ public class FeatureScoreModelTest public AlignFrame getTestAlignmentFrame() { AlignFrame alf = new FileLoader(false).LoadFileWaitTillLoaded( - alntestFile, FormatAdapter.PASTE); + alntestFile, DataSourceType.PASTE); AlignmentI al = alf.getViewport().getAlignment(); Assert.assertEquals(al.getHeight(), 4); Assert.assertEquals(al.getWidth(), 5); @@ -160,7 +160,7 @@ public class FeatureScoreModelTest String alignment = "a CCCCCCGGGGGGCCCCCC\n" + "b CCCCCCGGGGGGCCCCCC\n" + "c CCCCCCGGGGGGCCCCCC\n"; AlignFrame af = new jalview.io.FileLoader(false) - .LoadFileWaitTillLoaded(alignment, FormatAdapter.PASTE); + .LoadFileWaitTillLoaded(alignment, DataSourceType.PASTE); SequenceI aseq = af.getViewport().getAlignment().getSequenceAt(0); SequenceFeature sf = null; sf = new SequenceFeature("disulphide bond", "", 2, 5, Float.NaN, "");