git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/JAL-4219_extended_fasta_rna_ss
[jalview.git]
/
test
/
jalview
/
gui
/
HelpTest.java
diff --git
a/test/jalview/gui/HelpTest.java
b/test/jalview/gui/HelpTest.java
index
c3ae0e4
..
1e26c49
100644
(file)
--- a/
test/jalview/gui/HelpTest.java
+++ b/
test/jalview/gui/HelpTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-30,10
+30,19
@@
import javax.help.HelpSet;
import javax.help.HelpSetException;
import javax.help.Map;
import javax.help.HelpSetException;
import javax.help.Map;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class HelpTest
{
import org.testng.annotations.Test;
public class HelpTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void checkHelpTargets() throws HelpSetException
{
@Test(groups = { "Functional" })
public void checkHelpTargets() throws HelpSetException
{
@@
-44,7
+53,7
@@
public class HelpTest
for (HelpId id : HelpId.values())
{
for (HelpId id : HelpId.values())
{
- String target = id.toString();
+ String target = id.getId();
assertTrue("Unmatched target enum: " + target,
targets.isValidID(target, hs));
}
assertTrue("Unmatched target enum: " + target,
targets.isValidID(target, hs));
}