git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges
[jalview.git] / test / jalview / gui / PopupMenuTest.java
diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java
index b2d5b0a..5dada47 100644 (file)
--- a/test/jalview/gui/PopupMenuTest.java
+++ b/test/jalview/gui/PopupMenuTest.java
@@ -98,15 +98,12 @@ public class PopupMenuTest
     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");
@@ -202,9 +199,10 @@ public class PopupMenuTest
     testee.configureReferenceAnnotationsMenu(menu, seqs);
     assertTrue(menu.isEnabled());
     String s = MessageManager.getString("label.add_annotations_for");
-    String expected = "<html><style> div.ttip {width:350px;white-space:pre-wrap;padding:2px;overflow-wrap:break-word;}</style>"
-            + "<div class=\"ttip\">" + s
-            + "<br/>Jmol/secondary structure<br/>PDB/Temp </div></html>";
+//    String expected = "<html><style> div.ttip {width:350px;white-space:pre-wrap;padding:2px;overflow-wrap:break-word;}</style>"
+//            + "<div class=\"ttip\">" + s
+//            + "<br/>Jmol/secondary structure<br/>PDB/Temp </div></html>";
+    String expected = "<html>" + s + "<br>Jmol/secondary structure<br>PDB/Temp</html>";
     assertEquals(expected, menu.getToolTipText());
   }
 
@@ -226,10 +224,13 @@ public class PopupMenuTest
     testee.configureReferenceAnnotationsMenu(menu, seqs);
     assertTrue(menu.isEnabled());
     String s = MessageManager.getString("label.add_annotations_for");
-    String expected = "<html><style> div.ttip {width:350px;white-space:pre-wrap;padding:2px;overflow-wrap:break-word;}</style>"
-            + "<div class=\"ttip\">" + s
-            + "<br/>Jmol/secondary structure<br/>PDB/Temp </div></html>";
-    assertEquals(expected, menu.getToolTipText());
+//    String expected = "<html><style> div.ttip {width:350px;white-space:pre-wrap;padding:2px;overflow-wrap:break-word;}</style>"
+//            + "<div class=\"ttip\">" + s
+//            + "<br/>Jmol/secondary structure<br/>PDB/Temp</html>";
+    String expected = "<html>" + s
+            + "<br>Jmol/secondary structure<br>PDB/Temp</html>";
+    s = menu.getToolTipText();
+    assertEquals(expected, s);
   }
 
   /**
@@ -246,6 +247,7 @@ public class PopupMenuTest
     // PDB.secondary structure on Sequence0
     AlignmentAnnotation annotation = new AlignmentAnnotation(
             "secondary structure", "", 0);
+    annotation.annotations = new Annotation[] { new Annotation(2f) };
     annotation.setCalcId("PDB");
     seqs.get(0).getDatasetSequence().addAlignmentAnnotation(annotation);
     if (addToSequence)
@@ -260,6 +262,7 @@ public class PopupMenuTest
     // PDB.Temp on Sequence1
     annotation = new AlignmentAnnotation("Temp", "", 0);
     annotation.setCalcId("PDB");
+    annotation.annotations = new Annotation[] { new Annotation(2f) };
     seqs.get(1).getDatasetSequence().addAlignmentAnnotation(annotation);
     if (addToSequence)
     {
@@ -273,6 +276,7 @@ public class PopupMenuTest
     // JMOL.secondary structure on Sequence0
     annotation = new AlignmentAnnotation("secondary structure", "", 0);
     annotation.setCalcId("Jmol");
+    annotation.annotations = new Annotation[] { new Annotation(2f) };
     seqs.get(0).getDatasetSequence().addAlignmentAnnotation(annotation);
     if (addToSequence)
     {
@@ -515,14 +519,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)
@@ -592,7 +596,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",
@@ -619,7 +623,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());
@@ -731,8 +735,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);