From 45385f7c959a17102a8547cab05c4edb278c6478 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 24 Jul 2017 17:34:53 +0200
Subject: [PATCH] visibility level is returned properly
---
.../bioEntities/elements/ElementsRestImpl.java | 2 +-
.../elements/ElementRestImplTest.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java
index de063608eb..931996af49 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java
@@ -115,7 +115,7 @@ public class ElementsRestImpl extends BaseRestImpl {
} else if (column.equals("formersymbols")) {
value = element.getFormerSymbols();
} else if (column.equals("hierarchyvisibilitylevel")) {
- value = element.getFormerSymbols();
+ value = element.getVisibilityLevel();
} else if (column.equals("linkedsubmodel")) {
if (element.getSubmodel() != null) {
value = element.getSubmodel().getSubmodel().getId();
diff --git a/rest-api/src/test/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementRestImplTest.java b/rest-api/src/test/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementRestImplTest.java
index c6f6a0558d..7da42635f9 100644
--- a/rest-api/src/test/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementRestImplTest.java
+++ b/rest-api/src/test/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementRestImplTest.java
@@ -3,6 +3,7 @@ package lcsb.mapviewer.api.projects.models.bioEntities.elements;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
@@ -88,6 +89,21 @@ public class ElementRestImplTest extends RestTestFunctions {
}
}
+ @Test
+ public void testGetElementsVisibility() throws Exception {
+ try {
+ ElementsRestImpl elementRest = createMockElementRest("testFiles/model/sample.xml");
+ List<Map<String, Object>> result = elementRest.getElements("sample", "", "", "*", token.getId(), "");
+ for (Map<String, Object> map : result) {
+ assertTrue(map.get("hierarchyVisibilityLevel") instanceof String);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ }
+ }
+
@SuppressWarnings("unchecked")
@Test
public void testGetModificationsForProtein() throws Exception {
--
GitLab