improve test feedback

Author: HighKo

kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/field/SdkJiraField.kt

@@ -190,9 +190,12 @@ private fun IssueInputParameters.setIssueType(field: JiraIssueTypeNameField) {
 private fun JiraCustomField.customField(): CustomField {
     val fields = customFieldManager.getCustomFieldObjectsByName(customFieldName)
     when {
-        fields.isEmpty() -> throw IllegalArgumentException("Field name is unknown")
-        fields.size > 1 -> throw IllegalArgumentException("Field name is not unique")
-        else -> return fields.firstOrNull()!!
+        fields.isEmpty() ->
+            throw IllegalArgumentException("Field '$customFieldName' is unknown")
+        fields.size > 1 ->
+            throw IllegalArgumentException("Field '$customFieldName' is not unique")
+        else ->
+            return fields.firstOrNull()!!
     }
 }
 

kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/util/EitherExtension.kt

@@ -79,7 +79,7 @@ inline fun <B> Either.Companion.catchJiraClientError(
 ): Either<JiraClientError, B> = catch(f).mapLeft {
     JiraClientError(
         error = error ?: "Jira-Fehler",
-        message = message ?: it.message ?: "-",
+        message = message ?: it.localizedMessage ?: it.message ?: "-",
         stacktrace = it.stackTraceToString(),
         500
     )

kotlin-jira-client/kotlin-jira-client-test-base/src/main/kotlin/com/linkedplanet/kotlinjiraclient/JiraIssueOperatorTest.kt

@@ -39,13 +39,13 @@ interface JiraIssueOperatorTest<JiraFieldType> : BaseTestConfigProvider<JiraFiel
     @Test
     fun issues_01DeleteAllIssuesAndCreateTenTestIssues() {
         runBlocking {
-            val result = either {
+            either {
                 val existingIssueIds = issueOperator.getIssuesByJQL("") { jsonObject, _ ->
                     Either.Right(jsonObject.getAsJsonPrimitive("key").asString)
                 }
 
                 existingIssueIds.orFail().forEach {
-                    issueOperator.deleteIssue(it)
+                    issueOperator.deleteIssue(it).orFail()
                 }
 
                 (1..10).forEach { searchedKeyIndex ->
@@ -62,8 +62,7 @@ interface JiraIssueOperatorTest<JiraFieldType> : BaseTestConfigProvider<JiraFiel
                         fields
                     ).bind()
                 }
-            }
-            assertThat(result is Either.Right, equalTo(true))
+            }.orFail()
         }
     }
 

kotlin-jira-client/kotlin-jira-client-test-base/src/main/kotlin/com/linkedplanet/kotlinjiraclient/util/AssertionExtensions.kt

@@ -25,14 +25,16 @@ import junit.framework.TestCase
 
 internal fun <R> Either<JiraClientError, R?>.orFail(): R {
     this.mapLeft {
-        TestCase.fail("Unexpected JiraClientError: ${it.error} - ${it.message}")
+        val msg = "Unexpected JiraClientError: ${it.error} - ${it.message}"
+        TestCase.fail(msg)
     }
     return this.getOrNull()!!
 }
 
 internal fun Either<JiraClientError, Unit>.orFail() {
     this.mapLeft {
-        TestCase.fail("Unexpected JiraClientError: ${it.error} - ${it.message}")
+        val msg = "Unexpected JiraClientError: ${it.error} - ${it.message}"
+        TestCase.fail(msg)
     }
 }
 

kotlin-jira-client/kotlin-jira-client-test-base/src/main/kotlin/com/linkedplanet/kotlinjiraclient/util/JiraIssueTestHelper.kt

@@ -87,7 +87,7 @@ fun issueParser(jsonObject: JsonObject, map: Map<String, String>): Either<JiraCl
 
         fun fieldByName(name: String): JsonElement? =
             fields
-                .get(resolveConfig(name, map))
+                .getNullSafe(resolveConfig(name, map))
                 ?.let { if (it.isJsonNull) null else it }
 
         val key = jsonObject.get("key").asString
@@ -111,13 +111,13 @@ fun issueParser(jsonObject: JsonObject, map: Map<String, String>): Either<JiraCl
 
         val statusObject: JsonObject = fields.get("status").asJsonObject
         val status = JiraStatus(
-            statusObject.get("id").asString,
-            statusObject.get("name").asString,
-            statusObject.get("statusCategory").asJsonObject.get("key").asString
+            statusObject.getNullSafe("id")?.asString ?: "",
+            statusObject.getNullSafe("name")?.asString ?: "",
+            statusObject.getNullSafe("statusCategory")?.asJsonObject?.getNullSafe("key")?.asString ?: ""
         )
 
         val transitions =
-            jsonObject.get("transitions")?.asJsonArray
+            jsonObject.getNullSafe("transitions")?.asJsonArray
                 ?.map {
                     val transition = it.asJsonObject
                     val name = transition.get("name").asString
@@ -150,8 +150,14 @@ fun issueParser(jsonObject: JsonObject, map: Map<String, String>): Either<JiraCl
         )
     }
 
-fun JsonObject.getNullSafe(fieldName: String) =
-    if (get(fieldName)?.isJsonNull ?: true) null else get(fieldName)
+fun JsonObject.getNullSafe(fieldName: String): JsonElement? {
+    if (!this.has(fieldName)) return null
+    val jsonElement = get(fieldName)
+    return when {
+        jsonElement?.isJsonNull == true -> null
+        else -> jsonElement
+    }
+}
 
 fun JsonArray.parseInsightFieldKey(): String = firstOrNull()?.asString?.parseInsightFieldKey() ?: ""