X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FPDBEntryTest.java;h=a0068339de7e4a05960925265ab891cde0e9a89a;hb=f83b6877ab7ff3fc5db5c946e16c74e016437311;hp=198cde3ac7e25a750e8e6cb5ffb9a07953c0717f;hpb=3a8dc0dd7261853a53c7e4c3cde1b6d53d0e3e93;p=jalview.git

diff --git a/test/jalview/datamodel/PDBEntryTest.java b/test/jalview/datamodel/PDBEntryTest.java
index 198cde3..a006833 100644
--- a/test/jalview/datamodel/PDBEntryTest.java
+++ b/test/jalview/datamodel/PDBEntryTest.java
@@ -208,7 +208,7 @@ public class PDBEntryTest
     assertTrue(pdb1.updateFrom(pdb2));
     assertEquals(pdb1.getFile(), "filePath");
     assertEquals(pdb1.getType(), Type.FILE.toString());
-    assertEquals(pdb1.getChainCode(),"B");
+    assertEquals(pdb1.getChainCode(), "B");
     /*
      * change of file is not allowed
      */
@@ -269,6 +269,21 @@ public class PDBEntryTest
     pdb2.setProperty("hello", "moon");
     assertTrue(pdb1.updateFrom(pdb2));
     assertEquals(pdb1.getProperty("hello"), "moon");
+
+    /*
+    * different id but authoritative
+    */
+    pdb1 = new PDBEntry("af:1xyz", "A", null, "a/b/c/File");
+    pdb2 = new PDBEntry("af-1xyz", "A", null, "a/b/c/File");
+    pdb1.setAuthoritative(true);
+
+    assertTrue(pdb1.isAuthoritative());
+    assertFalse(pdb2.isAuthoritative());
+    // can update pdb1 (authoritative) from pdb2 (non-authoritative)
+    assertTrue(pdb1.updateFrom(pdb2));
+    // but the ID must remain the same
+    assertEquals(pdb1.getId(), "af:1xyz");
+
   }
 
   @Test(groups = { "Functional" })