update escheduler-dao unit test

escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java

@@ -373,7 +373,7 @@ public abstract class AbstractZKClient {
 				masterMap.putIfAbsent(server, new String(bytes));
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("get server list failed : " + e.getMessage(), e);
 		}
 
 		return masterMap;

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java

@@ -18,6 +18,7 @@ package cn.escheduler.dao.mapper;
 
 import cn.escheduler.dao.datasource.ConnectionFactory;
 import cn.escheduler.dao.model.AccessToken;
+import cn.escheduler.dao.model.User;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -60,4 +61,6 @@ public class AccessTokenMapperTest {
     }
 
 
+
+
 }

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/CommandMapperTest.java

@@ -24,12 +24,13 @@ import cn.escheduler.dao.datasource.ConnectionFactory;
 import cn.escheduler.dao.model.Command;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
 
-@Ignore
+/**
+ * command test
+ */
 public class CommandMapperTest {
 
     CommandMapper commandMapper;

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/MasterServerMapperTest.java

@@ -16,11 +16,11 @@
  */
 package cn.escheduler.dao.mapper;
 
+import cn.escheduler.common.utils.OSUtils;
 import cn.escheduler.dao.datasource.ConnectionFactory;
 import cn.escheduler.common.model.MasterServer;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -28,7 +28,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import java.util.Date;
 import java.util.List;
 
-@Ignore
 @SpringBootTest
 public class MasterServerMapperTest {
 
@@ -37,26 +36,29 @@ public class MasterServerMapperTest {
 
     @Before
     public void before(){
-        masterServerMapper =ConnectionFactory.getSqlSession().getMapper(MasterServerMapper.class);
+        masterServerMapper = ConnectionFactory.getSqlSession().getMapper(MasterServerMapper.class);
     }
 
     @Test
     public void queryAllMaster() {
 
         MasterServer masterServer = new MasterServer();
-        String host = "127.22.2.1";
+        String host = OSUtils.getHost();
         masterServer.setHost(host);
         masterServer.setLastHeartbeatTime(new Date());
         masterServer.setPort(19282);
         masterServer.setCreateTime(new Date());
-        masterServer.setZkDirectory("/root");
+        masterServer.setZkDirectory("/escheduler/masters/" + host + "_0000000001");
 
         masterServerMapper.insert(masterServer);
         Assert.assertNotEquals(masterServer.getId(), 0);
 
+
         masterServer.setPort(12892);
         int update = masterServerMapper.update(masterServer);
         Assert.assertEquals(update, 1);
+
+
         List<MasterServer> masterServers = masterServerMapper.queryAllMaster();
 
         MasterServer findMaster = null;

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperTest.java

@@ -21,13 +21,11 @@ import cn.escheduler.dao.datasource.ConnectionFactory;
 import cn.escheduler.dao.model.ProcessDefinition;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Date;
 import java.util.List;
 
-@Ignore
 public class ProcessDefinitionMapperTest {
 
 

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java

@@ -20,13 +20,11 @@ import cn.escheduler.dao.datasource.ConnectionFactory;
 import cn.escheduler.dao.model.Tenant;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 
-@Ignore
 public class TenantMapperTest {
 
 
@@ -42,18 +40,22 @@ public class TenantMapperTest {
     public void testMapper(){
 
         Tenant tenant = new Tenant();
-        tenant.setTenantName("大数据平台部");
+        tenant.setTenantName("bigdata");
         tenant.setQueueId(1);
         tenant.setCreateTime(new Date());
         tenant.setUpdateTime(new Date());
         tenantMapper.insert(tenant);
         Assert.assertNotEquals(tenant.getId(), 0);
-        tenant.setTenantName("大数据平台部test");
+
+
+        tenant.setTenantName("bigdata-test");
         int update = tenantMapper.update(tenant);
         Assert.assertEquals(update, 1);
 
+
         tenant = tenantMapper.queryById(tenant.getId());
-        Assert.assertEquals(tenant.getTenantName(), "大数据平台部test");
+        Assert.assertEquals(tenant.getTenantName(), "bigdata-test");
+
 
         int delete = tenantMapper.deleteById(tenant.getId());
         Assert.assertEquals(delete, 1);

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UdfFuncMapperTest.java

@@ -20,14 +20,12 @@ import cn.escheduler.dao.datasource.ConnectionFactory;
 import cn.escheduler.dao.model.Resource;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
-@Ignore
 public class UdfFuncMapperTest {
 
     private final Logger logger = LoggerFactory.getLogger(UdfFuncMapperTest.class);
@@ -53,10 +51,14 @@ public class UdfFuncMapperTest {
         resource.setUpdateTime(new Date());
         resourceMapper.insert(resource);
         Assert.assertNotEquals(resource.getId(), 0);
+
+
         resource.setAlias("aa123");
         resourceMapper.update(resource);
         resource = resourceMapper.queryResourceById(resource.getId());
         Assert.assertEquals(resource.getAlias(), "aa123");
+
+
         int delete = resourceMapper.delete(resource.getId());
         Assert.assertEquals(delete, 1);
     }

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserAlertGroupMapperTest.java

@@ -20,13 +20,11 @@ import cn.escheduler.dao.datasource.ConnectionFactory;
 import cn.escheduler.dao.model.UserAlertGroup;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 
-@Ignore
 public class UserAlertGroupMapperTest {
 
 
@@ -47,12 +45,10 @@ public class UserAlertGroupMapperTest {
         userAlertGroup.setUpdateTime(new Date());
         userAlertGroupMapper.insert(userAlertGroup);
         Assert.assertNotEquals(userAlertGroup.getId(), 0);
-        int delete = userAlertGroupMapper.deleteByAlertgroupId(userAlertGroup.getAlertgroupId());
-        Assert.assertEquals(delete, 1);
-
-
 
 
+        int delete = userAlertGroupMapper.deleteByAlertgroupId(userAlertGroup.getAlertgroupId());
+        Assert.assertEquals(delete, 1);
     }
 
 

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java

@@ -18,29 +18,35 @@ package cn.escheduler.dao.mapper;
 
 import cn.escheduler.common.enums.UserType;
 import cn.escheduler.dao.datasource.ConnectionFactory;
+import cn.escheduler.dao.model.AccessToken;
 import cn.escheduler.dao.model.User;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Date;
+import java.util.Random;
 
-@Ignore
+/**
+ * user test
+ */
 public class UserMapperTest {
 
 
     UserMapper userMapper;
+    AccessTokenMapper accessTokenMapper;
+    int userId;
 
     @Before
     public void before(){
         userMapper = ConnectionFactory.getSqlSession().getMapper(UserMapper.class);
+        accessTokenMapper = ConnectionFactory.getSqlSession().getMapper(AccessTokenMapper.class);
     }
 
     @Test
     public void testInsert(){
         User user = new User();
-        user.setUserName("Dr.strange");
+        user.setUserName("Dr.strange" + new Date().getTime());
         user.setUserPassword("1234567890");
         user.setEmail("wwww@123.com");
         user.setPhone("12345678901");
@@ -51,32 +57,40 @@ public class UserMapperTest {
         userMapper.insert(user);
         Assert.assertNotEquals(user.getId(), 0);
 
-        user.setUserName("Dr.chemistry");
+        user.setUserName("Dr.chemistry" + new Random().nextInt(10));
         int update = userMapper.update(user);
         Assert.assertEquals(update, 1);
+
+
         user = userMapper.queryById(user.getId());
-        Assert.assertEquals(user.getUserName(), "Dr.chemistry");
-        int delete = userMapper.delete(user.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertNotEquals(user.getUserName(), "Dr.chemistry" + new Date().getTime());
+
+        AccessToken accessToken = new AccessToken();
+        accessToken.setUserId(user.getId());
+        accessToken.setExpireTime(new Date());
+        accessToken.setToken("ssssssssssssssssssssssssss");
+        accessToken.setCreateTime(new Date());
+        accessToken.setUpdateTime(new Date());
+        accessTokenMapper.insert(accessToken);
+
+        userId = user.getId();
 
+
+        User user2 = userMapper.queryUserByToken("ssssssssssssssssssssssssss");
+        Assert.assertTrue(user2.getId() >= 0);
     }
 
+
     @Test
     public void queryQueueByProcessInstanceId(){
-        String queue = userMapper.queryQueueByProcessInstanceId(41388);
-        Assert.assertEquals(queue, "ait");
+        String queue = userMapper.queryQueueByProcessInstanceId(-1000);
+        Assert.assertNotEquals(queue, "ait");
     }
 
-    @Test
-    public void testQueryUserByToken(){
-        User user = userMapper.queryUserByToken("ad9e8fccfc11bd18bb45aa994568b8ef");
-        Assert.assertEquals(user.getUserName(), "qiaozhanwei");
-    }
 
     @Test
-    public void test(){
-        User user = userMapper.queryDetailsById(19);
-        System.out.println(user);
+    public void testDelete() {
+        int delete = userMapper.delete(userId);
+        Assert.assertTrue(delete >= 0);
     }
-
 }