create user doesn't use global variable

persist/src/test/java/lcsb/mapviewer/persist/PersistTestFunctions.java

 package lcsb.mapviewer.persist;
 
 import java.awt.Color;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Arrays;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -33,14 +25,10 @@ import lcsb.mapviewer.model.map.species.Phenotype;
 import lcsb.mapviewer.model.map.species.Rna;
 import lcsb.mapviewer.model.user.User;
 import lcsb.mapviewer.persist.dao.ProjectDao;
-import lcsb.mapviewer.persist.dao.cache.CacheQueryDao;
 import lcsb.mapviewer.persist.dao.cache.CacheTypeDao;
-import lcsb.mapviewer.persist.dao.graphics.PolylineDao;
 import lcsb.mapviewer.persist.dao.map.CommentDao;
 import lcsb.mapviewer.persist.dao.map.ModelDao;
-import lcsb.mapviewer.persist.dao.map.ReactionDao;
 import lcsb.mapviewer.persist.dao.map.species.ElementDao;
-import lcsb.mapviewer.persist.dao.map.statistics.SearchHistoryDao;
 import lcsb.mapviewer.persist.dao.user.UserDao;
 
 @Transactional
@@ -74,8 +62,6 @@ public abstract class PersistTestFunctions {
   @Autowired
   protected ElementDao elementDao;
 
-  protected User user;
-
   @Autowired
   protected CacheTypeDao cacheTypeDao;
 
@@ -93,14 +79,15 @@ public abstract class PersistTestFunctions {
     modelDao.delete(modelDao.getById(id));
   }
 
-  protected void createUser() {
-    user = new User();
+  protected User createUser() {
+    User user = new User();
     user.setName("John");
     user.setSurname("Doe");
     user.setEmail("john.doe@uni.lu");
     user.setLogin("john.doe");
     user.setCryptedPassword(passwordEncoder.encode("passwd"));
     userDao.add(user);
+    return user;
   }
 
   protected Compartment createCompartment(double x, double y, double width, double height, String compartmentId) {

persist/src/test/java/lcsb/mapviewer/persist/dao/map/FeedbackTest.java

@@ -2,42 +2,46 @@ package lcsb.mapviewer.persist.dao.map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import lcsb.mapviewer.model.map.Comment;
-import lcsb.mapviewer.persist.PersistTestFunctions;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import lcsb.mapviewer.model.map.Comment;
+import lcsb.mapviewer.model.user.User;
+import lcsb.mapviewer.persist.PersistTestFunctions;
+
 public class FeedbackTest extends PersistTestFunctions {
 
-	@Before
-	public void setUp() throws Exception {
-		createUser();
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		userDao.delete(user);
-	}
-
-	@Test
-	public void testFeedback() throws Exception {
-		try {
-			int counter = (int) commentDao.getCount();
-			Comment feedback = new Comment();
-			feedback.setUser(user);
-			commentDao.add(feedback);
-			int counter2 = (int) commentDao.getCount();
-			assertEquals(counter + 1, counter2);
-			Comment feedback2 = commentDao.getById(feedback.getId());
-			assertNotNull(feedback2);
-			commentDao.delete(feedback);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		}
-	}
+  User user;
+
+  @Before
+  public void setUp() throws Exception {
+    user = createUser();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    userDao.delete(user);
+  }
+
+  @Test
+  public void testFeedback() throws Exception {
+    try {
+      int counter = (int) commentDao.getCount();
+      Comment feedback = new Comment();
+      feedback.setUser(user);
+      commentDao.add(feedback);
+      int counter2 = (int) commentDao.getCount();
+      assertEquals(counter + 1, counter2);
+      Comment feedback2 = commentDao.getById(feedback.getId());
+      assertNotNull(feedback2);
+      commentDao.delete(feedback);
+
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw e;
+    }
+  }
 
 }

persist/src/test/java/lcsb/mapviewer/persist/dao/map/LayoutDaoTest.java

@@ -6,7 +6,8 @@ import static org.junit.Assert.assertNull;
 
 import java.nio.charset.StandardCharsets;
 
-import org.apache.logging.log4j.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -30,6 +31,7 @@ import lcsb.mapviewer.model.map.species.Complex;
 import lcsb.mapviewer.model.map.species.Protein;
 import lcsb.mapviewer.model.map.species.Species;
 import lcsb.mapviewer.model.map.species.field.Residue;
+import lcsb.mapviewer.model.user.User;
 import lcsb.mapviewer.persist.PersistTestFunctions;
 
 public class LayoutDaoTest extends PersistTestFunctions {
@@ -101,7 +103,7 @@ public class LayoutDaoTest extends PersistTestFunctions {
       Model model = createModel();
       String tempName = "temporary name";
 
-      createUser();
+      User user = createUser();
 
       Project project = new Project("test_project_id");
       project.addModel(model);

persist/src/test/java/lcsb/mapviewer/persist/dao/plugin/PluginDataEntryDaoTest.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import lcsb.mapviewer.model.plugin.Plugin;
 import lcsb.mapviewer.model.plugin.PluginDataEntry;
+import lcsb.mapviewer.model.user.User;
 import lcsb.mapviewer.persist.PersistTestFunctions;
 
 public class PluginDataEntryDaoTest extends PersistTestFunctions {
@@ -40,7 +41,7 @@ public class PluginDataEntryDaoTest extends PersistTestFunctions {
 
   @Test
   public void testGetByKeyForUserParam() {
-    createUser();
+    User user = createUser();
     Plugin plugin =new Plugin();
     plugin.setHash("x");
     plugin.setName("Plugin name");