From 2ee138720aab549b3ef19e397a58e54a4553cabb Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 10 Sep 2018 15:29:56 +0200
Subject: [PATCH] test speed improvement
---
.../mapviewer/api/projects/mirnas/MiRnaRestImplTest.java | 3 +--
.../mapviewer/api/projects/models/ModelRestImplTest.java | 8 ++++++++
rest-api/testFiles/model/mi_rna_target.xml | 6 +++---
3 files changed, 12 insertions(+), 5 deletions(-)
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 25456e10a7..624dcd70c9 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 76ef1955e3..5699af1a4a 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 b021eac924..a0e2b10a6e 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>
--
GitLab