X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FFeaturesFileTest.java;h=d6f1e8b32eaed527c2ab0dae70b245edc37877fb;hb=717215fa552eba980616292d76cd0032c548e459;hp=0cfe46a2a480ae114385d9a823d6321baae7b2c8;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git diff --git a/test/jalview/io/FeaturesFileTest.java b/test/jalview/io/FeaturesFileTest.java index 0cfe46a..d6f1e8b 100644 --- a/test/jalview/io/FeaturesFileTest.java +++ b/test/jalview/io/FeaturesFileTest.java @@ -34,17 +34,26 @@ import jalview.datamodel.SequenceDummy; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; +import jalview.gui.JvOptionPane; import java.awt.Color; import java.io.File; import java.io.IOException; import java.util.Map; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class FeaturesFileTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + private static String simpleGffFile = "examples/testdata/simpleGff3.gff"; @Test(groups = { "Functional" }) @@ -153,7 +162,8 @@ public class FeaturesFileTest Map colours = af.getFeatureRenderer() .getFeatureColours(); // GFF2 uses space as name/value separator in column 9 - String gffData = "METAL\tcc9900\n" + "GFF\n" + String gffData = "METAL\tcc9900\n" + + "GFF\n" + "FER_CAPAA\tuniprot\tMETAL\t44\t45\t4.0\t.\t.\tNote Iron-sulfur; Note 2Fe-2S\n" + "FER1_SOLLC\tuniprot\tPfam\t55\t130\t2.0\t.\t."; FeaturesFile featuresFile = new FeaturesFile(gffData, @@ -304,7 +314,7 @@ public class FeaturesFileTest { assertEquals("no sequences extracted from GFF3 file", 2, dataset.getHeight()); - + SequenceI seq1 = dataset.findName("seq1"); SequenceI seq2 = dataset.findName("seq2"); assertNotNull(seq1); @@ -335,7 +345,7 @@ public class FeaturesFileTest "Expected at least one CDNA/Protein mapping for seq1", dataset.getCodonFrame(seq1) != null && dataset.getCodonFrame(seq1).size() > 0); - + } @Test(groups = { "Functional" }) @@ -408,8 +418,7 @@ public class FeaturesFileTest * first with no features displayed */ FeatureRenderer fr = af.alignPanel.getFeatureRenderer(); - Map visible = fr - .getDisplayedFeatureCols(); + Map visible = fr.getDisplayedFeatureCols(); String exported = featuresFile.printJalviewFormat( al.getSequencesArray(), visible); String expected = "No Features Visible";