Suppress class name in exceptions

robfletcher · Apr 25, 2021 · 8f44bd9 · 8f44bd9
1 parent 2ff8361
commit 8f44bd9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/strikt-core/src/main/kotlin/strikt/internal/AssertionStrategy.kt b/strikt-core/src/main/kotlin/strikt/internal/AssertionStrategy.kt
@@ -5,6 +5,7 @@ import strikt.api.Status
 import strikt.api.Status.Failed
 import strikt.api.Status.Passed
 import strikt.api.Status.Pending
+import strikt.internal.opentest4j.AssertionFailed
 import strikt.internal.opentest4j.CompoundAssertionFailure
 import strikt.internal.opentest4j.IncompleteAssertion
 import strikt.internal.reporting.writePartialToString
@@ -209,14 +210,14 @@ internal sealed class AssertionStrategy {
     failed: Failed?,
   ): AssertionFailedError {
     val error = if (failed?.comparison != null)
-      AssertionFailedError(
+      AssertionFailed(
         message,
         failed.comparison.expected,
         failed.comparison.actual,
         failed.cause
       )
     else
-      AssertionFailedError(
+      AssertionFailed(
         message,
         failed?.cause
       )

diff --git a/strikt-core/src/main/kotlin/strikt/internal/opentest4j/AssertionFailed.kt b/strikt-core/src/main/kotlin/strikt/internal/opentest4j/AssertionFailed.kt
@@ -0,0 +1,12 @@
+package strikt.internal.opentest4j
+
+import org.opentest4j.AssertionFailedError
+
+class AssertionFailed : AssertionFailedError {
+  constructor(message: String, expected: Any?, actual: Any?, cause: Throwable?) :
+    super(message, expected, actual, cause)
+
+  constructor(message: String, cause: Throwable?) : super(message, cause)
+
+  override fun toString(): String = localizedMessage
+}
diff --git a/strikt-core/src/main/kotlin/strikt/internal/opentest4j/CompoundAssertionFailure.kt b/strikt-core/src/main/kotlin/strikt/internal/opentest4j/CompoundAssertionFailure.kt
@@ -5,4 +5,6 @@ import org.opentest4j.MultipleFailuresError
 internal class CompoundAssertionFailure(
   override val message: String,
   errors: List<Throwable>
-) : MultipleFailuresError("", errors)
+) : MultipleFailuresError("", errors) {
+  override fun toString(): String = localizedMessage
+}
diff --git a/strikt-core/src/main/kotlin/strikt/internal/opentest4j/IncompleteAssertion.kt b/strikt-core/src/main/kotlin/strikt/internal/opentest4j/IncompleteAssertion.kt
@@ -8,5 +8,8 @@ import org.opentest4j.IncompleteExecutionException
  * 1. a mapping function was called but not ultimate followed by an assertion, or
  * 2. a block is empty.
  */
-class IncompleteAssertion :
-  IncompleteExecutionException("Incomplete assertion (empty block or mapping not terminated with an assertion)")
+class IncompleteAssertion : IncompleteExecutionException(
+  "Incomplete assertion (empty block or mapping not terminated with an assertion)"
+) {
+  override fun toString(): String = localizedMessage
+}
diff --git a/strikt-core/src/main/kotlin/strikt/internal/opentest4j/MappingFailed.kt b/strikt-core/src/main/kotlin/strikt/internal/opentest4j/MappingFailed.kt
@@ -7,8 +7,9 @@ import org.opentest4j.IncompleteExecutionException
  * [strikt.api.Assertion.Builder.get] or [strikt.api.Assertion.Builder.with]
  * failed due to an exception thrown by the mapping function.
  */
-class MappingFailed(description: String, cause: Throwable) :
-  IncompleteExecutionException(
-    "Mapping '$description' failed with: ${cause.message}",
-    cause
-  )
+class MappingFailed(description: String, cause: Throwable) : IncompleteExecutionException(
+  "Mapping '$description' failed with: ${cause.message}",
+  cause
+) {
+  override fun toString(): String = localizedMessage
+}