Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test latest scala-library 2.12.9, analysed #364

Merged
merged 3 commits into from
Jul 30, 2019
Merged

Test latest scala-library 2.12.9, analysed #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebebf46
Add class-removed-method-overload-ko, w/ bad msg
dwijnand Jul 29, 2019
b4ceddc
Removed overloads are missing, not incompatible
dwijnand Jul 29, 2019
76dc612
Test latest scala-library 2.12.9, analysed
dwijnand Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions core/src/main/scala/com/typesafe/tools/mima/lib/analyze/method/MethodChecker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,28 @@ private[analyze] abstract class BaseMethodChecker extends Checker[MethodInfo, Cl

protected val rules = Seq(AccessModifier, FinalModifier, AbstractModifier, JavaStatic)

protected def check(method: MethodInfo, in: Iterator[MethodInfo]): Option[Problem] = {
val meths = in.filter(method.paramsCount == _.paramsCount).toList
protected def check(method: MethodInfo, newclazz: ClassInfo, methsLookup: ClassInfo => Iterator[MethodInfo]): Option[Problem] = {
val meths = methsLookup(newclazz).filter(method.paramsCount == _.paramsCount).toList // newmeths
if (meths.isEmpty)
Some(DirectMissingMethodProblem(method))
else {
meths.find(m => m.descriptor == method.descriptor && m.signature == method.signature) match {
case Some(found) => checkRules(rules)(method, found)
case None => meths.filter(method.matchesType(_)) match {
case Nil => Some(IncompatibleMethTypeProblem(method, uniques(meths)))
case filtered @ first :: _ => filtered.find(_.tpe.resultType == method.tpe.resultType) match {
case None => Some(IncompatibleResultTypeProblem(method, first))
case None =>
val filtered = meths.filter(method.matchesType(_))
filtered.find(_.tpe.resultType == method.tpe.resultType) match {
case Some(found) => Some(IncompatibleSignatureProblem(method, found))
case None =>
val oldmethsDescriptors = methsLookup(method.owner).map(_.descriptor).toSet
if (meths.forall(newmeth => oldmethsDescriptors.contains(newmeth.descriptor)))
Some(DirectMissingMethodProblem(method))
else {
filtered match {
case Nil => Some(IncompatibleMethTypeProblem(method, uniques(meths)))
case first :: _ => Some(IncompatibleResultTypeProblem(method, first))
}
}
}
}
}
}
}
Expand All @@ -35,9 +43,9 @@ private[analyze] class ClassMethodChecker extends BaseMethodChecker {
if (method.nonAccessible)
None
else if (method.isDeferred)
super.check(method, inclazz.lookupMethods(method.bytecodeName))
super.check(method, inclazz, _.lookupMethods(method.bytecodeName))
else
super.check(method, inclazz.lookupClassMethods(method.bytecodeName))
super.check(method, inclazz, _.lookupClassMethods(method.bytecodeName))
}
}

Expand All @@ -48,7 +56,7 @@ private[analyze] class TraitMethodChecker extends BaseMethodChecker {
else if (method.owner.hasStaticImpl(method))
checkStaticImplMethod(method, inclazz)
else
super.check(method, inclazz.lookupMethods(method.bytecodeName))
super.check(method, inclazz, _.lookupMethods(method.bytecodeName))
}

private def checkStaticImplMethod(method: MethodInfo, inclazz: ClassInfo) = {
Expand All @@ -66,7 +74,7 @@ private[analyze] class TraitMethodChecker extends BaseMethodChecker {
// otherwise we check the all concrete trait methods and report
// either that the method is missing or that no method with the
// same signature exists. Either way, we expect that a problem is reported!
val prob = super.check(method, inclazz.lookupConcreteTraitMethods(method.bytecodeName))
val prob = super.check(method, inclazz, _.lookupConcreteTraitMethods(method.bytecodeName))
assert(prob.isDefined)
prob
}
Expand Down
Empty file added functional-tests/src/it/scala-library-2-12/problems.txt
View file
Open in desktop
Empty file.
182 changes: 182 additions & 0 deletions functional-tests/src/it/scala-library-2-12/test.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
groupId = "org.scala-lang"
artifactId = "scala-library"
v1 = "2.12.0"
v2 = "2.12.9-bin-d386f96-SNAPSHOT"

filter.problems=[
# all
{ problemName=Problem, matchName="scala.concurrent.impl.*" }
{ problemName=Problem, matchName="scala.sys.process.*Impl*" }

# 2.12.2
# dropped private[immutable] method on private[immutable] VectorPointer
# ... which is extended by VectorBuilder & Vector, which are final
# ... and also extended by VectorIterator, which isn't... :-/
{ problemName=DirectMissingMethodProblem, matchName="scala.collection.immutable.VectorPointer.debug" }
{ problemName=DirectMissingMethodProblem, matchName="scala.collection.immutable.VectorBuilder.debug" }
{ problemName=DirectMissingMethodProblem, matchName="scala.collection.immutable.Vector.debug" }
{ problemName=DirectMissingMethodProblem, matchName="scala.collection.immutable.VectorIterator.debug" }
# dropped private[mutable] & private[collection] methods on object OpenHashMap & object HashTable
{ problemName=DirectMissingMethodProblem, matchName="scala.collection.mutable.OpenHashMap.nextPositivePowerOfTwo" }
{ problemName=DirectMissingMethodProblem, matchName="scala.collection.mutable.HashTable.powerOfTwo" }
# -def #::(hd: A): Stream[A]
# +def #::[B >: A](hd: B): Stream[B]
{ matchName="scala.collection.immutable.Stream#ConsWrapper.#::" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Stream#ConsWrapper.#:::" , problemName=IncompatibleSignatureProblem }

# 2.12.3
# Part of scala/scala#5805: "Change type parameters to the [A1, B1] convention", such as:
# -def getOrElse[AA >: A](or: => AA): AA
# +def getOrElse[A1 >: A](or: => A1): A1
# -def flatMap[BB >: B, X](f: A => Either[X, BB]): Either[X, BB]
# +def flatMap[A1, B1 >: B](f: A => Either[A1, B1]): Either[A1, B1]
{ matchName="scala.util.Either#LeftProjection.getOrElse" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#LeftProjection.flatMap" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#LeftProjection.filter" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#LeftProjection.flatMap" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#LeftProjection.getOrElse" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#LeftProjection.map" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#RightProjection.filter" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#RightProjection.flatMap" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#RightProjection.getOrElse" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either#RightProjection.map" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either.cond" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either.contains" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either.filterOrElse" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either.flatMap" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either.getOrElse" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.util.Either.map" , problemName=IncompatibleSignatureProblem }

# 2.12.5
# Now returns Iterator[List[Nothing]] instead of a Iterator[Traversable[Nothing]]
{ matchName="scala.collection.immutable.Nil.tails" , problemName=IncompatibleSignatureProblem }

# 2.12.7
# new signature is missing...??
{ matchName="scala.collection.immutable.Nil.andThen" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.seq" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.thisCollection" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.toSeq" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.view" , problemName=IncompatibleSignatureProblem }

# 2.12.8
# Before there were 2 Symbol.apply forwarder methods:
# one which is String -> Symbol, which is for Symbol#apply
# one which is Object -> Object, which is the Function1 bridge method
{ matchName="scala.Symbol.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.List.empty" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.andThen" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.drop" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.dropRight" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.dropWhile" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.head" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.reverse" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.reversed" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.seq" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.slice" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.tail" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.take" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.takeRight" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.takeWhile" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.thisCollection" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.toCollection" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.toSeq" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.view" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Queue.empty" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Stream.empty" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Stream.fill" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Stream.iterate" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Stream.range" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Stream.tabulate" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Vector.empty" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.mutable.LinkedList.empty" , problemName=DirectMissingMethodProblem }
{ matchName="scala.sys.process.Process.Future" , problemName=DirectMissingMethodProblem }
{ matchName="scala.sys.process.Process.Spawn" , problemName=DirectMissingMethodProblem }
{ matchName="scala.util.Properties.propFilename" , problemName=DirectMissingMethodProblem }
{ matchName="scala.util.Properties.scalaProps" , problemName=DirectMissingMethodProblem }
# 2.12.7 -> 2.12.8
{ matchName="scala.None.get" , problemName=DirectMissingMethodProblem }
{ matchName="scala.ScalaReflectionException.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.UninitializedFieldError.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.GenMap.empty" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.groupBy" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.isDefinedAt" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.toIterable" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.toMap" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.toSet" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.immutable.Nil.toTraversable" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.parallel.CompositeThrowable.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.collection.script.Index.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.text.DocCons.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.text.DocGroup.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.text.DocNest.apply" , problemName=DirectMissingMethodProblem }
{ matchName="scala.text.DocText.apply" , problemName=DirectMissingMethodProblem }
# more forwarders overloading confusing, now in the signatures
{ matchName="scala.collection.immutable.Nil.++:" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.:+" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.combinations" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.contains" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.copyToBuffer" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.fold" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.genericBuilder" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.groupBy" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.grouped" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.indexOf" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.indexOfSlice" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.inits" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.lastIndexOf" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.lastIndexOfSlice" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.orElse" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.padTo" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.partition" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.patch" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.permutations" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.product" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.reduce" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.reduceLeft" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.reduceLeftOption" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.reduceOption" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.reduceRight" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.reduceRightOption" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.reverseMap" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.sameElements" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.scan" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.scanLeft" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.scanRight" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.sliding" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.sum" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.toBuffer" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.toSet" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.union" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.unzip" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.unzip3" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.updated" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.withFilter" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.zip" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.zipAll" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.zipWithIndex" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.Nil.zipWithIndex" , problemName=IncompatibleSignatureProblem }

# 2.12.9
# type param renames:
#
# - method max(scala.math.Ordering)java.lang.Object in class scala.collection.immutable.TreeSet
# has a different signature in new version, where it is
# <A1:Ljava/lang/Object;>(Lscala/math/Ordering<TA1;>;)TA; rather than
# <B:Ljava/lang/Object;>(Lscala/math/Ordering<TB;>;)TA;
#
# - method min(scala.math.Ordering)java.lang.Object in class scala.collection.immutable.TreeSet
# has a different signature in new version, where it is
# <A1:Ljava/lang/Object;>(Lscala/math/Ordering<TA1;>;)TA; rather than
# <B:Ljava/lang/Object;>(Lscala/math/Ordering<TB;>;)TA;
{ matchName="scala.collection.immutable.TreeSet.max" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.collection.immutable.TreeSet.min" , problemName=IncompatibleSignatureProblem }
# more specific exceptions:
# - method result(scala.concurrent.Awaitable,scala.concurrent.duration.Duration)java.lang.Object
# in class scala.concurrent.Await has a different signature in new version, where it is
# <T:Ljava/lang/Object;>(Lscala/concurrent/Awaitable<TT;>;Lscala/concurrent/duration/Duration;)TT;^Ljava/util/concurrent/TimeoutException;^Ljava/lang/InterruptedException; rather than
# <T:Ljava/lang/Object;>(Lscala/concurrent/Awaitable<TT;>;Lscala/concurrent/duration/Duration;)TT;^Ljava/lang/Exception;
{ matchName="scala.concurrent.Await.result" , problemName=IncompatibleSignatureProblem }
{ matchName="scala.concurrent.Awaitable.result" , problemName=IncompatibleSignatureProblem }
]
1 change: 1 addition & 0 deletions functional-tests/src/test/class-removed-method-overload-ko/problems.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
method foo(java.lang.Object)java.lang.String in class A does not have a correspondent in new version
4 changes: 4 additions & 0 deletions functional-tests/src/test/class-removed-method-overload-ko/v1/A.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
final class A {
def foo(s: String): String = s
def foo(o: Object): String = o.toString
}
3 changes: 3 additions & 0 deletions functional-tests/src/test/class-removed-method-overload-ko/v2/A.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
final class A {
def foo(s: String): String = s
}
Loading