throw less exceptions

agourlay · Dec 6, 2016 · 123cb12 · 123cb12
1 parent 840ecc6
commit 123cb12
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/main/scala/com/github/agourlay/cornichon/json/JsonSteps.scala b/src/main/scala/com/github/agourlay/cornichon/json/JsonSteps.scala
@@ -63,9 +63,8 @@ object JsonSteps {
             val expectedJson = resolveParseJson(expected, session, resolver)
             val sessionValue = session.get(sessionKey)
             val sessionValueJson = resolveRunJsonPath(jsonPath, sessionValue, resolver)(session)
-            if (sessionValueJson.isNull) {
-              throw PathSelectsNothing(jsonPath, parseJsonUnsafe(sessionValue))
-            } else {
+            if (sessionValueJson.isNull) Assertion.failWith(PathSelectsNothing(jsonPath, parseJsonUnsafe(sessionValue)))
+            else {
               if (whitelist) {
                 val expectedWhitelistedValue = whitelistingValue(expectedJson, sessionValueJson).fold(e ⇒ throw e, identity)
                 GenericEqualityAssertion(expectedWhitelistedValue, sessionValueJson)
@@ -219,17 +218,16 @@ object JsonSteps {
       AssertStep(
         title = assertionTitle,
         action = s ⇒ {
-        val arrayFromSession = applyPathAndFindArray(jsonPath, resolver)(s, s.get(sessionKey))
-        val actualValue = removeIgnoredPathFromElements(s, arrayFromSession)
-        val expectedArray = resolveParseJson(expected, s, resolver).arrayOrObject(
-          throw NotAnArrayError(expected),
-          values ⇒ values,
-          _ ⇒ throw NotAnArrayError(expected)
-        )
-        if (ordered)
-          GenericEqualityAssertion(expectedArray, actualValue)
-        else
-          CollectionsContainSameElements(expectedArray, actualValue)
+        resolveParseJson(expected, s, resolver)
+          .asArray
+          .fold[Assertion](Assertion.failWith(NotAnArrayError(expected))) { expectedArray ⇒
+            val arrayFromSession = applyPathAndFindArray(jsonPath, resolver)(s, s.get(sessionKey))
+            val actualValue = removeIgnoredPathFromElements(s, arrayFromSession)
+            if (ordered)
+              GenericEqualityAssertion(expectedArray, actualValue)
+            else
+              CollectionsContainSameElements(expectedArray, actualValue)
+          }
       }
       )
     }

diff --git a/src/main/scala/com/github/agourlay/cornichon/steps/regular/assertStep/AssertStep.scala b/src/main/scala/com/github/agourlay/cornichon/steps/regular/assertStep/AssertStep.scala
@@ -51,6 +51,7 @@ object Assertion {
   val alwaysValid: Assertion = new Assertion { val validated = valid(Done) }
   def failWith(error: Throwable) = new Assertion { val validated: ValidatedNel[CornichonError, Done] = invalidNel(StepExecutionError(error)) }
   def failWith(error: String) = new Assertion { val validated: ValidatedNel[CornichonError, Done] = invalidNel(BasicError(error)) }
+  def failWith(error: CornichonError) = new Assertion { val validated: ValidatedNel[CornichonError, Done] = invalidNel(error) }
 
   def all(assertions: List[Assertion]): Assertion = assertions.reduce((acc, assertion) ⇒ acc.and(assertion))
   def any(assertions: List[Assertion]): Assertion = assertions.reduce((acc, assertion) ⇒ acc.or(assertion))