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 'merge/JAL-3140' into develop
[jalview.git]
/
test
/
jalview
/
gui
/
FontChooserTest.java
diff --git
a/test/jalview/gui/FontChooserTest.java
b/test/jalview/gui/FontChooserTest.java
index
873ead5
..
57d561e
100644
(file)
--- a/
test/jalview/gui/FontChooserTest.java
+++ b/
test/jalview/gui/FontChooserTest.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.
*
@@
-24,11
+24,19
@@
import java.awt.Canvas;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Font;
import java.awt.FontMetrics;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class FontChooserTest
{
import org.testng.annotations.Test;
public class FontChooserTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* Not a real test as it runs no methods on FontChooser and makes no
* assertions, but this method writes to sysout the names of any (currently
/**
* Not a real test as it runs no methods on FontChooser and makes no
* assertions, but this method writes to sysout the names of any (currently