diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/data/Chemical.java b/annotation/src/main/java/lcsb/mapviewer/annotation/data/Chemical.java index 651cecb2df7128dedfd76c45aee9ad53d1abcc13..eefc0b0d45c59bb1e977ff7a141bb639d9582360 100644 --- a/annotation/src/main/java/lcsb/mapviewer/annotation/data/Chemical.java +++ b/annotation/src/main/java/lcsb/mapviewer/annotation/data/Chemical.java @@ -291,13 +291,17 @@ public class Chemical implements Serializable, TargettingStructure { } - @Override - public Collection<MiriamData> getSources() { - List<MiriamData> sources = new ArrayList<>(); - sources.add(getCasID()); - sources.add(getChemicalId()); - return sources; - } + @Override + public Collection<MiriamData> getSources() { + List<MiriamData> sources = new ArrayList<>(); + if (getCasID() != null) { + sources.add(getCasID()); + } + if (getChemicalId() != null) { + sources.add(getChemicalId()); + } + return sources; + } @Override public Collection<Target> getTargets() { diff --git a/service/src/main/java/lcsb/mapviewer/services/search/db/DbSearchService.java b/service/src/main/java/lcsb/mapviewer/services/search/db/DbSearchService.java index 43bdc10b273b2dae5058ab2cf180b02bac634abf..85d7779f947765db5342c030954928ea31a8cf72 100644 --- a/service/src/main/java/lcsb/mapviewer/services/search/db/DbSearchService.java +++ b/service/src/main/java/lcsb/mapviewer/services/search/db/DbSearchService.java @@ -44,5 +44,4 @@ public abstract class DbSearchService { } } - } diff --git a/service/src/test/java/lcsb/mapviewer/services/search/db/AllSearchDbTests.java b/service/src/test/java/lcsb/mapviewer/services/search/db/AllSearchDbTests.java index 349617eabda10a7251c67a808c095c861bbae3c3..97173efd3aea8aa6fa7495c2d788d92a7a190fcc 100644 --- a/service/src/test/java/lcsb/mapviewer/services/search/db/AllSearchDbTests.java +++ b/service/src/test/java/lcsb/mapviewer/services/search/db/AllSearchDbTests.java @@ -10,8 +10,9 @@ import lcsb.mapviewer.services.search.db.mirna.MiRNAServiceTest; @RunWith(Suite.class) @SuiteClasses({ AllSearchDrugTests.class, // - ChemicalServiceTest.class, // - MiRNAServiceTest.class, // + ChemicalServiceTest.class, // + DbSearchServiceTest.class, // + MiRNAServiceTest.class, // }) public class AllSearchDbTests { diff --git a/service/src/test/java/lcsb/mapviewer/services/search/db/DbSearchServiceTest.java b/service/src/test/java/lcsb/mapviewer/services/search/db/DbSearchServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..3255a743e841f017fe964b26abbe6769074e0dc4 --- /dev/null +++ b/service/src/test/java/lcsb/mapviewer/services/search/db/DbSearchServiceTest.java @@ -0,0 +1,18 @@ +package lcsb.mapviewer.services.search.db; + +import org.junit.Test; +import org.mockito.Mockito; + +import lcsb.mapviewer.annotation.data.Chemical; + +public class DbSearchServiceTest { + + @Test + public void testCacheMiriamData() throws Exception { + Chemical chemical = new Chemical(); + DbSearchService service = Mockito.mock(DbSearchService.class, Mockito.CALLS_REAL_METHODS); + service.cacheMiriamData(chemical); + + } + +}