Merge pull request #699 from armanbilge/topic/public-trait-loses-meth…

…od-becomes-package-private-nok

core/src/main/scala/com/typesafe/tools/mima/lib/analyze/Analyzer.scala

@@ -27,7 +27,7 @@ object Analyzer {
   }
 
   def analyze(oldclazz: ClassInfo, newclazz: ClassInfo, log: Logging, excludeAnnots: List[AnnotInfo]): List[Problem] = {
-    if ((if (newclazz.isModuleClass) newclazz.module else newclazz).isScopedPrivate) Nil
+    if ((if (oldclazz.isModuleClass) oldclazz.module else oldclazz).isScopedPrivate) Nil
     else {
       TemplateChecker.check(oldclazz, newclazz) match {
         case p @ Some(_: IncompatibleTemplateDefProblem | _: CyclicTypeReferenceProblem) =>

functional-tests/src/test/package-private-class-becomes-ok/app/App.scala → functional-tests/src/test/package-private-class-becomes-nok/app/App.scala

@@ -1,5 +1,5 @@
 object App {
   def main(args: Array[String]): Unit = {
-    println(foo.Lib.doIt)
+    println(new foo.Foo().bar(1))
   }
 }

functional-tests/src/test/package-private-class-becomes-nok/problems.txt

@@ -0,0 +1 @@
+method bar(Int)Int in class foo.Foo does not have a correspondent in new version

functional-tests/src/test/package-private-class-becomes-nok/v1/A.scala

@@ -0,0 +1,5 @@
+package foo
+
+class Foo {
+  def bar(x: Int) = x
+}

functional-tests/src/test/package-private-class-becomes-ok/v2/A.scala → functional-tests/src/test/package-private-class-becomes-nok/v2/A.scala

@@ -3,8 +3,3 @@ package foo
 private[foo] class Foo {
   def bar(x: Int, y: Int) = x + y
 }
-
-object Lib {
-  val foo  = new Foo
-  def doIt = foo.bar(1, 0)
-}

functional-tests/src/test/public-trait-loses-method-becomes-package-private-nok/app/App.scala

@@ -0,0 +1,5 @@
+object App {
+  def main(args: Array[String]): Unit = {
+    println(new bar.A() {}.foo(App))
+  }
+}

functional-tests/src/test/public-trait-loses-method-becomes-package-private-nok/problems-2.11.txt

@@ -0,0 +1 @@
+method foo(java.lang.Object)java.lang.Object in trait bar.A does not have a correspondent in new version

functional-tests/src/test/public-trait-loses-method-becomes-package-private-nok/problems.txt

@@ -0,0 +1 @@
+method foo(java.lang.Object)java.lang.Object in interface bar.A does not have a correspondent in new version

functional-tests/src/test/public-trait-loses-method-becomes-package-private-nok/v1/A.scala

@@ -0,0 +1,5 @@
+package bar
+trait A {
+  def foo[T](x: T): T = x
+  def baz[T](x: T): T = x
+}

functional-tests/src/test/public-trait-loses-method-becomes-package-private-nok/v2/A.scala

@@ -0,0 +1,4 @@
+package bar
+private[bar] trait A {
+  def baz[T](x: T): T = x
+}