From da4566f82fc507cf64c9cadbf796db6442d5b4b6 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 28 Jun 2023 11:21:40 +0300 Subject: [PATCH] Fix GitHub workflow --- build.gradle | 4 +--- buildSrc/src/main/kotlin/tasks/ReportGenerateTask.kt | 5 ++++- buildSrc/src/main/kotlin/tasks/model/TestCase.kt | 10 ++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 2fb91b02..e6f0ed3e 100644 --- a/build.gradle +++ b/build.gradle @@ -69,6 +69,4 @@ dependencies { testImplementation 'io.webfolder:quickjs:1.1.0' } -tasks.register('generateTestsReport', ReportGenerateTask) { - dependsOn test -} +tasks.register('generateTestsReport', ReportGenerateTask) diff --git a/buildSrc/src/main/kotlin/tasks/ReportGenerateTask.kt b/buildSrc/src/main/kotlin/tasks/ReportGenerateTask.kt index 078fefe1..56ff8870 100644 --- a/buildSrc/src/main/kotlin/tasks/ReportGenerateTask.kt +++ b/buildSrc/src/main/kotlin/tasks/ReportGenerateTask.kt @@ -42,10 +42,13 @@ open class ReportGenerateTask : DefaultTask() { val results = LinkedHashMap>() val tests = LinkedHashSet() for (case in testSuite.testCases) { + if (!case.isValid()) { + continue + } tests.add(case.testName) val map = results.getOrPut(case.source) { LinkedHashMap() } val oldValue = map.put(case.testName, case) - check(oldValue == null) + check(oldValue == null) { "Check failed: $oldValue" } } val failPercent = (testSuite.failures.toDouble() / testSuite.tests * 100.0).roundToInt() diff --git a/buildSrc/src/main/kotlin/tasks/model/TestCase.kt b/buildSrc/src/main/kotlin/tasks/model/TestCase.kt index 3ac54c36..ce55b26a 100644 --- a/buildSrc/src/main/kotlin/tasks/model/TestCase.kt +++ b/buildSrc/src/main/kotlin/tasks/model/TestCase.kt @@ -19,14 +19,16 @@ class TestCase { var failure: Failure? = null val index by lazy { - name.split('|')[0].toInt() + name.split('|').getOrNull(0)?.toIntOrNull() ?: 0 } val testName by lazy { - name.split('|')[1] + name.split('|').getOrNull(1).orEmpty() } val source by lazy { - name.split('|')[2] + name.split('|').getOrNull(2).orEmpty() } -} \ No newline at end of file + + fun isValid() = name.count { it == '|' } == 2 +}