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

organize imports

parent 85b07d4c
No related branches found
No related tags found
2 merge requests!115Resolve "admin panel should use API",!114Resolve "admin panel should use API"
...@@ -124,7 +124,6 @@ public class ProjectTest { ...@@ -124,7 +124,6 @@ public class ProjectTest {
project.setDisease(disease); project.setDisease(disease);
assertEquals(disease, project.getDisease()); assertEquals(disease, project.getDisease());
String inputFileName = "x";
UploadedFileEntry entry = new UploadedFileEntry() ; UploadedFileEntry entry = new UploadedFileEntry() ;
project.setInputData(entry ); project.setInputData(entry );
assertEquals(entry , project.getInputData()); assertEquals(entry , project.getInputData());
......
...@@ -238,7 +238,6 @@ public class ModelDataTest { ...@@ -238,7 +238,6 @@ public class ModelDataTest {
int zoomLevels = 3; int zoomLevels = 3;
int tileSize = 512; int tileSize = 512;
String modelId = "modId"; String modelId = "modId";
String email = "a@b.cc";
String notes = "nOT"; String notes = "nOT";
String name = "n_ma"; String name = "n_ma";
Double heightDouble = 29.0; Double heightDouble = 29.0;
......
...@@ -747,7 +747,6 @@ public class ModelFullIndexedTest { ...@@ -747,7 +747,6 @@ public class ModelFullIndexedTest {
List<Layout> layouts = new ArrayList<>(); List<Layout> layouts = new ArrayList<>();
int zoomLevels = 98; int zoomLevels = 98;
int tileSize = 1024; int tileSize = 1024;
String notifyEmail = "email@email.lu";
String idModel = "model_ID"; String idModel = "model_ID";
Calendar creationDate = Calendar.getInstance(); Calendar creationDate = Calendar.getInstance();
......
...@@ -7,7 +7,6 @@ import org.junit.runners.Suite.SuiteClasses; ...@@ -7,7 +7,6 @@ import org.junit.runners.Suite.SuiteClasses;
import lcsb.mapviewer.api.configuration.AllConfigurationTests; import lcsb.mapviewer.api.configuration.AllConfigurationTests;
import lcsb.mapviewer.api.genomics.AllGenomicsTests; import lcsb.mapviewer.api.genomics.AllGenomicsTests;
import lcsb.mapviewer.api.projects.AllProjectTests; import lcsb.mapviewer.api.projects.AllProjectTests;
import lcsb.mapviewer.api.projects.comments.AllCommentTests;
import lcsb.mapviewer.api.users.AllUserTests; import lcsb.mapviewer.api.users.AllUserTests;
@RunWith(Suite.class) @RunWith(Suite.class)
......
...@@ -4,7 +4,6 @@ import static org.junit.Assert.assertTrue; ...@@ -4,7 +4,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
...@@ -45,7 +44,7 @@ public class CommentRestImplTest extends RestTestFunctions { ...@@ -45,7 +44,7 @@ public class CommentRestImplTest extends RestTestFunctions {
@Test @Test
public void testGetForNonExisting() throws Exception { public void testGetForNonExisting() throws Exception {
try { try {
_commentRestImpl.getCommentList(token.getId(), "unk", "","","",""); _commentRestImpl.getCommentList(token.getId(), "unk", "", "", "", "");
fail("Exception expected"); fail("Exception expected");
} catch (QueryException e2) { } catch (QueryException e2) {
assertTrue(e2.getMessage().contains("Project with given id doesn't exist")); assertTrue(e2.getMessage().contains("Project with given id doesn't exist"));
...@@ -59,7 +58,7 @@ public class CommentRestImplTest extends RestTestFunctions { ...@@ -59,7 +58,7 @@ public class CommentRestImplTest extends RestTestFunctions {
public void testGetCommentsDependencies() throws Exception { public void testGetCommentsDependencies() throws Exception {
try { try {
CommentRestImpl commentRestImpl = createMockProjectRest("testFiles/model/sample.xml"); 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()); Mockito.verify(commentRestImpl.getModelService(), times(0)).getLastModelByProjectId(anyString(), any());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -67,7 +66,6 @@ public class CommentRestImplTest extends RestTestFunctions { ...@@ -67,7 +66,6 @@ public class CommentRestImplTest extends RestTestFunctions {
} }
} }
private CommentRestImpl createMockProjectRest(String string) throws Exception { private CommentRestImpl createMockProjectRest(String string) throws Exception {
Model model = null; Model model = null;
Project project = null; Project project = null;
......
...@@ -28,9 +28,7 @@ import lcsb.mapviewer.model.user.ObjectPrivilege; ...@@ -28,9 +28,7 @@ import lcsb.mapviewer.model.user.ObjectPrivilege;
import lcsb.mapviewer.model.user.PrivilegeType; import lcsb.mapviewer.model.user.PrivilegeType;
import lcsb.mapviewer.model.user.User; import lcsb.mapviewer.model.user.User;
import lcsb.mapviewer.persist.dao.map.LayoutDao; import lcsb.mapviewer.persist.dao.map.LayoutDao;
import lcsb.mapviewer.services.view.LayoutView;
import lcsb.mapviewer.services.view.ProjectView; import lcsb.mapviewer.services.view.ProjectView;
import lcsb.mapviewer.services.view.ProjectViewTest;
public class LayoutBeanTest extends WebTestFunctions { public class LayoutBeanTest extends WebTestFunctions {
Logger logger = Logger.getLogger(LayoutBeanTest.class); Logger logger = Logger.getLogger(LayoutBeanTest.class);
...@@ -192,8 +190,8 @@ public class LayoutBeanTest extends WebTestFunctions { ...@@ -192,8 +190,8 @@ public class LayoutBeanTest extends WebTestFunctions {
layoutDao.refresh(l); layoutDao.refresh(l);
} while (l.getStatus().equals(LayoutStatus.NA) || l.getStatus().equals(LayoutStatus.GENERATING)); } while (l.getStatus().equals(LayoutStatus.NA) || l.getStatus().equals(LayoutStatus.GENERATING));
ProjectView projectView =null; ProjectView projectView = null;
for (ProjectView view: projectBean.getProjects()) { for (ProjectView view : projectBean.getProjects()) {
if (view.getIdObject().equals(project.getId())) { if (view.getIdObject().equals(project.getId())) {
projectView = view; projectView = view;
} }
......
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