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-2326 added setup method for JvOptionPane in all Jalveiw test classes to enable...
[jalview.git]
/
test
/
MCview
/
AtomTest.java
diff --git
a/test/MCview/AtomTest.java
b/test/MCview/AtomTest.java
index
02ea52e
..
2d11fb5
100644
(file)
--- a/
test/MCview/AtomTest.java
+++ b/
test/MCview/AtomTest.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.
*
@@
-22,12
+22,22
@@
package MCview;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertEquals;
+import jalview.gui.JvOptionPane;
+
import org.testng.Assert;
import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class AtomTest
{
import org.testng.annotations.Test;
public class AtomTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* Test the constructor that parses a PDB file format ATOM line. Fields are in
* fixed column positions
/**
* Test the constructor that parses a PDB file format ATOM line. Fields are in
* fixed column positions
@@
-42,7
+52,7
@@
public class AtomTest
assertEquals("GLN", a.resName);
assertEquals("A", a.chain);
assertEquals(48, a.resNumber);
assertEquals("GLN", a.resName);
assertEquals("A", a.chain);
assertEquals(48, a.resNumber);
- assertEquals(" 48 ", a.resNumIns);
+ assertEquals("48", a.resNumIns);
assertEquals(' ', a.insCode);
assertEquals(22.290, a.x, 0.00001);
assertEquals(8.595, a.y, 0.00001);
assertEquals(' ', a.insCode);
assertEquals(22.290, a.x, 0.00001);
assertEquals(8.595, a.y, 0.00001);