X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fgui%2FPopupMenuTest.java;h=7636bdafb636ef7d1d10db714add807160eb263c;hb=01ef8b680f9a74d03b1d2b0228185a26f5fb584c;hp=cc13fb91f55f8c2ffd059fae3dc2b3d680088e1d;hpb=006890b02106eb31841e6e84d75f1027434823e0;p=jalview.git

diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java
index cc13fb9..7636bda 100644
--- a/test/jalview/gui/PopupMenuTest.java
+++ b/test/jalview/gui/PopupMenuTest.java
@@ -46,6 +46,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Annotation;
@@ -94,18 +95,15 @@ public class PopupMenuTest
   public void setUp() throws IOException
   {
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
-    Cache.initLogger();
+    Console.initLogger();
 
     String inMenuString = ("EMBL-EBI Search | http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$"
-            + SEQUENCE_ID
-            + "$"
-            + "|"
-            + "UNIPROT | http://www.uniprot.org/uniprot/$" + DB_ACCESSION + "$")
-            + "|"
+            + SEQUENCE_ID + "$" + "|"
+            + "UNIPROT | http://www.uniprot.org/uniprot/$" + DB_ACCESSION
+            + "$") + "|"
             + ("INTERPRO | http://www.ebi.ac.uk/interpro/entry/$"
                     + DB_ACCESSION + "$")
-            + "|"
-            +
+            + "|" +
             // Gene3D entry tests for case (in)sensitivity
             ("Gene3D | http://gene3d.biochem.ucl.ac.uk/Gene3D/search?sterm=$"
                     + DB_ACCESSION + "$&mode=protein");
@@ -514,14 +512,14 @@ public class PopupMenuTest
     seq0.addDBRef(new DBRefEntry("INTERPRO", "1", "IPR006058"));
     seq1.addDBRef(new DBRefEntry(DBRefSource.UNIPROT, "1", "Q9ZTS2"));
     seq1.addDBRef(new DBRefEntry("GENE3D", "1", "3.10.20.30"));
-    
+
     /*
      * check the Link Menu for the first sequence
      */
     JMenu linkMenu = PopupMenu.buildLinkMenu(seq0, noFeatures);
     assertEquals(linkText, linkMenu.getText());
     Component[] linkItems = linkMenu.getMenuComponents();
-    
+
     /*
      * menu items are ordered: SEQUENCE_ID search first, then dbrefs in order
      * of database name (and within that by order of dbref addition)
@@ -591,7 +589,7 @@ public class PopupMenuTest
   {
     // get sequences from the alignment
     List<SequenceI> seqs = parentPanel.getAlignment().getSequences();
-    
+
     // add our own seqs to avoid problems with changes to existing sequences
     // (gap at end of sequences varies depending on how tests are run!)
     Sequence seqGap1 = new Sequence("GappySeq",
@@ -618,7 +616,7 @@ public class PopupMenuTest
     // get the Popup Menu for 7th sequence - no insertions
     testee = new PopupMenu(parentPanel, seqs.get(7), null);
     testee.hideInsertions_actionPerformed(null);
-    
+
     HiddenColumns hidden = parentPanel.av.getAlignment().getHiddenColumns();
     Iterator<int[]> it = hidden.iterator();
     assertFalse(it.hasNext());
@@ -730,8 +728,7 @@ public class PopupMenuTest
     /*
      * long feature descriptions are truncated to 40 characters
      */
-    sf1.setDescription(
-            "this is a quite extraordinarily long description");
+    sf1.setDescription("this is a quite extraordinarily long description");
     testee.remove(menu); // don't create the sub-menu twice
     testee.addFeatureDetails(features, seq, 10);
     menu = findMenu(testee, menuText);