From 91382904453a7e52ea4cb7274d78799838c63ba1 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 14 Aug 2017 12:14:37 +0200
Subject: [PATCH] organize imports
---
model/src/test/java/lcsb/mapviewer/model/ProjectTest.java | 1 -
.../java/lcsb/mapviewer/model/map/model/ModelDataTest.java | 1 -
.../mapviewer/model/map/model/ModelFullIndexedTest.java | 1 -
rest-api/src/test/java/lcsb/mapviewer/api/AllRestTests.java | 1 -
.../api/projects/comments/CommentRestImplTest.java | 6 ++----
web/src/test/java/lcsb/mapviewer/bean/LayoutBeanTest.java | 6 ++----
6 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/model/src/test/java/lcsb/mapviewer/model/ProjectTest.java b/model/src/test/java/lcsb/mapviewer/model/ProjectTest.java
index 052f3d91aa..dcbadd0b48 100644
--- a/model/src/test/java/lcsb/mapviewer/model/ProjectTest.java
+++ b/model/src/test/java/lcsb/mapviewer/model/ProjectTest.java
@@ -124,7 +124,6 @@ public class ProjectTest {
project.setDisease(disease);
assertEquals(disease, project.getDisease());
- String inputFileName = "x";
UploadedFileEntry entry = new UploadedFileEntry() ;
project.setInputData(entry );
assertEquals(entry , project.getInputData());
diff --git a/model/src/test/java/lcsb/mapviewer/model/map/model/ModelDataTest.java b/model/src/test/java/lcsb/mapviewer/model/map/model/ModelDataTest.java
index d59e5028c1..ef0261c6a7 100644
--- a/model/src/test/java/lcsb/mapviewer/model/map/model/ModelDataTest.java
+++ b/model/src/test/java/lcsb/mapviewer/model/map/model/ModelDataTest.java
@@ -238,7 +238,6 @@ public class ModelDataTest {
int zoomLevels = 3;
int tileSize = 512;
String modelId = "modId";
- String email = "a@b.cc";
String notes = "nOT";
String name = "n_ma";
Double heightDouble = 29.0;
diff --git a/model/src/test/java/lcsb/mapviewer/model/map/model/ModelFullIndexedTest.java b/model/src/test/java/lcsb/mapviewer/model/map/model/ModelFullIndexedTest.java
index 2ab4f685e1..a009180f3e 100644
--- a/model/src/test/java/lcsb/mapviewer/model/map/model/ModelFullIndexedTest.java
+++ b/model/src/test/java/lcsb/mapviewer/model/map/model/ModelFullIndexedTest.java
@@ -747,7 +747,6 @@ public class ModelFullIndexedTest {
List<Layout> layouts = new ArrayList<>();
int zoomLevels = 98;
int tileSize = 1024;
- String notifyEmail = "email@email.lu";
String idModel = "model_ID";
Calendar creationDate = Calendar.getInstance();
diff --git a/rest-api/src/test/java/lcsb/mapviewer/api/AllRestTests.java b/rest-api/src/test/java/lcsb/mapviewer/api/AllRestTests.java
index 71e9be3bb9..ced165d503 100644
--- a/rest-api/src/test/java/lcsb/mapviewer/api/AllRestTests.java
+++ b/rest-api/src/test/java/lcsb/mapviewer/api/AllRestTests.java
@@ -7,7 +7,6 @@ import org.junit.runners.Suite.SuiteClasses;
import lcsb.mapviewer.api.configuration.AllConfigurationTests;
import lcsb.mapviewer.api.genomics.AllGenomicsTests;
import lcsb.mapviewer.api.projects.AllProjectTests;
-import lcsb.mapviewer.api.projects.comments.AllCommentTests;
import lcsb.mapviewer.api.users.AllUserTests;
@RunWith(Suite.class)
diff --git a/rest-api/src/test/java/lcsb/mapviewer/api/projects/comments/CommentRestImplTest.java b/rest-api/src/test/java/lcsb/mapviewer/api/projects/comments/CommentRestImplTest.java
index dd83e30d07..58213ce5c9 100644
--- a/rest-api/src/test/java/lcsb/mapviewer/api/projects/comments/CommentRestImplTest.java
+++ b/rest-api/src/test/java/lcsb/mapviewer/api/projects/comments/CommentRestImplTest.java
@@ -4,7 +4,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.times;
@@ -45,7 +44,7 @@ public class CommentRestImplTest extends RestTestFunctions {
@Test
public void testGetForNonExisting() throws Exception {
try {
- _commentRestImpl.getCommentList(token.getId(), "unk", "","","","");
+ _commentRestImpl.getCommentList(token.getId(), "unk", "", "", "", "");
fail("Exception expected");
} catch (QueryException e2) {
assertTrue(e2.getMessage().contains("Project with given id doesn't exist"));
@@ -59,7 +58,7 @@ public class CommentRestImplTest extends RestTestFunctions {
public void testGetCommentsDependencies() throws Exception {
try {
CommentRestImpl commentRestImpl = createMockProjectRest("testFiles/model/sample.xml");
- commentRestImpl.getCommentList(adminToken.getId(), "sample", "","","","");
+ commentRestImpl.getCommentList(adminToken.getId(), "sample", "", "", "", "");
Mockito.verify(commentRestImpl.getModelService(), times(0)).getLastModelByProjectId(anyString(), any());
} catch (Exception e) {
e.printStackTrace();
@@ -67,7 +66,6 @@ public class CommentRestImplTest extends RestTestFunctions {
}
}
-
private CommentRestImpl createMockProjectRest(String string) throws Exception {
Model model = null;
Project project = null;
diff --git a/web/src/test/java/lcsb/mapviewer/bean/LayoutBeanTest.java b/web/src/test/java/lcsb/mapviewer/bean/LayoutBeanTest.java
index 845deaafac..cd7db2f4b9 100644
--- a/web/src/test/java/lcsb/mapviewer/bean/LayoutBeanTest.java
+++ b/web/src/test/java/lcsb/mapviewer/bean/LayoutBeanTest.java
@@ -28,9 +28,7 @@ import lcsb.mapviewer.model.user.ObjectPrivilege;
import lcsb.mapviewer.model.user.PrivilegeType;
import lcsb.mapviewer.model.user.User;
import lcsb.mapviewer.persist.dao.map.LayoutDao;
-import lcsb.mapviewer.services.view.LayoutView;
import lcsb.mapviewer.services.view.ProjectView;
-import lcsb.mapviewer.services.view.ProjectViewTest;
public class LayoutBeanTest extends WebTestFunctions {
Logger logger = Logger.getLogger(LayoutBeanTest.class);
@@ -192,8 +190,8 @@ public class LayoutBeanTest extends WebTestFunctions {
layoutDao.refresh(l);
} while (l.getStatus().equals(LayoutStatus.NA) || l.getStatus().equals(LayoutStatus.GENERATING));
- ProjectView projectView =null;
- for (ProjectView view: projectBean.getProjects()) {
+ ProjectView projectView = null;
+ for (ProjectView view : projectBean.getProjects()) {
if (view.getIdObject().equals(project.getId())) {
projectView = view;
}
--
GitLab