diff options
Diffstat (limited to 'test/files')
20 files changed, 88 insertions, 0 deletions
diff --git a/test/files/buildmanager/t2651_1/A.scala b/test/files/buildmanager/t2651_1/A.scala new file mode 100644 index 0000000000..d712f6febe --- /dev/null +++ b/test/files/buildmanager/t2651_1/A.scala @@ -0,0 +1 @@ +trait A[T] diff --git a/test/files/buildmanager/t2651_1/B.scala b/test/files/buildmanager/t2651_1/B.scala new file mode 100644 index 0000000000..a8aca3d0ed --- /dev/null +++ b/test/files/buildmanager/t2651_1/B.scala @@ -0,0 +1,2 @@ +trait B[T] extends A[T] + diff --git a/test/files/buildmanager/t2651_1/C.scala b/test/files/buildmanager/t2651_1/C.scala new file mode 100644 index 0000000000..690dcf518d --- /dev/null +++ b/test/files/buildmanager/t2651_1/C.scala @@ -0,0 +1,3 @@ +object C { + new A[Int] {} +} diff --git a/test/files/buildmanager/t2651_1/D.scala b/test/files/buildmanager/t2651_1/D.scala new file mode 100644 index 0000000000..51273ad986 --- /dev/null +++ b/test/files/buildmanager/t2651_1/D.scala @@ -0,0 +1,3 @@ +object D { + def x[T](a: A[T]) = a +} diff --git a/test/files/buildmanager/t2651_1/t2651_1.changes/A2.scala b/test/files/buildmanager/t2651_1/t2651_1.changes/A2.scala new file mode 100644 index 0000000000..574b522149 --- /dev/null +++ b/test/files/buildmanager/t2651_1/t2651_1.changes/A2.scala @@ -0,0 +1,2 @@ +trait A + diff --git a/test/files/buildmanager/t2651_1/t2651_1.check b/test/files/buildmanager/t2651_1/t2651_1.check new file mode 100644 index 0000000000..8d2cbc8194 --- /dev/null +++ b/test/files/buildmanager/t2651_1/t2651_1.check @@ -0,0 +1,19 @@ +builder > A.scala B.scala C.scala D.scala +compiling Set(A.scala, B.scala, C.scala, D.scala) +Changes: Map() +builder > A.scala +compiling Set(A.scala) +Changes: Map(trait A -> List(Changed(Class(A))[ tparams: List()])) +invalidate B.scala because parents have changed [Changed(Class(A))[ tparams: List()]] +invalidate C.scala because parents have changed [Changed(Class(A))[ tparams: List()]] +invalidate D.scala because it references changed class [Changed(Class(A))[ tparams: List()]] +compiling Set(B.scala, C.scala, D.scala) +B.scala:1: error: A does not take type parameters +trait B[T] extends A[T] + ^ +C.scala:2: error: A does not take type parameters + new A[Int] {} + ^ +D.scala:2: error: A does not take type parameters + def x[T](a: A[T]) = a + ^ diff --git a/test/files/buildmanager/t2651_1/t2651_1.test b/test/files/buildmanager/t2651_1/t2651_1.test new file mode 100644 index 0000000000..4f67d5e233 --- /dev/null +++ b/test/files/buildmanager/t2651_1/t2651_1.test @@ -0,0 +1,3 @@ +>>compile A.scala B.scala C.scala D.scala +>>update A.scala=>A2.scala +>>compile A.scala diff --git a/test/files/buildmanager/t2651_2/A.scala b/test/files/buildmanager/t2651_2/A.scala new file mode 100644 index 0000000000..d712f6febe --- /dev/null +++ b/test/files/buildmanager/t2651_2/A.scala @@ -0,0 +1 @@ +trait A[T] diff --git a/test/files/buildmanager/t2651_2/t2651_2.changes/A2.scala b/test/files/buildmanager/t2651_2/t2651_2.changes/A2.scala new file mode 100644 index 0000000000..7fb573e077 --- /dev/null +++ b/test/files/buildmanager/t2651_2/t2651_2.changes/A2.scala @@ -0,0 +1 @@ +trait A[S] diff --git a/test/files/buildmanager/t2651_2/t2651_2.check b/test/files/buildmanager/t2651_2/t2651_2.check new file mode 100644 index 0000000000..dd789b7565 --- /dev/null +++ b/test/files/buildmanager/t2651_2/t2651_2.check @@ -0,0 +1,6 @@ +builder > A.scala +compiling Set(A.scala) +Changes: Map() +builder > A.scala +compiling Set(A.scala) +Changes: Map(trait A -> List()) diff --git a/test/files/buildmanager/t2651_2/t2651_2.test b/test/files/buildmanager/t2651_2/t2651_2.test new file mode 100644 index 0000000000..d0614473ce --- /dev/null +++ b/test/files/buildmanager/t2651_2/t2651_2.test @@ -0,0 +1,3 @@ +>>compile A.scala +>>update A.scala=>A2.scala +>>compile A.scala diff --git a/test/files/buildmanager/t2651_3/A.scala b/test/files/buildmanager/t2651_3/A.scala new file mode 100644 index 0000000000..14f9e4662f --- /dev/null +++ b/test/files/buildmanager/t2651_3/A.scala @@ -0,0 +1,3 @@ +trait A[T, S] { + def x: T +} diff --git a/test/files/buildmanager/t2651_3/t2651_3.changes/A2.scala b/test/files/buildmanager/t2651_3/t2651_3.changes/A2.scala new file mode 100644 index 0000000000..51bf27d1fa --- /dev/null +++ b/test/files/buildmanager/t2651_3/t2651_3.changes/A2.scala @@ -0,0 +1,3 @@ +trait A[T, S] { + def x: S +} diff --git a/test/files/buildmanager/t2651_3/t2651_3.check b/test/files/buildmanager/t2651_3/t2651_3.check new file mode 100644 index 0000000000..d4bac196e9 --- /dev/null +++ b/test/files/buildmanager/t2651_3/t2651_3.check @@ -0,0 +1,6 @@ +builder > A.scala +compiling Set(A.scala) +Changes: Map() +builder > A.scala +compiling Set(A.scala) +Changes: Map(trait A -> List(Changed(Definition(A.x))[method x changed from ()T to ()S flags: <deferred> <method>])) diff --git a/test/files/buildmanager/t2651_3/t2651_3.test b/test/files/buildmanager/t2651_3/t2651_3.test new file mode 100644 index 0000000000..d0614473ce --- /dev/null +++ b/test/files/buildmanager/t2651_3/t2651_3.test @@ -0,0 +1,3 @@ +>>compile A.scala +>>update A.scala=>A2.scala +>>compile A.scala diff --git a/test/files/buildmanager/t2651_4/A.scala b/test/files/buildmanager/t2651_4/A.scala new file mode 100644 index 0000000000..63f2a1643e --- /dev/null +++ b/test/files/buildmanager/t2651_4/A.scala @@ -0,0 +1,5 @@ +trait A[T, S] { + def x: T + def y(a: T) + def z[B <: T] +} diff --git a/test/files/buildmanager/t2651_4/B.scala b/test/files/buildmanager/t2651_4/B.scala new file mode 100644 index 0000000000..b33dbde676 --- /dev/null +++ b/test/files/buildmanager/t2651_4/B.scala @@ -0,0 +1,3 @@ +trait B extends A[Int, String] { + def x = 3 +} diff --git a/test/files/buildmanager/t2651_4/t2651_4.changes/A2.scala b/test/files/buildmanager/t2651_4/t2651_4.changes/A2.scala new file mode 100644 index 0000000000..f155129d13 --- /dev/null +++ b/test/files/buildmanager/t2651_4/t2651_4.changes/A2.scala @@ -0,0 +1,5 @@ +trait A[S, T] { + def x: T + def y(a: T) + def z[B <: T] +} diff --git a/test/files/buildmanager/t2651_4/t2651_4.check b/test/files/buildmanager/t2651_4/t2651_4.check new file mode 100644 index 0000000000..c4ce382b5f --- /dev/null +++ b/test/files/buildmanager/t2651_4/t2651_4.check @@ -0,0 +1,13 @@ +builder > A.scala B.scala +compiling Set(A.scala, B.scala) +Changes: Map() +builder > A.scala +compiling Set(A.scala) +Changes: Map(trait A -> List(Changed(Definition(A.x))[method x changed from ()T to ()T flags: <deferred> <method>], Changed(Definition(A.y))[method y changed from (a: T)Unit to (a: T)Unit flags: <deferred> <method>], Changed(Definition(A.z))[method z changed from [B <: T]()Unit to [B <: T]()Unit flags: <deferred> <method>])) +invalidate B.scala because inherited method changed [Changed(Definition(A.x))[method x changed from ()T to ()T flags: <deferred> <method>]] +compiling Set(B.scala) +B.scala:2: error: type mismatch; + found : Int(3) + required: String + def x = 3 + ^ diff --git a/test/files/buildmanager/t2651_4/t2651_4.test b/test/files/buildmanager/t2651_4/t2651_4.test new file mode 100644 index 0000000000..6f3bd03361 --- /dev/null +++ b/test/files/buildmanager/t2651_4/t2651_4.test @@ -0,0 +1,3 @@ +>>compile A.scala B.scala +>>update A.scala=>A2.scala +>>compile A.scala |