Merge pull request #529 from qiniu/tests/split-integration-and-unit-tests

分割单元测试用例和集成测试用例，Github Action 只执行单元存储用例

Author: xwen-winnie

.github/workflows/ci-test.yml

@@ -1,39 +1,32 @@
 name: Java CI with Gradle
-
 on:
   push:
     paths-ignore:
       - '**.md'
-
+  pull_request:
+    paths-ignore:
+      - '**.md'
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      max-parallel: 1
+      matrix:
+        java_version: ['8', '11']
     steps:
       - name: checkout
         uses: actions/checkout@v2
-
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
-
+          java-version: ${{ matrix.java_version }}
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-
-      - name: Build with Gradle
-        env:
-          QINIU_ACCESS_KEY: ${{ secrets.QINIU_ACCESS_KEY }}
-          QINIU_LINKING_APPID: ${{ secrets.QINIU_LINKING_APPID }}
-          QINIU_SECRET_KEY: ${{ secrets.QINIU_SECRET_KEY }}
-          QINIU_TEST_ENV: travis
+      - name: Unit Test
         run: |
-          ./gradlew build --stacktrace --info
-          ./gradlew test -d
-          ./gradlew jacocoTestReport
-
-      - name: Upload coverage to Codecov
-        uses: codecov/[email protected]
-        with:
-          token: ${{secrets.CODECOV_TOKEN}}
-          file: build/reports/jacoco/test/jacocoTestReport.xml
+          ./gradlew unitTest -d

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,48 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

build.gradle

@@ -23,9 +23,19 @@ dependencies {
     implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.14.4'
     implementation 'com.google.code.gson:gson:2.8.5'
     testImplementation group: 'com.qiniu', name: 'happy-dns-java', version: '0.1.6'
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
 }
 
+test {
+    useJUnitPlatform()
+}
+
+task unitTest(type: Test) {
+    useJUnitPlatform {
+        includeTags 'UnitTest'
+    }
+}
 
 task getHomeDir {
     doLast {

src/test/java/com/qiniu/common/AutoZoneTest.java

@@ -1,37 +1,35 @@
 package com.qiniu.common;
 
-import junit.framework.TestCase;
-import org.junit.Assert;
-import org.junit.Test;
 import test.com.qiniu.TestConfig;
 
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Created by Simon on 6/22/16.
  */
-public class AutoZoneTest extends TestCase {
+public class AutoZoneTest {
 
     @Test
+    @Tag("IntegrationTest")
     public void testHttp() {
         Map<String, String[]> cases = new HashMap<String, String[]>();
         cases.put(TestConfig.testBucket_z0,
-                new String[]{"http://up.qiniu.com",
-                        "http://upload.qiniu.com",
-                        "https://up.qbox.me"});
+                new String[] { "http://up.qiniu.com", "http://upload.qiniu.com", "https://up.qbox.me" });
         cases.put(TestConfig.testBucket_na0,
-                new String[]{"http://up-na0.qiniu.com",
-                        "http://upload-na0.qiniu.com",
-                        "https://up-na0.qbox.me"});
+                new String[] { "http://up-na0.qiniu.com", "http://upload-na0.qiniu.com", "https://up-na0.qbox.me" });
 
         for (Map.Entry<String, String[]> entry : cases.entrySet()) {
             String bucket = entry.getKey();
             String[] domains = entry.getValue();
             try {
                 AutoZone zone = AutoZone.instance;
-                AutoZone.ZoneInfo zoneInfo = zone.queryZoneInfo(TestConfig.testAccessKey,
-                        bucket);
+                AutoZone.ZoneInfo zoneInfo = zone.queryZoneInfo(TestConfig.testAccessKey, bucket);
                 assertEquals(zoneInfo.upHttp, domains[0]);
                 assertEquals(zoneInfo.upBackupHttp, domains[1]);
                 assertEquals(zoneInfo.upHttps, domains[2]);
@@ -42,24 +40,27 @@ public void testHttp() {
     }
 
     @Test
+    @Tag("IntegrationTest")
     public void testHttpFail() {
         try {
             AutoZone zone = AutoZone.instance;
             zone.queryZoneInfo(TestConfig.dummyAccessKey, TestConfig.dummyBucket);
-            Assert.fail();
+            fail();
         } catch (QiniuException e) {
-            Assert.assertEquals(e.code(), 612);
+            assertEquals(e.code(), 612);
         }
     }
 
     @Test
+    @Tag("UnitTest")
     public void testSplitE() {
         String s1 = "bkt:key";
         String s2 = "bkt";
-        Assert.assertEquals(s1.split(":")[0], s2.split(":")[0]);
+        assertEquals(s1.split(":")[0], s2.split(":")[0]);
     }
 
     @Test
+    @Tag("IntegrationTest")
     public void testC1() {
         try {
             AutoZone.ZoneInfo info = AutoZone.instance.queryZoneInfo(TestConfig.testAccessKey,
@@ -68,17 +69,18 @@ public void testC1() {
 
             AutoZone.ZoneInfo info2 = AutoZone.instance.queryZoneInfo(TestConfig.testAccessKey,
                     TestConfig.testBucket_z0);
-            Assert.assertSame(info, info2);
+            assertSame(info, info2);
 
         } catch (QiniuException e) {
             fail(e.response.toString());
         }
     }
 
     @Test
+    @Tag("UnitTest")
     public void testZ() {
         Zone z1 = new Zone.Builder(Zone.zone0()).upHttp("http://uphttp").build();
-        Assert.assertSame(z1.getUpHttp(null), "http://uphttp");
-        Assert.assertSame(Zone.zone0().getUpHttp(null), "http://upload.qiniup.com");
+        assertSame(z1.getUpHttp(null), "http://uphttp");
+        assertSame(Zone.zone0().getUpHttp(null), "http://upload.qiniup.com");
     }
 }