X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FPDBEntryTest.java;h=df2943795e014c75cd740f8abc85a8b7e7c8a68e;hb=6c96743ff6c65895e4b96523d0e3d05f6dc3cb01;hp=01fb4a15844e228c0974e945b127ea1e77262e73;hpb=0e90e35fa87e18e80a340f982110b03c5eccc503;p=jalview.git

diff --git a/test/jalview/datamodel/PDBEntryTest.java b/test/jalview/datamodel/PDBEntryTest.java
index 01fb4a1..df29437 100644
--- a/test/jalview/datamodel/PDBEntryTest.java
+++ b/test/jalview/datamodel/PDBEntryTest.java
@@ -1,30 +1,51 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNull;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+//import org.testng.Assert;
+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(alwaysRun = true)
   public void tearDown() throws Exception
   {
   }
 
-  @Test
-  public void test()
+  @Test(groups = { "Functional" })
+  public void testEquals()
   {
-    try
-    {
-
     PDBEntry pdbEntry = new PDBEntry("1xyz", "A", PDBEntry.Type.PDB,
             "x/y/z/File");
 
@@ -41,32 +62,42 @@ 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");
+    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();
-    }
+    /*
+     * assertions will invoke PDBEntry.equals()
+     */
+    assertFalse(pdbEntry.equals(null));
+    assertFalse(pdbEntry.equals("a"));
+    assertEquals(case1, pdbEntry);
+    assertEquals(case2, pdbEntry);
+    assertNotEquals(case3, pdbEntry);
+    assertNotEquals(case4, pdbEntry);
+    assertNotEquals(case5, pdbEntry);
+    assertNotEquals(case6, pdbEntry);
+    assertNotEquals(case7, pdbEntry);
+    assertEquals(case8, pdbEntry);
+    assertEquals(case7, case9);
 
+    /*
+     * change string wrapper property to string...
+     */
+    case1.setProperty("chain_code", "a");
+    assertFalse(pdbEntry.equals(case1));
+    assertFalse(case1.equals(pdbEntry));
   }
 
+  @Test(groups = { "Functional" })
+  public void testSetChainCode()
+  {
+    PDBEntry pdbEntry = new PDBEntry("1xyz", null, PDBEntry.Type.PDB,
+            "x/y/z/File");
+    assertNull(pdbEntry.getChainCode());
+
+    pdbEntry.setChainCode("a");
+    assertEquals("a", pdbEntry.getChainCode());
+
+    pdbEntry.setChainCode(null);
+    assertNull(pdbEntry.getChainCode());
+  }
 }