merge issues

web/src/test/java/lcsb/mapviewer/web/CommentControllerIntegrationTest.java

@@ -983,9 +983,7 @@ public class CommentControllerIntegrationTest extends ControllerIntegrationTest
 
   @Test
   public void testCommentsOnNonExistingModel() throws Exception {
-    createAdmin(TEST_ADMIN_LOGIN, TEST_ADMIN_PASSWORD);
-
-    MockHttpSession session = createSession(TEST_ADMIN_LOGIN, TEST_ADMIN_PASSWORD);
+    MockHttpSession session = createSession(BUILT_IN_TEST_ADMIN_LOGIN, BUILT_IN_TEST_ADMIN_PASSWORD);
 
     createComments();
 
@@ -999,9 +997,7 @@ public class CommentControllerIntegrationTest extends ControllerIntegrationTest
 
   @Test
   public void testRemoveFromSubmap() throws Exception {
-    createAdmin(TEST_ADMIN_LOGIN, TEST_ADMIN_PASSWORD);
-
-    MockHttpSession session = createSession(TEST_ADMIN_LOGIN, TEST_ADMIN_PASSWORD);
+    MockHttpSession session = createSession(BUILT_IN_TEST_ADMIN_LOGIN, BUILT_IN_TEST_ADMIN_PASSWORD);
 
     ModelData submap = map.getSubmodels().iterator().next().getSubmodel();
 

web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTestWithoutTransaction.java

@@ -4,7 +4,6 @@ import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.docu
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
 import static org.springframework.restdocs.request.RequestDocumentation.*;
 import static org.junit.Assert.assertEquals;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.nio.file.Files;