Skip to content
Snippets Groups Projects
Commit 2ee13872 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

test speed improvement

parent 4a4c8956
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!386Resolve "Continous integration tests"
......@@ -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")));
......
......@@ -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;
}
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment