Fix unit test errors

WeDataSphere · Sep 20, 2024 · c19441c · c19441c
1 parent c66dbd2
commit c19441c
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 81 deletions.
diff --git a/...nance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties b/...nance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties
@@ -18,19 +18,13 @@
 #h2 database config
 spring.datasource.driver-class-name=org.h2.Driver
 #init
-spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql'
+spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
 spring.datasource.username=sa
 spring.datasource.password=
-spring.datasource.hikari.connection-test-query=select 1
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.validation-timeout=3000
-spring.datasource.hikari.pool-name=linkis-test
-spring.datasource.hikari.maximum-pool-size=50
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.leak-detection-threshold=0
-spring.datasource.hikari.initialization-fail-timeout=1
+spring.sql.init.schema-locations=classpath:create.sql
+springfox.documentation.enabled=false
+springfox.documentation.auto-startup=false
+springfox.documentation.swagger-ui.enabled=false
 
 mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl

diff --git a/linkis-public-enhancements/linkis-bml-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-bml-server/src/test/resources/application.properties
@@ -22,6 +22,9 @@ spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_
 spring.datasource.username=sa
 spring.datasource.password=
 spring.sql.init.schema-locations=classpath:create.sql
+springfox.documentation.enabled=false
+springfox.documentation.auto-startup=false
+springfox.documentation.swagger-ui.enabled=false
 
 spring.datasource.hikari.connection-test-query=select 1
 spring.datasource.hikari.minimum-idle=5
@@ -42,6 +45,3 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 spring.cloud.service-registry.auto-registration.enabled=false
 eureka.client.enabled=false
 eureka.client.serviceUrl.registerWithEureka=false
-springfox.documentation.enabled=false
-springfox.documentation.auto-startup=false
-springfox.documentation.swagger-ui.enabled=false
diff --git a/linkis-public-enhancements/linkis-configuration/src/test/resources/application.properties b/linkis-public-enhancements/linkis-configuration/src/test/resources/application.properties
@@ -34,22 +34,16 @@ wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configur
 #logging.file=./test.log
 #debug=true
 
+#h2 database config
 spring.datasource.driver-class-name=org.h2.Driver
+#init
 spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-spring.datasource.schema=classpath:create.sql
-spring.datasource.data=classpath:data.sql
 spring.datasource.username=sa
 spring.datasource.password=
-spring.datasource.hikari.connection-test-query=select 1
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.validation-timeout=3000
-spring.datasource.hikari.pool-name=linkis-test
-spring.datasource.hikari.maximum-pool-size=50
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.leak-detection-threshold=0
-spring.datasource.hikari.initialization-fail-timeout=1
+spring.sql.init.schema-locations=classpath:create.sql
+springfox.documentation.enabled=false
+springfox.documentation.auto-startup=false
+springfox.documentation.swagger-ui.enabled=false
 
 spring.main.web-application-type=servlet
 server.port=1234

diff --git a/linkis-public-enhancements/linkis-cs-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-cs-server/src/test/resources/application.properties
@@ -30,20 +30,16 @@ wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configur
 #logging.file=./test.log
 #debug=true
 
+#h2 database config
 spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql'
+#init
+spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
 spring.datasource.username=sa
 spring.datasource.password=
-spring.datasource.hikari.connection-test-query=select 1
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.validation-timeout=3000
-spring.datasource.hikari.pool-name=linkis-test
-spring.datasource.hikari.maximum-pool-size=50
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.leak-detection-threshold=0
-spring.datasource.hikari.initialization-fail-timeout=1
+spring.sql.init.schema-locations=classpath:create.sql
+springfox.documentation.enabled=false
+springfox.documentation.auto-startup=false
+springfox.documentation.swagger-ui.enabled=false
 
 spring.main.web-application-type=servlet
 server.port=1234

diff --git a/...kis-datasource/linkis-datasource-manager/server/src/test/resources/application.properties b/...kis-datasource/linkis-datasource-manager/server/src/test/resources/application.properties
@@ -18,15 +18,13 @@
 #h2 database config
 spring.datasource.driver-class-name=org.h2.Driver
 #init
-spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;
-#spring.datasource.url=jdbc:h2:mem:testPgDb;MODE=PostgreSQL;IGNORECASE=TRUE;DATABASE_TO_LOWER=TRUE;
+spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
 spring.datasource.username=sa
 spring.datasource.password=
 spring.sql.init.schema-locations=classpath:create.sql
 springfox.documentation.enabled=false
 springfox.documentation.auto-startup=false
 springfox.documentation.swagger-ui.enabled=false
-#spring.datasource.schema=classpath:create_pg.sql
 
 
 mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml

diff --git a/...-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties b/...-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties
@@ -30,7 +30,9 @@ wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configur
 #logging.file=./test.log
 #debug=true
 
+#h2 database config
 spring.datasource.driver-class-name=org.h2.Driver
+#init
 spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
 spring.datasource.username=sa
 spring.datasource.password=

diff --git a/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties b/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties
@@ -30,20 +30,16 @@ wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configur
 #logging.file=./test.log
 #debug=true
 
+#h2 database config
 spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql'
+#init
+spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
 spring.datasource.username=sa
 spring.datasource.password=
-spring.datasource.hikari.connection-test-query=select 1
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.validation-timeout=3000
-spring.datasource.hikari.pool-name=linkis-test
-spring.datasource.hikari.maximum-pool-size=50
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.leak-detection-threshold=0
-spring.datasource.hikari.initialization-fail-timeout=1
+spring.sql.init.schema-locations=classpath:create.sql
+springfox.documentation.enabled=false
+springfox.documentation.auto-startup=false
+springfox.documentation.swagger-ui.enabled=false
 
 spring.main.web-application-type=servlet
 server.port=1234
@@ -57,6 +53,3 @@ eureka.client.serviceUrl.registerWithEureka=false
 mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
 mybatis-plus.type-aliases-package=org.apache.linkis.jobhistory.entity
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-springfox.documentation.enabled=false
-springfox.documentation.auto-startup=false
-springfox.documentation.swagger-ui.enabled=false
diff --git a/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties b/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties
@@ -30,22 +30,16 @@ wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configur
 #logging.file=./test.log
 #debug=true
 
+#h2 database config
 spring.datasource.driver-class-name=org.h2.Driver
+#init
 spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-spring.datasource.schema=classpath:create.sql
-spring.datasource.data=classpath:data.sql
 spring.datasource.username=sa
 spring.datasource.password=
-spring.datasource.hikari.connection-test-query=select 1
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.validation-timeout=3000
-spring.datasource.hikari.pool-name=linkis-test
-spring.datasource.hikari.maximum-pool-size=50
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.leak-detection-threshold=0
-spring.datasource.hikari.initialization-fail-timeout=1
+spring.sql.init.schema-locations=classpath:create.sql
+springfox.documentation.enabled=false
+springfox.documentation.auto-startup=false
+springfox.documentation.swagger-ui.enabled=false
 
 spring.main.web-application-type=servlet
 server.port=1234

diff --git a/linkis-public-enhancements/linkis-udf-service/src/test/resources/application.properties b/linkis-public-enhancements/linkis-udf-service/src/test/resources/application.properties
@@ -30,22 +30,16 @@ wds.linkis.login_encrypt.enable=false
 #logging.file=./test.log
 #debug=true
 
-ng.datasource.driver-class-name=org.h2.Driver
+#h2 database config
+spring.datasource.driver-class-name=org.h2.Driver
+#init
 spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-spring.datasource.schema=classpath:create.sql
-spring.datasource.data=classpath:data.sql
 spring.datasource.username=sa
 spring.datasource.password=
-spring.datasource.hikari.connection-test-query=select 1
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.validation-timeout=3000
-spring.datasource.hikari.pool-name=linkis-test
-spring.datasource.hikari.maximum-pool-size=50
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.leak-detection-threshold=0
-spring.datasource.hikari.initialization-fail-timeout=1
+spring.sql.init.schema-locations=classpath:create.sql
+springfox.documentation.enabled=false
+springfox.documentation.auto-startup=false
+springfox.documentation.swagger-ui.enabled=false
 
 spring.main.web-application-type=servlet
 server.port=1234

diff --git a/...s-service-gateway/linkis-gateway-authentication/src/test/resources/application.properties b/...s-service-gateway/linkis-gateway-authentication/src/test/resources/application.properties
@@ -30,17 +30,20 @@ wds.linkis.login_encrypt.enable=false
 #logging.file=./test.log
 #debug=true
 
+#h2 database config
 spring.datasource.driver-class-name=org.h2.Driver
+#init
 spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
+spring.datasource.username=sa
+spring.datasource.password=
 spring.sql.init.schema-locations=classpath:create.sql
 springfox.documentation.enabled=false
 springfox.documentation.auto-startup=false
 springfox.documentation.swagger-ui.enabled=false
+
 #pgtest
 #spring.datasource.url=jdbc:h2:mem:testPgDb;MODE=PostgreSQL;IGNORECASE=TRUE;DATABASE_TO_LOWER=TRUE;
 #spring.datasource.schema=classpath:create_pg.sql
-spring.datasource.username=sa
-spring.datasource.password=
 
 spring.main.web-application-type=servlet
 server.port=1234