diff --git a/rest-api/src/test/java/lcsb/mapviewer/api/projects/mirnas/MiRnaRestImplTest.java b/rest-api/src/test/java/lcsb/mapviewer/api/projects/mirnas/MiRnaRestImplTest.java index 25456e10a7a726ce6e63d246472cce55feb8eb41..624dcd70c9b73e9edd75479012112025e8437c26 100644 --- a/rest-api/src/test/java/lcsb/mapviewer/api/projects/mirnas/MiRnaRestImplTest.java +++ b/rest-api/src/test/java/lcsb/mapviewer/api/projects/mirnas/MiRnaRestImplTest.java @@ -43,8 +43,7 @@ public class MiRnaRestImplTest extends RestTestFunctions { public void testGetMiRnasByTarget() throws Exception { try { MiRnaRestImpl miRnaRestImpl = createMockProjectRest("testFiles/model/mi_rna_target.xml"); - List<Map<String, Object>> result = miRnaRestImpl.getMiRnasByTarget(token, "mi_rna_target", "ALIAS", "0", - ""); + List<Map<String, Object>> result = miRnaRestImpl.getMiRnasByTarget(token, "mi_rna_target", "ALIAS", "0", ""); Set<String> names = new HashSet<>(); for (Map<String, Object> miRna : result) { assertFalse("Duplicate miRna found: " + miRna.get("name"), names.contains(miRna.get("name"))); diff --git a/rest-api/src/test/java/lcsb/mapviewer/api/projects/models/ModelRestImplTest.java b/rest-api/src/test/java/lcsb/mapviewer/api/projects/models/ModelRestImplTest.java index 76ef1955e3eeab6d1e83c802ed3c494ec43ba3df..5699af1a4a2e881c7012ba0527dba97a718b7bcb 100644 --- a/rest-api/src/test/java/lcsb/mapviewer/api/projects/models/ModelRestImplTest.java +++ b/rest-api/src/test/java/lcsb/mapviewer/api/projects/models/ModelRestImplTest.java @@ -79,9 +79,17 @@ public class ModelRestImplTest extends RestTestFunctions { private ModelRestImpl createMockProjectRest(String string) throws Exception { Model model = super.getModelForFile(string, true); + Project project = new Project(); + project.addModel(model); + IModelService mockModelService = Mockito.mock(IModelService.class); Mockito.when(mockModelService.getLastModelByProjectId(anyString(), any())).thenReturn(model); _modelRestImpl.setModelService(mockModelService); + + IProjectService mockProjectService = Mockito.mock(IProjectService.class); + Mockito.when(mockProjectService.getProjectByProjectId(anyString(), any())).thenReturn(project); + _modelRestImpl.setProjectService(mockProjectService); + return _modelRestImpl; } diff --git a/rest-api/testFiles/model/mi_rna_target.xml b/rest-api/testFiles/model/mi_rna_target.xml index b021eac924f7e9fd5311947fb1c6e78255bd6241..a0e2b10a6ef0f7018c4493f941226a8b3a8c7bd5 100644 --- a/rest-api/testFiles/model/mi_rna_target.xml +++ b/rest-api/testFiles/model/mi_rna_target.xml @@ -22,7 +22,7 @@ <celldesigner:briefView> <celldesigner:innerPosition x="0.0" y="0.0"/> <celldesigner:boxSize width="80.0" height="60.0"/> -<celldesigner:singleLine width="0.0"/> +<celldesigner:singleLine width="1.0"/> <celldesigner:paint color="3fff0000" scheme="Color"/> </celldesigner:briefView> <celldesigner:info state="empty" angle="-1.5707963267948966"/> @@ -30,7 +30,7 @@ </celldesigner:listOfSpeciesAliases> <celldesigner:listOfGroups/> <celldesigner:listOfProteins> -<celldesigner:protein id="pr1" name="BCL2" type="GENERIC"/> +<celldesigner:protein id="pr1" name="PRDX1" type="GENERIC"/> </celldesigner:listOfProteins> <celldesigner:listOfGenes/> <celldesigner:listOfRNAs/> @@ -70,7 +70,7 @@ <compartment metaid="default" id="default" size="1" units="volume"/> </listOfCompartments> <listOfSpecies> -<species metaid="s1" id="s1" name="BCL2" compartment="default" initialAmount="0"> +<species metaid="s1" id="s1" name="PRDX1" compartment="default" initialAmount="0"> <annotation> <celldesigner:extension> <celldesigner:positionToCompartment>inside</celldesigner:positionToCompartment>