Skip to content

Commit

Permalink
change 'if' in test to use conditional ScalaCheck property
Browse files Browse the repository at this point in the history
  • Loading branch information
larsrh committed Dec 7, 2012
1 parent 6cd2d2c commit 2b8fbfa
Showing 1 changed file with 21 additions and 22 deletions.
43 changes: 21 additions & 22 deletions tests/src/test/scala/scalaz/std/MapTest.scala
@@ -1,22 +1,21 @@
package scalaz
package std

import std.AllInstances._
import scalaz.scalacheck.ScalazProperties._
import org.scalacheck.Prop.forAll
import scala.math.{Ordering => SOrdering}

class MapTest extends Spec {
"map ordering" ! prop {
val O = implicitly[Order[Map[String,Int]]]
val O2 = SOrdering.Iterable(implicitly[SOrdering[(String,Int)]])
(kvs: List[(String,Int)], kvs2: List[(String,Int)]) => {
val (m1, m2) = (kvs.toMap, kvs2.toMap)
if((m1.size == kvs.size) && (m2.size == kvs2.size)){
val l: Boolean = O.lessThan(m1, m2)
val r: Boolean = O2.lt(kvs.sortBy(_._1), kvs2.sortBy(_._1))
l == r
} else true
}
}
}
package scalaz
package std

import std.AllInstances._
import scalaz.scalacheck.ScalazProperties._
import scala.math.{Ordering => SOrdering}

class MapTest extends Spec {
"map ordering" ! prop {
val O = implicitly[Order[Map[String,Int]]]
val O2 = SOrdering.Iterable(implicitly[SOrdering[(String,Int)]])
(kvs: List[(String,Int)], kvs2: List[(String,Int)]) => {
val (m1, m2) = (kvs.toMap, kvs2.toMap)
((m1.size == kvs.size) && (m2.size == kvs2.size)) ==> {
val l: Boolean = O.lessThan(m1, m2)
val r: Boolean = O2.lt(kvs.sortBy(_._1), kvs2.sortBy(_._1))
l == r
}
}
}
}

0 comments on commit 2b8fbfa

Please sign in to comment.