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-1805 test envirionment separation
[jalview.git]
/
test
/
MCview
/
AtomTest.java
diff --git
a/test/MCview/AtomTest.java
b/test/MCview/AtomTest.java
index
8c271b3
..
2e6551c
100644
(file)
--- a/
test/MCview/AtomTest.java
+++ b/
test/MCview/AtomTest.java
@@
-1,9
+1,9
@@
package MCview;
package MCview;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertEquals;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
public class AtomTest
{
public class AtomTest
{
@@
-12,7
+12,7
@@
public class AtomTest
* 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
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testStringConstructor()
{
Atom a = new Atom(
public void testStringConstructor()
{
Atom a = new Atom(
@@
-35,7
+35,7
@@
public class AtomTest
* Test the case where occupancy and temp factor are blank - should default to
* 1
*/
* Test the case where occupancy and temp factor are blank - should default to
* 1
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testStringConstructor_blankOccupancyTempFactor()
{
Atom a = new Atom(
public void testStringConstructor_blankOccupancyTempFactor()
{
Atom a = new Atom(
@@
-47,14
+47,14
@@
public class AtomTest
/**
* Parsing non-numeric data as Atom throws an exception
*/
/**
* Parsing non-numeric data as Atom throws an exception
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testStringConstructor_malformed()
{
try
{
new Atom(
"ATOM 34N NE2 GLN A 48 22.290 8.595 17.680 1.00 14.30 N");
public void testStringConstructor_malformed()
{
try
{
new Atom(
"ATOM 34N NE2 GLN A 48 22.290 8.595 17.680 1.00 14.30 N");
- fail("Expected exception");
+ Assert.fail("Expected exception");
} catch (NumberFormatException e)
{
// expected
} catch (NumberFormatException e)
{
// expected