Merge pull request #873 from MarathonLabs/feature/raw_json_meta

feat(raw_json_meta): meta properties like test annotations were added…
MarathonLabs · Dec 7, 2023 · 0106217 · 0106217
2 parents b06461a + 9098656
commit 0106217
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/core/src/main/kotlin/com/malinskiy/marathon/report/raw/RawJsonReporter.kt b/core/src/main/kotlin/com/malinskiy/marathon/report/raw/RawJsonReporter.kt
@@ -14,10 +14,21 @@ class RawJsonReporter(
 
     override fun generate(executionReport: ExecutionReport) {
         val testResults = executionReport.testEvents.map {
+            val metaPropertiesList = it.testResult.test.metaProperties.map { metaProp ->
+                val valuesAsStringMap = metaProp.values.mapValues { (_, value) ->
+                    value?.toString() ?: ""
+                }
+                StringMetaProperty(
+                    name = metaProp.name,
+                    values = valuesAsStringMap
+                )
+            }
+
             RawTestRun(
                 it.testResult.test.pkg,
                 it.testResult.test.clazz,
                 it.testResult.test.method,
+                metaPropertiesList,
                 it.device.serialNumber,
                 it.testResult.status,
                 it.testResult.isIgnored,
@@ -35,11 +46,17 @@ class RawJsonReporter(
         @SerializedName("package") val pkg: String,
         @SerializedName("class") val clazz: String,
         @SerializedName("method") val method: String,
+        @SerializedName("metaProperties") val metaProperties: List<StringMetaProperty>,
         @SerializedName("deviceSerial") val deviceSerial: String,
         @SerializedName("status") val status: TestStatus,
         @SerializedName("ignored") val ignored: Boolean,
         @SerializedName("success") val success: Boolean,
         @SerializedName("timestamp") val timestamp: Long,
         @SerializedName("duration") val duration: Long
     )
+
+    data class StringMetaProperty(
+        @SerializedName("name") val name: String,
+        @SerializedName("values") val values: Map<String, String> = emptyMap()
+    )
 }
diff --git a/core/src/test/kotlin/com/malinskiy/marathon/scenario/SuccessScenariosTest.kt b/core/src/test/kotlin/com/malinskiy/marathon/scenario/SuccessScenariosTest.kt
@@ -4,11 +4,11 @@ package com.malinskiy.marathon.scenario
 
 import com.malinskiy.marathon.device.DeviceProvider
 import com.malinskiy.marathon.execution.TestStatus
+import com.malinskiy.marathon.test.MetaProperty
 import com.malinskiy.marathon.test.StubDevice
 import com.malinskiy.marathon.test.assert.shouldBeEqualToAsJson
 import com.malinskiy.marathon.test.setupMarathon
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.advanceTimeBy
@@ -18,7 +18,6 @@ import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 import org.koin.core.context.stopKoin
 import java.io.File
-import java.util.concurrent.TimeUnit
 import kotlin.time.ExperimentalTime
 import com.malinskiy.marathon.test.Test as MarathonTest
 
@@ -33,7 +32,17 @@ class SuccessScenariosTest {
         var output: File? = null
 
         val marathon = setupMarathon {
-            val test = MarathonTest("test", "SimpleTest", "test", emptySet())
+            val test = MarathonTest(
+                "test",
+                "SimpleTest",
+                "test",
+                listOf(
+                    MetaProperty(
+                        name = "someAnnotation",
+                        values = mapOf("value" to "someValue")
+                    )
+                )
+            )
             val device = StubDevice()
 
             configuration {

diff --git a/core/src/test/resources/output/raw/success_scenario_1.json b/core/src/test/resources/output/raw/success_scenario_1.json
@@ -3,11 +3,19 @@
     "package": "test",
     "class": "SimpleTest",
     "method": "test",
+    "metaProperties": [
+      {
+        "name": "someAnnotation",
+        "values": {
+          "value": "someValue"
+        }
+      }
+    ],
     "deviceSerial": "serial-1",
     "status": "PASSED",
     "ignored": false,
     "success": true,
     "timestamp": 0,
     "duration": 1
   }
-]
+]