From f6ab96a40204b53d54707ad9fb82d6fc99e11ded Mon Sep 17 00:00:00 2001 From: MOTOHARU ASANUMA Date: Wed, 3 Jan 2024 16:33:23 +0900 Subject: [PATCH 1/6] Fix CaptureResultTest --- .../takahirom/roborazzi/CaptureResultTest.kt | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt b/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt index b05c5d1b..b552bae7 100644 --- a/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt +++ b/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt @@ -3,17 +3,21 @@ package io.github.takahirom.roborazzi import com.github.takahirom.roborazzi.CaptureResult import com.github.takahirom.roborazzi.CaptureResults import com.github.takahirom.roborazzi.ResultSummary -import java.io.File import org.json.JSONObject import org.junit.Assert.assertEquals import org.junit.Test +import java.io.File class CaptureResultTest { @Test fun testJsonSerialization() { - val summary = ResultSummary(10, 2, 3, 5) + val summary = ResultSummary(11, 1, 2, 3, 5) val captureResults = listOf( + CaptureResult.Recorded( + goldenFile = File("/golden_file"), + timestampNs = 123456789, + ), CaptureResult.Added( compareFile = File("/compare_file"), actualFile = File("/actual_file"), @@ -40,6 +44,7 @@ class CaptureResultTest { // Test summary assertEquals(summary.total, jsonSummary.getInt("total")) + assertEquals(summary.recorded, jsonSummary.getInt("recorded")) assertEquals(summary.added, jsonSummary.getInt("added")) assertEquals(summary.changed, jsonSummary.getInt("changed")) assertEquals(summary.unchanged, jsonSummary.getInt("unchanged")) @@ -71,12 +76,18 @@ class CaptureResultTest { val jsonString = """ { "summary": { - "total": 10, + "total": 11, + "recorded": 1, "added": 2, "changed": 3, "unchanged": 5 }, "results": [ + { + "type": "recorded", + "golden_file_path": "golden_file", + "timestamp": 123456789, + }, { "type": "added", "compare_file_path": "compare_file", @@ -104,27 +115,32 @@ class CaptureResultTest { val captureResults = compareReportResult.captureResults // Test summary - assertEquals(10, summary.total) + assertEquals(11, summary.total) + assertEquals(1, summary.recorded) assertEquals(2, summary.added) assertEquals(3, summary.changed) assertEquals(5, summary.unchanged) // Test capture results - assertEquals(3, captureResults.size) + assertEquals(4, captureResults.size) + + val recordedResult = captureResults[0] as CaptureResult.Recorded + assertEquals(File("golden_file"), recordedResult.goldenFile) + assertEquals(123456789, recordedResult.timestampNs) - val addedResult = captureResults[0] as CaptureResult.Added + val addedResult = captureResults[1] as CaptureResult.Added assertEquals(File("compare_file"), addedResult.compareFile) assertEquals(File("actual_file"), addedResult.actualFile) assertEquals(123456789, addedResult.timestampNs) - val changedResult = captureResults[1] as CaptureResult.Changed + val changedResult = captureResults[2] as CaptureResult.Changed assertEquals(File("compare_file"), changedResult.compareFile) assertEquals(File("actual_file"), changedResult.actualFile) assertEquals(File("golden_file"), changedResult.goldenFile) assertEquals(123456789, changedResult.timestampNs) - val unchangedResult = captureResults[2] as CaptureResult.Unchanged + val unchangedResult = captureResults[3] as CaptureResult.Unchanged assertEquals(File("golden_file"), unchangedResult.goldenFile) assertEquals(123456789, unchangedResult.timestampNs) } -} \ No newline at end of file +} From 6a89c8deb336f9a80fa68d43bb888570e8c9fe77 Mon Sep 17 00:00:00 2001 From: MOTOHARU ASANUMA Date: Wed, 3 Jan 2024 16:38:00 +0900 Subject: [PATCH 2/6] Remove unintentional changes --- .../kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt b/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt index b552bae7..642d4804 100644 --- a/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt +++ b/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt @@ -3,10 +3,10 @@ package io.github.takahirom.roborazzi import com.github.takahirom.roborazzi.CaptureResult import com.github.takahirom.roborazzi.CaptureResults import com.github.takahirom.roborazzi.ResultSummary +import java.io.File import org.json.JSONObject import org.junit.Assert.assertEquals import org.junit.Test -import java.io.File class CaptureResultTest { From a2abd9922f1647bc48a6a9ea8a8f98acc44a02a8 Mon Sep 17 00:00:00 2001 From: takahirom Date: Wed, 3 Jan 2024 17:16:41 +0900 Subject: [PATCH 3/6] Add test workflow --- .github/workflows/test.yaml | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 00000000..7a2a0357 --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,44 @@ +name: plain-tests + +on: + push: + branches: + - main + pull_request: + +env: + GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx6g -Dorg.gradle.daemon=false -Dkotlin.incremental=false" + +jobs: + test: + runs-on: macos-latest + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3.9.0 + with: + distribution: 'zulu' + java-version: 19 + + - name: Gradle cache + uses: gradle/gradle-build-action@v2 + + - name: tests + id: test + run: | + ./gradlew test --stacktrace + + - name: include build tests + id: include-build-test + run: | + cd include-build + ./gradlew test --stacktrace + + - uses: actions/upload-artifact@v3 + if: ${{ always() }} + with: + name: tests-reports + path: | + **/build/reports + **/build/outputs/roborazzi + retention-days: 30 From 5e634f4bad0fd82af4d8215b7959784ac51a26a8 Mon Sep 17 00:00:00 2001 From: takahirom Date: Wed, 3 Jan 2024 17:27:34 +0900 Subject: [PATCH 4/6] Exclude release tests --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7a2a0357..f8138a3c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -26,13 +26,13 @@ jobs: - name: tests id: test run: | - ./gradlew test --stacktrace + ./gradlew test --stacktrace -x testReleaseUnitTest - name: include build tests id: include-build-test run: | cd include-build - ./gradlew test --stacktrace + ./gradlew test --stacktrace -x testReleaseUnitTest - uses: actions/upload-artifact@v3 if: ${{ always() }} From 0877fb25db5bdd2d6860a15663091b780cd102c2 Mon Sep 17 00:00:00 2001 From: takahirom Date: Wed, 3 Jan 2024 17:35:52 +0900 Subject: [PATCH 5/6] Add jvmTest --- .github/workflows/test.yaml | 4 ++-- .../kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f8138a3c..f606e8e6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -26,13 +26,13 @@ jobs: - name: tests id: test run: | - ./gradlew test --stacktrace -x testReleaseUnitTest + ./gradlew test jvmTest --stacktrace -x testReleaseUnitTest - name: include build tests id: include-build-test run: | cd include-build - ./gradlew test --stacktrace -x testReleaseUnitTest + ./gradlew test jvmTest --stacktrace -x testReleaseUnitTest - uses: actions/upload-artifact@v3 if: ${{ always() }} diff --git a/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt b/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt index 642d4804..b552bae7 100644 --- a/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt +++ b/include-build/roborazzi-core/src/jvmTest/kotlin/io/github/takahirom/roborazzi/CaptureResultTest.kt @@ -3,10 +3,10 @@ package io.github.takahirom.roborazzi import com.github.takahirom.roborazzi.CaptureResult import com.github.takahirom.roborazzi.CaptureResults import com.github.takahirom.roborazzi.ResultSummary -import java.io.File import org.json.JSONObject import org.junit.Assert.assertEquals import org.junit.Test +import java.io.File class CaptureResultTest { From 89e41932deafeca57c1ca3ec5a1c01f8b814acd7 Mon Sep 17 00:00:00 2001 From: Takahiro Menju Date: Wed, 3 Jan 2024 17:57:21 +0900 Subject: [PATCH 6/6] Remove jvmTest from root task --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f606e8e6..9b566d3f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -26,7 +26,7 @@ jobs: - name: tests id: test run: | - ./gradlew test jvmTest --stacktrace -x testReleaseUnitTest + ./gradlew test --stacktrace -x testReleaseUnitTest - name: include build tests id: include-build-test