Merge branch 'Jalview-JS/develop' into merge_js_develop
[jalview.git] / test / jalview / gui / PopupMenuTest.java
index 28b5728..49f9d7f 100644 (file)
@@ -201,9 +201,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());
   }
 
@@ -225,10 +226,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);
   }
 
   /**