X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FPDBEntryTest.java;h=fe2c35633bfbe068cd919835fc469a8888607b50;hb=52288466dd1e71946a06fd1e6ea15fa8e652c693;hp=49d9c62237214e3afa7e31f3994ba75c80e4faed;hpb=fe72160257543fca39f7959fc1347665e95764a2;p=jalview.git

diff --git a/test/jalview/datamodel/PDBEntryTest.java b/test/jalview/datamodel/PDBEntryTest.java
index 49d9c62..fe2c356 100644
--- a/test/jalview/datamodel/PDBEntryTest.java
+++ b/test/jalview/datamodel/PDBEntryTest.java
@@ -1,63 +1,66 @@
 package jalview.datamodel;
 
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertTrue;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class PDBEntryTest
 {
 
-  @Before
+  @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
   }
 
-  @After
+  @AfterMethod
   public void tearDown() throws Exception
   {
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void test()
   {
     try
     {
 
-    PDBEntry pdbEntry = new PDBEntry("1xyz", "A", PDBEntry.Type.PDB,
-            "x/y/z/File");
+      PDBEntry pdbEntry = new PDBEntry("1xyz", "A", PDBEntry.Type.PDB,
+              "x/y/z/File");
 
-    PDBEntry case1 = new PDBEntry("1XYZ", "A", PDBEntry.Type.PDB,
-            "x/y/z/File");
-    PDBEntry case2 = new PDBEntry("1xyz", "a", PDBEntry.Type.PDB,
-            "x/y/z/File");
-    PDBEntry case3 = new PDBEntry("1xyz", "A", PDBEntry.Type.FILE,
-            "x/y/z/File");
-    PDBEntry case4 = new PDBEntry(null, null, null, null);
-    PDBEntry case5 = new PDBEntry(null, "A", PDBEntry.Type.PDB,
-            "x/y/z/File");
-    PDBEntry case6 = new PDBEntry("1xyz", null, PDBEntry.Type.PDB,
-            "x/y/z/File");
-    PDBEntry case7 = new PDBEntry("1xyz", "A", null, "x/y/z/File");
-    PDBEntry case8 = new PDBEntry("1xyz", "A", PDBEntry.Type.PDB, null);
+      PDBEntry case1 = new PDBEntry("1XYZ", "A", PDBEntry.Type.PDB,
+              "x/y/z/File");
+      PDBEntry case2 = new PDBEntry("1xyz", "a", PDBEntry.Type.PDB,
+              "x/y/z/File");
+      PDBEntry case3 = new PDBEntry("1xyz", "A", PDBEntry.Type.FILE,
+              "x/y/z/File");
+      PDBEntry case4 = new PDBEntry(null, null, null, null);
+      PDBEntry case5 = new PDBEntry(null, "A", PDBEntry.Type.PDB,
+              "x/y/z/File");
+      PDBEntry case6 = new PDBEntry("1xyz", null, PDBEntry.Type.PDB,
+              "x/y/z/File");
+      PDBEntry case7 = new PDBEntry("1xyz", "A", null, "x/y/z/File");
+      PDBEntry case8 = new PDBEntry("1xyz", "A", PDBEntry.Type.PDB, null);
+      PDBEntry case9 = new PDBEntry("1xyz", "A", null, "x/y/z/File");
 
       // System.out.println(">>>> Testing case 1");
-    assertTrue(pdbEntry.equals(case1));
+      assertTrue(pdbEntry.equals(case1));
       // System.out.println(">>>> Testing case 2");
-    assertTrue(pdbEntry.equals(case2));
+      assertTrue(pdbEntry.equals(case2));
       // System.out.println(">>>> Testing case 3");
-    assertTrue(!pdbEntry.equals(case3));
+      assertTrue(!pdbEntry.equals(case3));
       // System.out.println(">>>> Testing case 4");
-    assertTrue(!pdbEntry.equals(case4));
+      assertTrue(!pdbEntry.equals(case4));
       // System.out.println(">>>> Testing case 5");
-    assertTrue(!pdbEntry.equals(case5));
+      assertTrue(!pdbEntry.equals(case5));
       // System.out.println(">>>> Testing case 6");
-    assertTrue(!pdbEntry.equals(case6));
+      assertTrue(!pdbEntry.equals(case6));
       // System.out.println(">>>> Testing case 7");
-    assertTrue(!pdbEntry.equals(case7));
+      assertTrue(!pdbEntry.equals(case7));
       // System.out.println(">>>> Testing case 8");
       assertTrue(pdbEntry.equals(case8));
+      assertTrue(pdbEntry.equals(case8));
+      assertTrue(case7.equals(case9));
     } catch (Exception e)
     {
       e.printStackTrace();