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
JAL-3130 call Jalview via the Test JVM’s JAVA_HOME/bin/java
[jalview.git]
/
test
/
jalview
/
util
/
ShiftListTest.java
diff --git
a/test/jalview/util/ShiftListTest.java
b/test/jalview/util/ShiftListTest.java
index
e166c42
..
e8b9b50
100644
(file)
--- a/
test/jalview/util/ShiftListTest.java
+++ b/
test/jalview/util/ShiftListTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * 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.
*
@@
-23,14
+23,24
@@
package jalview.util;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
+import jalview.gui.JvOptionPane;
+
import java.util.Arrays;
import java.util.List;
import java.util.Arrays;
import java.util.List;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class ShiftListTest
{
import org.testng.annotations.Test;
public class ShiftListTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void testParseMap()
{
@Test(groups = { "Functional" })
public void testParseMap()
{