Merge branch 'develop' into task/JAL-2196pdbeProperties

[jalview.git] / test / jalview / ws / dbsources / UniprotTest.java

diff --git a/test/jalview/ws/dbsources/UniprotTest.java b/test/jalview/ws/dbsources/UniprotTest.java
index 77f8078..4b88b2b 100644 (file)
--- a/test/jalview/ws/dbsources/UniprotTest.java
+++ b/test/jalview/ws/dbsources/UniprotTest.java
@@ -21,6 +21,7 @@
 package jalview.ws.dbsources;
 
 import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertNull;
 
@@ -117,25 +118,21 @@ public class UniprotTest
     PDBEntry xref = xrefs.get(0);
     assertEquals("2FSQ", xref.getId());
     assertEquals("PDB", xref.getType());
-    assertEquals(2, xref.getProperty().size());
-    assertEquals("X-ray", xref.getProperty().get("method"));
-    assertEquals("1.40", xref.getProperty().get("resolution"));
+    assertEquals("X-ray", xref.getProperty("method"));
+    assertEquals("1.40", xref.getProperty("resolution"));
 
     xref = xrefs.get(1);
     assertEquals("2FSR", xref.getId());
     assertEquals("PDBsum", xref.getType());
-    assertNull(xref.getProperty());
+    assertFalse(xref.getProperties().hasMoreElements());
 
     xref = xrefs.get(2);
     assertEquals("AE007869", xref.getId());
     assertEquals("EMBL", xref.getType());
-    assertNotNull(xref.getProperty());
     assertEquals("AAK85932.1",
-            (String) xref.getProperty().get("protein sequence ID"));
+ xref.getProperty("protein sequence ID"));
     assertEquals("Genomic_DNA",
-            (String) xref.getProperty().get("molecule type"));
-    assertEquals(2, xref.getProperty().size());
-
+ xref.getProperty("molecule type"));
   }
 
   @Test(groups = { "Functional" })