mock session manager instead of create real one

Author: gy2006

core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java

@@ -165,8 +165,6 @@ public Flow create(String name) {
 
         // set properties
         flow.setName(name);
-        flow.setCreatedBy(email);
-
         setupDefaultVars(flow);
 
         try {

core/src/test/java/com/flowci/core/test/SpringScenario.java

@@ -30,12 +30,14 @@
 import com.flowci.core.user.domain.User;
 import com.flowci.core.user.service.UserService;
 import com.flowci.exception.NotFoundException;
+import com.flowci.util.HashingHelper;
 import lombok.extern.log4j.Log4j2;
 import org.assertj.core.util.Lists;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -50,10 +52,7 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.InputStream;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author yang
@@ -101,10 +100,19 @@ public List<Template> getTemplates() {
         }
     }
 
+    private final static User defaultAdminUser = new User();
+
+    static {
+        defaultAdminUser.setId("112233");
+        defaultAdminUser.setRole(User.Role.Admin);
+        defaultAdminUser.setEmail("[email protected]");
+        defaultAdminUser.setPasswordOnMd5(HashingHelper.md5("12345"));
+    }
+
     @MockBean
     protected SettingService settingService;
 
-    @Autowired
+    @MockBean
     protected SessionManager sessionManager;
 
     @Autowired
@@ -151,10 +159,15 @@ public void queueCleanUp() {
         }
     }
 
-    protected void should_has_db_info(Mongoable obj) {
+    protected void shouldHasCreatedAtAndCreatedBy(Mongoable obj) {
         Assert.assertNotNull(obj.getCreatedAt());
-        Assert.assertNotNull(obj.getUpdatedAt());
+        Assert.assertNotNull(obj.getCreatedBy());
         Assert.assertEquals(sessionManager.getUserEmail(), obj.getCreatedBy());
+    }
+
+    protected void shouldHasUpdatedAtAndUpdatedBy(Mongoable obj) {
+        Assert.assertNotNull(obj.getUpdatedAt());
+        Assert.assertNotNull(obj.getUpdatedBy());
         Assert.assertEquals(sessionManager.getUserEmail(), obj.getUpdatedBy());
     }
 
@@ -177,12 +190,8 @@ protected InputStream load(String resource) {
     }
 
     protected void mockLogin() {
-        User user;
-        try {
-            user = userService.getByEmail("[email protected]");
-        } catch (NotFoundException e) {
-            user = userService.create("[email protected]", "12345", User.Role.Admin);
-        }
-        sessionManager.set(user);
+        Mockito.when(sessionManager.get()).thenReturn(defaultAdminUser);
+        Mockito.when(sessionManager.getUserEmail()).thenReturn(defaultAdminUser.getEmail());
+        Mockito.when(sessionManager.getCurrentAuditor()).thenReturn(Optional.of(defaultAdminUser.getEmail()));
     }
 }

core/src/test/java/com/flowci/core/test/config/ConfigServiceTest.java

@@ -51,7 +51,7 @@ public void should_create_smtp_config_with_secret() {
 
         // then:
         SmtpConfig config = (SmtpConfig) configService.get("smtp-config");
-        should_has_db_info(config);
+        shouldHasCreatedAtAndCreatedBy(config);
 
         Assert.assertNotNull(config.getId());
         Assert.assertEquals(mockSecret.getUsername(), config.getAuth().getUsername());

core/src/test/java/com/flowci/core/test/flow/FlowServiceTest.java

@@ -80,7 +80,7 @@ public void login() throws IOException {
     @Test
     public void should_create_with_default_vars() {
         final Flow flow = flowService.create("vars-test");
-        should_has_db_info(flow);
+        shouldHasCreatedAtAndCreatedBy(flow);
 
         final Vars<VarValue> vars = flow.getVars();
         Assert.assertEquals(1, vars.size());

core/src/test/java/com/flowci/core/test/secret/SecretServiceTest.java

@@ -46,7 +46,7 @@ public void login() {
     public void should_create_rsa_secret() {
         Secret rsa = secretService.createRSA("hello.rsa");
         Assert.assertNotNull(rsa);
-        should_has_db_info(rsa);
+        shouldHasCreatedAtAndCreatedBy(rsa);
 
         Assert.assertEquals(Secret.Category.SSH_RSA, rsa.getCategory());
         Assert.assertEquals(sessionManager.getUserEmail(), rsa.getCreatedBy());