X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPopupMenuTest.java;h=5dada477969e92ec873e8adf375998dac2a36bd4;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=7636bdafb636ef7d1d10db714add807160eb263c;hpb=04c8f7bff663aa469127e9eed4164e02933782f1;p=jalview.git
diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java
index 7636bda..5dada47 100644
--- a/test/jalview/gui/PopupMenuTest.java
+++ b/test/jalview/gui/PopupMenuTest.java
@@ -199,9 +199,10 @@ public class PopupMenuTest
testee.configureReferenceAnnotationsMenu(menu, seqs);
assertTrue(menu.isEnabled());
String s = MessageManager.getString("label.add_annotations_for");
- String expected = ""
- + "" + s
- + "
Jmol/secondary structure
PDB/Temp
";
+// String expected = ""
+// + "" + s
+// + "
Jmol/secondary structure
PDB/Temp
";
+ String expected = "" + s + "
Jmol/secondary structure
PDB/Temp";
assertEquals(expected, menu.getToolTipText());
}
@@ -223,10 +224,13 @@ public class PopupMenuTest
testee.configureReferenceAnnotationsMenu(menu, seqs);
assertTrue(menu.isEnabled());
String s = MessageManager.getString("label.add_annotations_for");
- String expected = ""
- + "" + s
- + "
Jmol/secondary structure
PDB/Temp
";
- assertEquals(expected, menu.getToolTipText());
+// String expected = ""
+// + "" + s
+// + "
Jmol/secondary structure
PDB/Temp";
+ String expected = "" + s
+ + "
Jmol/secondary structure
PDB/Temp";
+ s = menu.getToolTipText();
+ assertEquals(expected, s);
}
/**
@@ -243,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)
@@ -257,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)
{
@@ -270,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)
{