X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fdbsources%2FUniprotTest.java;h=2df8be69fb71d97168519ec0a04cb68661d9c8ab;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=77f8078981a010046c0572db1ea1de88ba0f3a37;hpb=7b371f1422157268c4dc89ce0766916eecf9779e;p=jalview.git

diff --git a/test/jalview/ws/dbsources/UniprotTest.java b/test/jalview/ws/dbsources/UniprotTest.java
index 77f8078..2df8be6 100644
--- 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" })
@@ -148,6 +145,7 @@ public class UniprotTest
     assertEquals(6, seq.getDBRefs().length); // 2*Uniprot, PDB, PDBsum, 2*EMBL
 
   }
+
   /**
    * Test the method that formats the sequence id
    */
@@ -173,7 +171,7 @@ public class UniprotTest
   {
     UniprotEntry entry = new Uniprot().getUniprotEntries(
             new StringReader(UNIPROT_XML)).get(0);
-  
+
     /*
      * recommended names concatenated with space separator
      */