Merge remote-tracking branch 'upstream/3.3' into 3.4

neo4j · Sep 10, 2018 · 9bc8fe5 · 9bc8fe5
2 parents 72fd3ba + fa51722
commit 9bc8fe5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.../src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/SemanticIndexAcceptanceTest.scala b/.../src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/SemanticIndexAcceptanceTest.scala
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit
 import org.neo4j.cypher.ExecutionEngineFunSuite
 import org.neo4j.values.storable._
 import org.neo4j.values.utils.TemporalUtil
-import org.scalacheck.Gen
+import org.scalacheck.{Gen, Shrink}
 import org.scalacheck.Arbitrary.arbitrary
 import org.scalatest.matchers.{MatchResult, Matcher}
 import org.scalatest.prop.PropertyChecks
@@ -46,6 +46,9 @@ import scala.collection.JavaConversions._
   */
 class SemanticIndexAcceptanceTest extends ExecutionEngineFunSuite with PropertyChecks {
 
+  //we don't want scala check to shrink strings since it hides the actual error
+  implicit val dontShrink: Shrink[String] = Shrink(s => Stream.empty)
+
   private val allCRS: Map[Int, Array[CoordinateReferenceSystem]] = CoordinateReferenceSystem.all().toArray.groupBy(_.getDimension)
   private val allCRSDimensions = allCRS.keys.toArray
   private val oneDay = DurationValue.duration(0, 1, 0, 0)