refactor(unit-test): refact unit test cases (#139) (#141)

* refactor(unit-test): refact unit-test cases * refactor(unit-test): refact unit-test cases * refactor(unit-test): refact unit test cases * Revert "fix(unit-test): read properties from .env and system environment variables (#89)" This reverts commit 7bc60b5 * refactor(unit-test): rename properties * refactor(unit-test): rename properties * refactor(unit-test): rename properties * refactor(unit-test): refact unit test cases * refactor(unit-test): rerun github actions
oceanbase · Sep 5, 2023 · 5ba1594 · 5ba1594
1 parent c36b873
commit 5ba1594
Show file tree

Hide file tree

Showing 21 changed files with 10 additions and 928 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,4 @@ lib/odc-*.jar
 .mvn/
 maven/
 venv/
+**/local-unit-test.properties
diff --git a/.secignore b/.secignore
@@ -88,34 +88,21 @@
 --------------------------------------------------------
 # Should use GLOB wildcard to configure and analysis the ignored folder
 # The root patch should start with '/'
-/test-script/**
-/script/functions.sh
-/builds/**
-/server/integration-test/**
-/server/odc-common/src/test/resources/resource/**
-/server/odc-common/target/**
 /client/**
 /log/**
 /log/async/**
 /log/data-mocker/**
 /logs/**
 /data/**
 /maven/**
-/.antcode/**
 /.idea/**
 /.git/**
-/README.md
 /.gitmodules
 /.gitemplate
 /.secignore
-/build_daily_aci.yml
-/build_release_aci.yml
 /secretScanResult
 /server/integration-test/src/test/resources/ssl/ca.pem
-/libs/ob-sql-parser/README.md
 /libs/ob-sql-parser/src/main/resources/**
-/README-zh-CN.md
-/docs/**
 /server/integration-test/src/test/java/com/oceanbase/odc/service/connection/DefaultCertificateStorageTest.java
 --------------------------------------------------------
 # Set the ignored fold to escape the Chinese scan by GLOB wildcard

diff --git a/builds/unit-test.properties b/builds/unit-test.properties
diff --git a/libs/db-browser/src/test/java/com/oceanbase/tools/dbbrowser/env/BasePropertiesEnv.java b/libs/db-browser/src/test/java/com/oceanbase/tools/dbbrowser/env/BasePropertiesEnv.java
@@ -46,7 +46,7 @@
 @Slf4j
 public abstract class BasePropertiesEnv {
 
-    private static final String TEST_CONFIG_FILE = "../../builds/unit-test.properties";
+    private static final String TEST_CONFIG_FILE = "../../local-unit-test.properties";
     private static final String ENCRYPTED_PREFIX = "ENC@";
     private static final Properties PROPERTIES = new Properties();
 

diff --git a/server/integration-test/src/test/java/com/oceanbase/odc/ITConfigurations.java b/server/integration-test/src/test/java/com/oceanbase/odc/ITConfigurations.java
diff --git a/...ation-test/src/test/java/com/oceanbase/odc/service/cloud/AWSSecurityTokenServiceTest.java b/...ation-test/src/test/java/com/oceanbase/odc/service/cloud/AWSSecurityTokenServiceTest.java
diff --git a/...t/src/test/java/com/oceanbase/odc/service/cloud/AlibabaCloudSecurityTokenServiceTest.java b/...t/src/test/java/com/oceanbase/odc/service/cloud/AlibabaCloudSecurityTokenServiceTest.java
diff --git a/...gration-test/src/test/java/com/oceanbase/odc/service/cloud/OSSObjcetStorageServiceIT.java b/...gration-test/src/test/java/com/oceanbase/odc/service/cloud/OSSObjcetStorageServiceIT.java