You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/06/21 06:12:53 UTC

[inlong] branch master updated: [INLONG-4713][Manager] Fix ut execution script error in web module (#4714)

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

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 915b97e05 [INLONG-4713][Manager] Fix ut execution script error in web module (#4714)
915b97e05 is described below

commit 915b97e05693b3be798c49a882deb19c570516fc
Author: leosanqing <st...@qq.com>
AuthorDate: Tue Jun 21 14:12:48 2022 +0800

    [INLONG-4713][Manager] Fix ut execution script error in web module (#4714)
---
 .../src/main/java/org/apache/inlong/manager/test/BaseTest.java          | 2 +-
 .../{application-test.properties => application-unit-test.properties}   | 2 +-
 .../src/main/resources/{sql => h2}/apache_inlong_manager.sql            | 0
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inlong-manager/manager-test/src/main/java/org/apache/inlong/manager/test/BaseTest.java b/inlong-manager/manager-test/src/main/java/org/apache/inlong/manager/test/BaseTest.java
index c40d047f6..ef4da25dc 100644
--- a/inlong-manager/manager-test/src/main/java/org/apache/inlong/manager/test/BaseTest.java
+++ b/inlong-manager/manager-test/src/main/java/org/apache/inlong/manager/test/BaseTest.java
@@ -30,7 +30,7 @@ import javax.sql.DataSource;
 /**
  * Class of base test.
  */
-@ActiveProfiles(value = {"test"})
+@ActiveProfiles(value = {"unit-test"})
 @EnableConfigurationProperties
 @ComponentScan(basePackages = "org.apache.inlong.manager")
 @SpringBootTest
diff --git a/inlong-manager/manager-test/src/main/resources/application-test.properties b/inlong-manager/manager-test/src/main/resources/application-unit-test.properties
similarity index 97%
rename from inlong-manager/manager-test/src/main/resources/application-test.properties
rename to inlong-manager/manager-test/src/main/resources/application-unit-test.properties
index e304a80bb..650a6dc36 100644
--- a/inlong-manager/manager-test/src/main/resources/application-test.properties
+++ b/inlong-manager/manager-test/src/main/resources/application-unit-test.properties
@@ -26,7 +26,7 @@ spring.datasource.druid.username=root
 spring.datasource.druid.password=""
 
 spring.datasource.druid.driver-class-name=org.h2.Driver
-spring.sql.init.schema-locations=classpath:sql/apache_inlong_manager.sql
+spring.sql.init.schema-locations=classpath:h2/apache_inlong_manager.sql
 
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.druid.validationQuery=SELECT 'x'
diff --git a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
similarity index 100%
rename from inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
rename to inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql