X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FPDBEntryTest.java;h=f09703de79f1bc6736ca1d1a0ff7b7e99fa978a0;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=5c597c07d6144ce261b1b5fe86897f3b7f7e1339;hpb=bc27e1b604af729b363da1f29bdd5774ca79f4e4;p=jalview.git

diff --git a/test/jalview/datamodel/PDBEntryTest.java b/test/jalview/datamodel/PDBEntryTest.java
index 5c597c0..f09703d 100644
--- a/test/jalview/datamodel/PDBEntryTest.java
+++ b/test/jalview/datamodel/PDBEntryTest.java
@@ -1,60 +1,90 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * 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 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()
   {
-    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);
-
-    System.out.println(">>>> Testing case 1");
-    assertTrue(pdbEntry.equals(case1));
-    System.out.println(">>>> Testing case 2");
-    assertTrue(pdbEntry.equals(case2));
-    System.out.println(">>>> Testing case 3");
-    assertTrue(!pdbEntry.equals(case3));
-    System.out.println(">>>> Testing case 4");
-    assertTrue(!pdbEntry.equals(case4));
-    System.out.println(">>>> Testing case 5");
-    assertTrue(!pdbEntry.equals(case5));
-    System.out.println(">>>> Testing case 6");
-    assertTrue(!pdbEntry.equals(case6));
-    System.out.println(">>>> Testing case 7");
-    assertTrue(!pdbEntry.equals(case7));
-    System.out.println(">>>> Testing case 8");
-    assertTrue(pdbEntry.equals(case8));
+    try
+    {
+
+      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 case9 = new PDBEntry("1xyz", "A", null, "x/y/z/File");
+
+      // System.out.println(">>>> Testing case 1");
+      assertTrue(pdbEntry.equals(case1));
+      // System.out.println(">>>> Testing case 2");
+      assertTrue(pdbEntry.equals(case2));
+      // System.out.println(">>>> Testing case 3");
+      assertTrue(!pdbEntry.equals(case3));
+      // System.out.println(">>>> Testing case 4");
+      assertTrue(!pdbEntry.equals(case4));
+      // System.out.println(">>>> Testing case 5");
+      assertTrue(!pdbEntry.equals(case5));
+      // System.out.println(">>>> Testing case 6");
+      assertTrue(!pdbEntry.equals(case6));
+      // System.out.println(">>>> Testing case 7");
+      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();
+    }
 
   }