restructure unit test and fix auth controller test

Author: gy2006

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

@@ -0,0 +1,47 @@
+package com.flowci.core.test;
+
+import com.flowci.core.common.domain.Mongoable;
+import com.flowci.core.common.manager.SessionManager;
+import com.flowci.core.user.domain.User;
+import com.flowci.util.HashingHelper;
+import org.junit.Assert;
+import org.junit.Before;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import java.util.Optional;
+
+public abstract class MockLoggedInScenario extends SpringScenario{
+
+    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 SessionManager sessionManager;
+
+    @Before
+    public void login() {
+        Mockito.when(sessionManager.get()).thenReturn(defaultAdminUser);
+        Mockito.when(sessionManager.getUserEmail()).thenReturn(defaultAdminUser.getEmail());
+        Mockito.when(sessionManager.getCurrentAuditor()).thenReturn(Optional.of(defaultAdminUser.getEmail()));
+    }
+
+    protected void shouldHasCreatedAtAndCreatedBy(Mongoable obj) {
+        Assert.assertNotNull(obj.getCreatedAt());
+        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());
+    }
+
+}

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

@@ -16,9 +16,7 @@
 
 package com.flowci.core.test;
 
-import com.flowci.core.common.domain.Mongoable;
 import com.flowci.core.common.domain.Settings;
-import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.common.rabbit.RabbitOperations;
 import com.flowci.core.common.service.SettingService;
 import com.flowci.core.flow.dao.FlowDao;
@@ -27,17 +25,12 @@
 import com.flowci.core.test.SpringScenario.Config;
 import com.flowci.core.test.auth.AuthHelper;
 import com.flowci.core.test.flow.FlowMockHelper;
-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;
@@ -52,7 +45,10 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.InputStream;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author yang
@@ -100,21 +96,9 @@ 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;
 
-    @MockBean
-    protected SessionManager sessionManager;
-
     @Autowired
     protected UserService userService;
 
@@ -159,18 +143,6 @@ public void queueCleanUp() {
         }
     }
 
-    protected void shouldHasCreatedAtAndCreatedBy(Mongoable obj) {
-        Assert.assertNotNull(obj.getCreatedAt());
-        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());
-    }
-
     protected void addEventListener(ApplicationListener<?> listener) {
         applicationEventMulticaster.addApplicationListener(listener);
         listenersForTest.add(listener);
@@ -188,10 +160,4 @@ protected void multicastEvent(ApplicationEvent event) {
     protected InputStream load(String resource) {
         return SpringScenario.class.getClassLoader().getResourceAsStream(resource);
     }
-
-    protected void mockLogin() {
-        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/ZookeeperScenario.java

@@ -44,7 +44,7 @@
  * @author yang
  */
 @Log4j2
-public abstract class ZookeeperScenario extends SpringScenario {
+public abstract class ZookeeperScenario extends MockLoggedInScenario {
 
     private final HttpHeaders headers = new HttpHeaders();
 

core/src/test/java/com/flowci/core/test/agent/AgentControllerTest.java

@@ -24,6 +24,7 @@
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.domain.StatusCode;
 import com.flowci.core.common.domain.http.ResponseMessage;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.MockMvcHelper;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.exception.ErrorCode;
@@ -42,7 +43,7 @@
 /**
  * @author yang
  */
-public class AgentControllerTest extends SpringScenario {
+public class AgentControllerTest extends MockLoggedInScenario {
 
     private static final TypeReference<ResponseMessage<Agent>> AgentResponseType =
             new TypeReference<ResponseMessage<Agent>>() {
@@ -61,14 +62,6 @@ public class AgentControllerTest extends SpringScenario {
     @Autowired
     private ObjectMapper objectMapper;
 
-    @Autowired
-    private AppProperties.RabbitMQ rabbitConfig;
-
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Test
     public void should_duplicate_error_when_create_agent_with_same_name() throws Throwable {
         createAgent("same.name", null, StatusCode.OK);

core/src/test/java/com/flowci/core/test/agent/AgentHostServiceTest.java

@@ -22,11 +22,6 @@ public class AgentHostServiceTest extends ZookeeperScenario {
     @Autowired
     private AgentHostService agentHostService;
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @After
     public void cleanup() {
         for (AgentHost h : agentHostService.list()) {

core/src/test/java/com/flowci/core/test/api/OpenRestServiceTest.java

@@ -26,6 +26,7 @@
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.domain.JobOutput.ContentType;
 import com.flowci.core.job.domain.JobReport;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.core.user.domain.User;
 import org.junit.Assert;
@@ -39,7 +40,7 @@
 import java.util.List;
 import java.util.Optional;
 
-public class OpenRestServiceTest extends SpringScenario {
+public class OpenRestServiceTest extends MockLoggedInScenario {
 
     @MockBean
     private JobDao jobDao;
@@ -53,11 +54,6 @@ public class OpenRestServiceTest extends SpringScenario {
     @Autowired
     private OpenRestService openRestService;
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Test
     public void should_list_all_flow_users() {
         Flow flow = flowService.create("user-test", new CreateOption());

core/src/test/java/com/flowci/core/test/auth/AuthControllerTest.java

@@ -21,6 +21,7 @@
 import com.flowci.core.auth.service.AuthService;
 import com.flowci.core.common.domain.StatusCode;
 import com.flowci.core.common.helper.ThreadHelper;
+import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.core.user.domain.User;
 import com.flowci.core.common.domain.http.ResponseMessage;
@@ -31,11 +32,15 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 
 public class AuthControllerTest extends SpringScenario {
 
     private User user;
 
+    @Autowired
+    private SessionManager sessionManager;
+
     @Autowired
     private AuthHelper authHelper;
 
@@ -67,7 +72,7 @@ public void should_login_and_logout_successfully() throws Exception {
         Assert.assertTrue(authService.set(token));
 
         // when: request logout
-        ResponseMessage logoutMsg = authHelper.logout(token);
+        var logoutMsg = authHelper.logout(token);
         Assert.assertEquals(StatusCode.OK, logoutMsg.getCode());
 
         // then: should throw new AuthenticationException("Not logged in") exception

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

@@ -6,6 +6,7 @@
 import com.flowci.core.config.service.ConfigService;
 import com.flowci.core.secret.domain.AuthSecret;
 import com.flowci.core.secret.event.GetSecretEvent;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.domain.SimpleAuthPair;
 import org.junit.Assert;
@@ -18,19 +19,14 @@
 import static com.flowci.core.config.domain.Config.Category.SMTP;
 import static com.flowci.core.config.domain.Config.Category.TEXT;
 
-public class ConfigServiceTest extends SpringScenario {
+public class ConfigServiceTest extends MockLoggedInScenario {
 
     @MockBean
     private SpringEventManager eventManager;
 
     @Autowired
     private ConfigService configService;
 
-    @Before
-    public void init() {
-        mockLogin();
-    }
-
     @Test
     public void should_create_smtp_config_with_secret() {
         // init:

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

@@ -43,11 +43,6 @@ public class CronServiceTest extends ZookeeperScenario {
 
     private final ScheduledExecutorService service = Executors.newScheduledThreadPool(1);
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Test
     public void should_get_exec_time_from_crontab() throws InterruptedException {
         CronDefinition definition = CronDefinitionBuilder.instanceDefinitionFor(CronType.UNIX);

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

@@ -20,6 +20,7 @@
 import com.flowci.core.common.domain.http.ResponseMessage;
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.MockMvcHelper;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.core.user.domain.User;
@@ -43,7 +44,7 @@
 /**
  * @author yang
  */
-public class FlowControllerTest extends SpringScenario {
+public class FlowControllerTest extends MockLoggedInScenario {
 
     @Autowired
     private FlowMockHelper flowMockHelper;
@@ -55,7 +56,6 @@ public class FlowControllerTest extends SpringScenario {
 
     @Before
     public void createFlowWithYml() throws Exception {
-        mockLogin();
         String yml = StringHelper.toString(load("flow.yml"));
         flowMockHelper.create(flowName, yml);
     }