[incubator-dolphinscheduler] branch dev updated: It's to remove `static` of method dataSource, If not remove `static` the transaction will not work. (#2422)

[journey]

This is an automated email from the ASF dual-hosted git repository.

journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new c881c95  It's to remove `static` of method dataSource,If not remove 
`static` the transaction will not work. (#2422)
c881c95 is described below

commit c881c9517e4348acc53c315ea6767d5c6d86f48d
Author: lgcareer <18610854...@163.com>
AuthorDate: Wed Apr 15 10:22:02 2020 +0800

    It's to remove `static` of method dataSource,If not remove `static` the 
transaction will not work. (#2422)
    
    * It's to remove `static` of method dataSource,If not remove `static` the 
transaction will not work.
    
    * update testQueryDetailsById because it didn't run success
---
 .../dao/datasource/SpringConnectionFactory.java    |  2 +-
 .../dao/mapper/UserMapperTest.java                 | 29 ++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
index 1d6dc5f..9e27d94 100644
--- 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
+++ 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
@@ -64,7 +64,7 @@ public class SpringConnectionFactory {
      * @return druid dataSource
      */
     @Bean(destroyMethod="")
-    public static DruidDataSource dataSource() {
+    public DruidDataSource dataSource() {
 
         DruidDataSource druidDataSource = new DruidDataSource();
 
diff --git 
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
 
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
index 651ca93..7b1849e 100644
--- 
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
+++ 
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.dolphinscheduler.dao.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.dolphinscheduler.common.enums.AlertType;
 import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.dolphinscheduler.dao.entity.*;
 import org.junit.Assert;
 import org.junit.Test;
@@ -180,6 +180,23 @@ public class UserMapperTest {
     }
 
     /**
+     * insert one Tenant
+     * @return Tenant
+     */
+    private Tenant insertOneTenant(Queue queue){
+        Tenant tenant = new Tenant();
+        tenant.setTenantCode("dolphin");
+        tenant.setTenantName("dolphin test");
+        tenant.setDescription("dolphin user use");
+        tenant.setQueueId(queue.getId());
+        tenant.setQueue(queue.getQueue());
+        tenant.setCreateTime(new Date());
+        tenant.setUpdateTime(new Date());
+        tenantMapper.insert(tenant);
+        return tenant;
+    }
+
+    /**
      * insert one Queue
      * @return Queue
      */
@@ -291,11 +308,13 @@ public class UserMapperTest {
      */
     @Test
     public void testQueryDetailsById() {
-        //insertOne
-        User user = insertOne();
+        //insertOneQueue and insertOneTenant
+        Queue queue = insertOneQueue();
+        Tenant tenant = insertOneTenant(queue);
+        User user = insertOne(queue,tenant);
         //queryDetailsById
         User queryUser = userMapper.queryDetailsById(user.getId());
-        Assert.assertEquals(queryUser.getUserName(), queryUser.getUserName());
+        Assert.assertEquals(user.getUserName(), queryUser.getUserName());
     }
 
     /**