hotfix_test_utils (#69)

* fix(TestUtils): added missing paranthesis in Metorikku actual vs expected compare * fix(tests): add return statement to prevent inconsistent failures * fix(tests): add return statement to prevent inconsistent failures * fix(tests): fix test failure
YotpoLtd · Jan 10, 2018 · 2dc0dca · 2dc0dca
1 parent 83fce53
commit 2dc0dca
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/scala/com/yotpo/metorikku/utils/TestUtils.scala b/src/main/scala/com/yotpo/metorikku/utils/TestUtils.scala
@@ -100,13 +100,15 @@ object TestUtils {
   }
 
   private def matchExpectedRow(mapOfActualRow: Map[String, Nothing], metricExpectedResultRows: List[Map[String, Any]]): Map[String, Any] = {
+    // scalastyle:off
     for (expectedRowCandidate <- metricExpectedResultRows) {
-      if (isMatchingValuesInRow(mapOfActualRow, expectedRowCandidate)) expectedRowCandidate
+      if (isMatchingValuesInRow(mapOfActualRow, expectedRowCandidate)) {
+        return expectedRowCandidate
+      }
     }
-    // scalastyle:off null
-    //TODO Avoid using nulls
+    //TODO Avoid using nulls and return 
     null
-    // scalastyle:on null
+    // scalastyle:on
   }
 
   private def isMatchingValuesInRow(actualRow: Map[String, Nothing], expectedRowCandidate: Map[String, Any]): Boolean = {