X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2FMCview%2FAtomTest.java;h=560b1a1cb5925fc2af5f50ec9d247e980916429a;hb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;hp=8c271b38faf4df2201b76a5767ec6071c20a2295;hpb=c777b335d0332979123446f431b7f0c160eb4880;p=jalview.git

diff --git a/test/MCview/AtomTest.java b/test/MCview/AtomTest.java
index 8c271b3..560b1a1 100644
--- a/test/MCview/AtomTest.java
+++ b/test/MCview/AtomTest.java
@@ -1,9 +1,29 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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
 {
@@ -12,7 +32,7 @@ public class AtomTest
    * 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(
@@ -22,7 +42,7 @@ public class AtomTest
     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);
@@ -35,7 +55,7 @@ public class AtomTest
    * 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(
@@ -47,17 +67,17 @@ public class AtomTest
   /**
    * 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");
-      fail("Expected exception");
+      Assert.fail("Expected exception");
     } catch (NumberFormatException e)
     {
       // expected
     }
   }
-}
\ No newline at end of file
+}