Generate proper JSON to display screenshots with titles. (#78)

gojuno · Jun 29, 2017 · 388bf9f · 388bf9f
1 parent 23c5851
commit 388bf9f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ gradle/local.properties
 node_modules/
 npm-debug.log*
 test/
+composer/src/main/resources/html-report/
diff --git a/composer/src/main/kotlin/com/gojuno/composer/html/HtmlFullTest.kt b/composer/src/main/kotlin/com/gojuno/composer/html/HtmlFullTest.kt
@@ -27,7 +27,7 @@ data class HtmlFullTest(
 
         @SerializedName("status")
         val status: Status,
-        
+
         @SerializedName("stacktrace")
         val stacktrace: String?,
 
@@ -43,8 +43,8 @@ data class HtmlFullTest(
         @SerializedName("file_paths")
         val filePaths: List<String>,
 
-        @SerializedName("screenshots_paths")
-        val screenshotsPaths: List<String>
+        @SerializedName("screenshots")
+        val screenshots: List<Screenshot>
 ) {
     enum class Status {
 
@@ -57,6 +57,15 @@ data class HtmlFullTest(
         @SerializedName("ignored")
         Ignored
     }
+
+    data class Screenshot(
+
+            @SerializedName("path")
+            val path: String,
+
+            @SerializedName("title")
+            val title: String
+    )
 }
 
 fun AdbDeviceTest.toHtmlFullTest(suiteId: String, htmlReportDir: File) = HtmlFullTest(
@@ -78,5 +87,10 @@ fun AdbDeviceTest.toHtmlFullTest(suiteId: String, htmlReportDir: File) = HtmlFul
         deviceId = adbDevice.id,
         properties = emptyMap(), // TODO: add properties support.
         filePaths = files.map { it.relativePathTo(htmlReportDir) },
-        screenshotsPaths = screenshots.map { it.relativePathTo(htmlReportDir) }
+        screenshots = screenshots.map {
+            HtmlFullTest.Screenshot(
+                    path = it.relativePathTo(htmlReportDir),
+                    title = it.nameWithoutExtension
+            )
+        }
 )
diff --git a/composer/src/test/kotlin/com/gojuno/composer/html/HtmlFullTestSpec.kt b/composer/src/test/kotlin/com/gojuno/composer/html/HtmlFullTestSpec.kt
@@ -37,7 +37,7 @@ class HtmlFullTestSpec : Spek({
                     stacktrace = null,
                     logcatPath = adbDeviceTest.logcat.name,
                     filePaths = adbDeviceTest.files.map { it.name },
-                    screenshotsPaths = adbDeviceTest.screenshots.map { it.name },
+                    screenshots = adbDeviceTest.screenshots.map { HtmlFullTest.Screenshot(path = it.name, title = it.nameWithoutExtension) },
                     deviceId = adbDeviceTest.adbDevice.id,
                     properties = emptyMap()
             ))

diff --git a/composer/src/test/kotlin/com/gojuno/composer/html/HtmlReportSpec.kt b/composer/src/test/kotlin/com/gojuno/composer/html/HtmlReportSpec.kt
@@ -154,7 +154,7 @@ class HtmlReportSpec : Spek({
                                 <title>Composer</title>
                                 <link href="../../../app.min.css" rel="stylesheet">
                                 <script>
-                                  window.test = {"suite_id":"0","package_name":"com.gojuno.example1","class_name":"TestClass","name":"test1","id":"com.gojuno.example1TestClasstest1","duration_millis":1234,"status":"passed","logcat_path":"../../../com.gojuno.example1.TestClass/test1.logcat","deviceId":"device1","properties":{},"file_paths":["../../../com.gojuno.example1.TestClass.test1/file1","../../../com.gojuno.example1.TestClass.test1/file2"],"screenshots_paths":["../../../com.gojuno.example1.TestClass.test1/screenshot1","../../../com.gojuno.example1.TestClass.test1/screenshot2"]}
+                                  window.test = {"suite_id":"0","package_name":"com.gojuno.example1","class_name":"TestClass","name":"test1","id":"com.gojuno.example1TestClasstest1","duration_millis":1234,"status":"passed","logcat_path":"../../../com.gojuno.example1.TestClass/test1.logcat","deviceId":"device1","properties":{},"file_paths":["../../../com.gojuno.example1.TestClass.test1/file1","../../../com.gojuno.example1.TestClass.test1/file2"],"screenshots":[{"path":"../../../com.gojuno.example1.TestClass.test1/screenshot1","title":"screenshot1"},{"path":"../../../com.gojuno.example1.TestClass.test1/screenshot2","title":"screenshot2"}]}
                                   // window.mainData / window.suite / window.test={ json }
                                 </script>
                               </head>
@@ -180,7 +180,7 @@ class HtmlReportSpec : Spek({
                                 <title>Composer</title>
                                 <link href="../../../app.min.css" rel="stylesheet">
                                 <script>
-                                  window.test = {"suite_id":"0","package_name":"com.gojuno.example1","class_name":"TestClass","name":"test2","id":"com.gojuno.example1TestClasstest2","duration_millis":1234,"status":"failed","stacktrace":"abc","logcat_path":"../../../com.gojuno.example1.TestClass/test2.logcat","deviceId":"device1","properties":{},"file_paths":["../../../com.gojuno.example1.TestClass.test2/file1","../../../com.gojuno.example1.TestClass.test2/file2"],"screenshots_paths":["../../../com.gojuno.example1.TestClass.test2/screenshot1","../../../com.gojuno.example1.TestClass.test2/screenshot2"]}
+                                  window.test = {"suite_id":"0","package_name":"com.gojuno.example1","class_name":"TestClass","name":"test2","id":"com.gojuno.example1TestClasstest2","duration_millis":1234,"status":"failed","stacktrace":"abc","logcat_path":"../../../com.gojuno.example1.TestClass/test2.logcat","deviceId":"device1","properties":{},"file_paths":["../../../com.gojuno.example1.TestClass.test2/file1","../../../com.gojuno.example1.TestClass.test2/file2"],"screenshots":[{"path":"../../../com.gojuno.example1.TestClass.test2/screenshot1","title":"screenshot1"},{"path":"../../../com.gojuno.example1.TestClass.test2/screenshot2","title":"screenshot2"}]}
                                   // window.mainData / window.suite / window.test={ json }
                                 </script>
                               </head>

diff --git a/composer/src/test/kotlin/com/gojuno/composer/html/HtmlShortTestSpec.kt b/composer/src/test/kotlin/com/gojuno/composer/html/HtmlShortTestSpec.kt
@@ -20,7 +20,7 @@ class HtmlShortTestSpec : Spek({
                     stacktrace = null,
                     logcatPath = "testLogcatPath",
                     filePaths = listOf("testFilePath1", "testFilePath2"),
-                    screenshotsPaths = listOf("testScreenshotPath1", "testScreenshotPath2"),
+                    screenshots = listOf(HtmlFullTest.Screenshot(path = "testScreenshotPath1", title = "testScreenshot1"), HtmlFullTest.Screenshot(path = "testScreenshotPath2", title = "testScreenshot2")),
                     deviceId = "test-device-id",
                     properties = mapOf("key1" to "value1", "key2" to "value2")
             )