Changeset 167

Timestamp:

08/22/09 20:23:08 (2 years ago)

Author:

martijn

Message:

Fixed NPE in IDMapperFile
Also added unit test for this problem

Location:

trunk/corelib

Files:

• src/org/bridgedb/file/IDMapperFile.java (modified) (1 diff)
• test/org/bridgedb/TestFile.java (modified) (1 diff)

trunk/corelib/src/org/bridgedb/file/IDMapperFile.java

@@ -131 +131 @@
         }
 
-        for (Xref destRef : mapXrefs.get(srcXref))
+        Set<Xref> destRefs = mapXrefs.get(srcXref);
+        if (destRefs != null) for (Xref destRef : mapXrefs.get(srcXref))
         {
             if (tgtDataSources == null || tgtDataSources.contains(destRef.getDataSource()))

trunk/corelib/test/org/bridgedb/TestFile.java

@@ -92 +92 @@
             System.out.println(xr.getDataSource().getFullName() + ": " + xr.getId());
         }
+        
+        Xref nonsense = new Xref ("Humbug", DataSource.getByFullName("Ebenizer Scrooge"));
+        // non-existent id should just return empty list.
+        assertEquals (0, idMapper.mapID(nonsense, null).size());
 
         }