From 948a9cf5ccd3b415f4f794013c08973be657ba4a Mon Sep 17 00:00:00 2001 From: Benjy Date: Thu, 17 Oct 2013 13:45:42 -0700 Subject: [PATCH] Change how test labels are combined, per code review comments. --- .../src/test/scala/sbt/inc/AnalysisTest.scala | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/compile/inc/src/test/scala/sbt/inc/AnalysisTest.scala b/compile/inc/src/test/scala/sbt/inc/AnalysisTest.scala index def2caeaf..f0ddc96ff 100644 --- a/compile/inc/src/test/scala/sbt/inc/AnalysisTest.scala +++ b/compile/inc/src/test/scala/sbt/inc/AnalysisTest.scala @@ -76,13 +76,12 @@ object AnalysisTest extends Properties("Analysis") { } // Compare two analyses with useful labelling when they aren't equal. - private[this] def compare(left: Analysis, right: Analysis) = { - val res = left == right - ("UNEQUAL" |: res) || - ((" LEFT: " + left) |: false) || - (("RIGHT: " + right) |: false) || - (("STAMPS EQUAL: " + (left.stamps == right.stamps)) |: false) || - (("APIS EQUAL: " + (left.apis == right.apis)) |: false) || - (("RELATIONS EQUAL: " + (left.relations == right.relations)) |: false) - } + private[this] def compare(left: Analysis, right: Analysis): Prop = + s" LEFT: $left" |: + s"RIGHT: $right" |: + s"STAMPS EQUAL: ${left.stamps == right.stamps}" |: + s"APIS EQUAL: ${left.apis == right.apis}" |: + s"RELATIONS EQUAL: ${left.relations == right.relations}" |: + "UNEQUAL" |: + (left == right) }