JAL-1759 merge from develop

[jalview.git] / test / jalview / datamodel / PDBEntryTest.java

diff --git a/test/jalview/datamodel/PDBEntryTest.java b/test/jalview/datamodel/PDBEntryTest.java
index 5c597c0..68c3ddf 100644 (file)
--- a/test/jalview/datamodel/PDBEntryTest.java
+++ b/test/jalview/datamodel/PDBEntryTest.java
@@ -1,27 +1,30 @@
 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
   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");
 
@@ -38,23 +41,31 @@ public class PDBEntryTest
             "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");
+    
+      // System.out.println(">>>> Testing case 1");
     assertTrue(pdbEntry.equals(case1));
-    System.out.println(">>>> Testing case 2");
+      // System.out.println(">>>> Testing case 2");
     assertTrue(pdbEntry.equals(case2));
-    System.out.println(">>>> Testing case 3");
+      // System.out.println(">>>> Testing case 3");
     assertTrue(!pdbEntry.equals(case3));
-    System.out.println(">>>> Testing case 4");
+      // System.out.println(">>>> Testing case 4");
     assertTrue(!pdbEntry.equals(case4));
-    System.out.println(">>>> Testing case 5");
+      // System.out.println(">>>> Testing case 5");
     assertTrue(!pdbEntry.equals(case5));
-    System.out.println(">>>> Testing case 6");
+      // System.out.println(">>>> Testing case 6");
     assertTrue(!pdbEntry.equals(case6));
-    System.out.println(">>>> Testing case 7");
+      // System.out.println(">>>> Testing case 7");
     assertTrue(!pdbEntry.equals(case7));
-    System.out.println(">>>> Testing case 8");
-    assertTrue(pdbEntry.equals(case8));
+      // System.out.println(">>>> Testing case 8");
+      assertTrue(pdbEntry.equals(case8));
+      assertTrue(pdbEntry.equals(case8));
+      assertTrue(case7.equals(case9));
+    } catch (Exception e)
+    {
+      e.printStackTrace();
+    }
 
   }