Skip to content

Commit 31ce00c

Browse files
authored
Merge pull request #7950 from dotty-staging/fix-trait-test
Fix #7949: sbt test discovery should not run traits
2 parents 06ab5f8 + 3cbb5aa commit 31ce00c

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,8 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
583583

584584
def apiModifiers(sym: Symbol): api.Modifiers = {
585585
val absOver = sym.is(AbsOverride)
586-
val abs = sym.is(Abstract) || sym.is(Deferred) || absOver
587-
val over = sym.is(Override) || absOver
586+
val abs = absOver || sym.isOneOf(Trait | Abstract | Deferred)
587+
val over = absOver || sym.is(Override)
588588
new api.Modifiers(abs, over, sym.is(Final), sym.is(Sealed),
589589
sym.isOneOf(GivenOrImplicit), sym.is(Lazy), sym.is(Macro), sym.isSuperAccessor)
590590
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import org.junit.Test
2+
import org.junit.Assert.assertEquals
3+
4+
// Test discovery should not pick this up because it's abstract
5+
abstract class AbstractClassTest {
6+
@Test def foo = {
7+
???
8+
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import org.junit.Test
2+
import org.junit.Assert.assertEquals
3+
4+
// Test discovery should not pick this up because it's a trait
5+
trait TraitTest {
6+
@Test def foo = {
7+
???
8+
}
9+
}

0 commit comments

Comments
 (0)