From 4661ee03cf40f56e4c338e1f3a383e85a90bc583 Mon Sep 17 00:00:00 2001
From: Josep Prat <jlprat@gmail.com>
Date: Wed, 28 Feb 2018 16:32:41 +0100
Subject: [PATCH] Fixes broken test for Scala 2.12 #24617

Refs: #24617
Fixes tests for Scala 2.12.x
There are still some differences between 2.11 and 2.12
---
 .../test/scala/akka/util/LineNumberSpec.scala | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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 f7ccade54e..396c839de1 100644
--- a/akka-actor-tests/src/test/scala/akka/util/LineNumberSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/LineNumberSpec.scala
@@ -4,7 +4,7 @@
 package akka.util
 
 import akka.testkit.AkkaSpec
-import LineNumbers._
+import akka.util.LineNumbers._
 
 import scala.util.Properties
 
@@ -18,20 +18,14 @@ class LineNumberSpec extends AkkaSpec {
       import LineNumberSpecCodeForScala._
 
       "work for small functions" in {
-        val result = LineNumbers(oneline)
-
-        if (isScala212)
-          // because how scala 2.12 does the same as Java Lambdas
-          result should ===(NoSourceInfo)
-        else
-          result should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 12, 12))
+        LineNumbers(oneline) should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 12, 12))
       }
 
       "work for larger functions" in {
         val result = LineNumbers(twoline)
         if (isScala212)
           // because how scala 2.12 does the same as Java Lambdas
-          result should ===(NoSourceInfo)
+          result should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 14, 14))
         else
           result should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 14, 16))
       }
@@ -41,7 +35,12 @@ class LineNumberSpec extends AkkaSpec {
       }
 
       "work for `def`" in {
-        LineNumbers(method("foo")) should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 24, 26))
+        val result = LineNumbers(method("foo"))
+        if (isScala212)
+          // because how scala 2.12 does the same as Java Lambdas
+          result should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 25, 26))
+        else
+          result should ===(SourceFileLines("LineNumberSpecCodeForScala.scala", 24, 26))
       }
 
     }