X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FPDBEntryTest.java;fp=test%2Fjalview%2Fdatamodel%2FPDBEntryTest.java;h=1195393851c0403932c701fb5c9bb20b9847bfd5;hb=cc3a63ccd975af4c3d7d6bd5c0113b55962e39ba;hp=42bb09186cc294b45ef5a1f3add7c862de44b054;hpb=8f7a05d9ef39382ad09925f24019d3975bede459;p=jalview.git

diff --git a/test/jalview/datamodel/PDBEntryTest.java b/test/jalview/datamodel/PDBEntryTest.java
index 42bb091..1195393 100644
--- a/test/jalview/datamodel/PDBEntryTest.java
+++ b/test/jalview/datamodel/PDBEntryTest.java
@@ -20,8 +20,12 @@
  */
 package jalview.datamodel;
 
-import static org.testng.AssertJUnit.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.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -40,52 +44,60 @@ public class PDBEntryTest
   }
 
   @Test(groups = { "Functional" })
-  public void test()
+  public void testEquals()
   {
-    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 case9 = new PDBEntry("1xyz", "A", null, "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();
-    }
+    /*
+     * 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.getProperty().put("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());
+  }
 }