From ffce2f26e02997546511e258f45f1a4554a882ca Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 1 Jan 2018 02:12:36 -0800 Subject: Properly handle `isModule` flag on `sbt.testing.FingerPrint` --- scalalib/src/main/scala/mill/scalalib/TestRunner.scala | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scalalib/src') diff --git a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala index 7fd6079e..b734273f 100644 --- a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala +++ b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala @@ -30,8 +30,11 @@ object TestRunner { val cls = cl.loadClass(path.stripSuffix(".class").replace('/', '.')) fingerprints.find { case f: SubclassFingerprint => + + (f.isModule == cls.getName.endsWith("$")) && cl.loadClass(f.superclassName()).isAssignableFrom(cls) case f: AnnotatedFingerprint => + (f.isModule == cls.getName.endsWith("$")) && cls.isAnnotationPresent( cl.loadClass(f.annotationName()).asInstanceOf[Class[Annotation]] ) -- cgit v1.2.3