Skip to content

Commit a4ac989

Browse files
committed
Enable untried pos tests related to value classes
Each test needs to have its own package because pos_all will try to compile the whole valueclasses directory at once.
1 parent 8014f64 commit a4ac989

23 files changed

+33
-33
lines changed

test/dotc/tests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class tests extends CompilerTest {
7979
@Test def pos_overloadedAccess = compileFile(posDir, "overloadedAccess", twice)
8080
@Test def pos_approximateUnion = compileFile(posDir, "approximateUnion", twice)
8181
@Test def pos_tailcall = compileDir(posDir, "tailcall", twice)
82-
@Test def pos_valueclasses = compileDir(posDir, "valueclasses", twice)
82+
@Test def pos_valueclasses = compileFiles(posDir + "valueclasses/", twice)
8383
@Test def pos_nullarify = compileFile(posDir, "nullarify", args = "-Ycheck:nullarify" :: Nil)
8484
@Test def pos_subtyping = compileFile(posDir, "subtyping", twice)
8585
@Test def pos_t2613 = compileFile(posSpecialDir, "t2613")(allowDeepSubtypes)

tests/pos/valueclasses/nullAsInstanceOfVC.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package nullAsInstanceOfVC
2+
13
// These issues were originally reported in SI-5866 and SI-8097
24
// FIXME: Make this a run test once we have run tests.
35

tests/untried/pos/t5853.scala renamed to tests/pos/valueclasses/t5853.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t5853
2+
13

24

35

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t6029
2+
13
final case class V[A](x: A) extends AnyVal {
24
def flatMap[B](f: A => V[B]) = if (true) this else f(x)
35
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
package t6034
2+
13
final class OptPlus[+A](val x: A) extends AnyVal { }
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
package t6215
2+
13
class Foo(val v: String) extends AnyVal { private def len = v.length ; def f = len }

tests/untried/pos/t6260.scala renamed to tests/pos/valueclasses/t6260.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t6260
2+
13
class Box[X](val x: X) extends AnyVal {
24
def map[Y](f: X => Y): Box[Y] =
35
((bx: Box[X]) => new Box(f(bx.x)))(this)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t6260b
2+
13

24
class X(val value: Object) extends AnyVal { def or(alt: => X): X = this }
35
class Y { def f = new X("") or new X("") }

tests/untried/pos/t6358.scala renamed to tests/pos/valueclasses/t6358.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t6358
2+
13
class L(val t: Int) extends AnyVal {
24
def lazyString = {
35
lazy val x = t.toString

tests/untried/pos/t6358_2.scala renamed to tests/pos/valueclasses/t6358_2.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t6358_2
2+
13
class Y[T](val i: Option[T]) extends AnyVal {
24
def q: List[T] = {
35
lazy val e: List[T] = i.toList
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
package t6601
2+
13
class V private (val a: Any) extends AnyVal

tests/untried/pos/t6601/UsePrivateValueClass_2.scala renamed to tests/pos/valueclasses/t6601/UsePrivateValueClass_2.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t6601
2+
13
object Test {
24
// After the first attempt to make seprately compiled value
35
// classes respect the privacy of constructors, we got:

tests/untried/pos/t6651.scala renamed to tests/pos/valueclasses/t6651.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t6651
2+
13
class YouAreYourself[A <: AnyRef](val you: A) extends AnyVal {
24
def yourself: you.type = you
35
}

tests/untried/pos/t7818.scala renamed to tests/pos/valueclasses/t7818.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package t7818
2+
13
class Observable1[+T](val asJava: JObservable[_ <: T]) extends AnyVal {
24
private def foo[X](a: JObservable[X]): JObservable[X] = ???
35
// was generating a type error as the type of the RHS included an existential

tests/untried/pos/value-class-override-no-spec.scala renamed to tests/pos/valueclasses/value-class-override-no-spec.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package value_class_override_no_spec
2+
13
// There are two versions of this tests: one with and one without specialization.
24
// The bug was only exposed *without* specialization.
35
trait T extends Any {

tests/untried/pos/value-class-override-spec.scala renamed to tests/pos/valueclasses/value-class-override-spec.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package value_class_override_spec
2+
13
// There are two versions of this tests: one with and one without specialization.
24
// The bug was only exposed *without* specialization.
35
trait T extends Any {
File renamed without changes.

tests/untried/pos/xlint1.scala renamed to tests/pos/valueclasses/xlint1.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package xlint1
2+
13
package object foo {
24
implicit class Bar[T](val x: T) extends AnyVal {
35
def bippy = 1

tests/untried/pos/delambdafy_t6260_method.check

Lines changed: 0 additions & 13 deletions
This file was deleted.

tests/untried/pos/delambdafy_t6260_method.flags

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/untried/pos/delambdafy_t6260_method.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

tests/untried/pos/t6260.flags

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)