From 53b9a2650c87ff45ea71f3da978ba544cc431970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Antonsson?= Date: Mon, 31 Oct 2016 22:33:05 +0100 Subject: [PATCH] =act Ignore some line number tests on Scala 2.12 #21773 --- .../src/test/scala/akka/util/IgnoreForScala212.scala | 10 ++++++++++ .../src/test/scala/akka/util/LineNumberSpec.scala | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 akka-actor-tests/src/test/scala/akka/util/IgnoreForScala212.scala diff --git a/akka-actor-tests/src/test/scala/akka/util/IgnoreForScala212.scala b/akka-actor-tests/src/test/scala/akka/util/IgnoreForScala212.scala new file mode 100644 index 0000000000..b9302dab2d --- /dev/null +++ b/akka-actor-tests/src/test/scala/akka/util/IgnoreForScala212.scala @@ -0,0 +1,10 @@ +/** + * Copyright (C) 2016 Lightbend Inc. + */ + +package akka.util + +import org.scalatest.{ Ignore, Tag } +import scala.util.Properties + +object IgnoreForScala212 extends Tag(if (Properties.versionNumberString.startsWith("2.12")) classOf[Ignore].getName else "") diff --git a/akka-actor-tests/src/test/scala/akka/util/LineNumberSpec.scala b/akka-actor-tests/src/test/scala/akka/util/LineNumberSpec.scala index 2ec7bcfbc9..3110067493 100644 --- a/akka-actor-tests/src/test/scala/akka/util/LineNumberSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/LineNumberSpec.scala @@ -13,11 +13,11 @@ class LineNumberSpec extends AkkaSpec { "writing Scala" must { import LineNumberSpecCodeForScala._ - "work for small functions" in { + "work for small functions" taggedAs IgnoreForScala212 in { LineNumbers(oneline) should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 12, 12)) } - "work for larger functions" in { + "work for larger functions" taggedAs IgnoreForScala212 in { LineNumbers(twoline) should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 14, 16)) }