diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-26 10:33:10 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-26 10:33:10 +0000 |
commit | 589adb95631064f827207542d33b8e05605a46df (patch) | |
tree | e5607dca54a338d9f61368f2522004a0b7bcdc88 /test | |
parent | 70cc762d3a29bc91349cd84b3e22bf46d189d817 (diff) | |
download | scala-589adb95631064f827207542d33b8e05605a46df.tar.gz scala-589adb95631064f827207542d33b8e05605a46df.tar.bz2 scala-589adb95631064f827207542d33b8e05605a46df.zip |
More tests, plus missing file. No review.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/buildmanager/t2556_3/t2556_3.changes/A2.scala | 5 | ||||
-rw-r--r-- | test/files/buildmanager/t2655/A.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2655/B.scala | 3 | ||||
-rw-r--r-- | test/files/buildmanager/t2655/t2655.changes/A2.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2655/t2655.check | 13 | ||||
-rw-r--r-- | test/files/buildmanager/t2655/t2655.test | 3 | ||||
-rw-r--r-- | test/files/buildmanager/t2657/A.scala | 3 | ||||
-rw-r--r-- | test/files/buildmanager/t2657/B.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2657/t2657.changes/A2.scala | 3 | ||||
-rw-r--r-- | test/files/buildmanager/t2657/t2657.check | 13 | ||||
-rw-r--r-- | test/files/buildmanager/t2657/t2657.test | 3 |
11 files changed, 58 insertions, 0 deletions
diff --git a/test/files/buildmanager/t2556_3/t2556_3.changes/A2.scala b/test/files/buildmanager/t2556_3/t2556_3.changes/A2.scala new file mode 100644 index 0000000000..21cb2779f9 --- /dev/null +++ b/test/files/buildmanager/t2556_3/t2556_3.changes/A2.scala @@ -0,0 +1,5 @@ +class A { + def x = 3 +} +class B + diff --git a/test/files/buildmanager/t2655/A.scala b/test/files/buildmanager/t2655/A.scala new file mode 100644 index 0000000000..b2c54ac47d --- /dev/null +++ b/test/files/buildmanager/t2655/A.scala @@ -0,0 +1,4 @@ +object A { + def x(i: => String) = () +} + diff --git a/test/files/buildmanager/t2655/B.scala b/test/files/buildmanager/t2655/B.scala new file mode 100644 index 0000000000..6c1918c0fb --- /dev/null +++ b/test/files/buildmanager/t2655/B.scala @@ -0,0 +1,3 @@ +object B { + val x = A.x("3") +} diff --git a/test/files/buildmanager/t2655/t2655.changes/A2.scala b/test/files/buildmanager/t2655/t2655.changes/A2.scala new file mode 100644 index 0000000000..0d6a7c69bb --- /dev/null +++ b/test/files/buildmanager/t2655/t2655.changes/A2.scala @@ -0,0 +1,4 @@ +object A { + def x(i: Function0[String]) = () +} + diff --git a/test/files/buildmanager/t2655/t2655.check b/test/files/buildmanager/t2655/t2655.check new file mode 100644 index 0000000000..a4a071ed70 --- /dev/null +++ b/test/files/buildmanager/t2655/t2655.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(object A -> List(Changed(Definition(A.x))[method x changed from (i: Function0)Unit to (i: Function0)Unit flags: <method>])) +invalidate B.scala because it references changed definition [Changed(Definition(A.x))[method x changed from (i: Function0)Unit to (i: Function0)Unit flags: <method>]] +compiling Set(B.scala) +B.scala:2: error: type mismatch; + found : java.lang.String("3") + required: () => String + val x = A.x("3") + ^ diff --git a/test/files/buildmanager/t2655/t2655.test b/test/files/buildmanager/t2655/t2655.test new file mode 100644 index 0000000000..6f3bd03361 --- /dev/null +++ b/test/files/buildmanager/t2655/t2655.test @@ -0,0 +1,3 @@ +>>compile A.scala B.scala +>>update A.scala=>A2.scala +>>compile A.scala diff --git a/test/files/buildmanager/t2657/A.scala b/test/files/buildmanager/t2657/A.scala new file mode 100644 index 0000000000..2a6c62d29c --- /dev/null +++ b/test/files/buildmanager/t2657/A.scala @@ -0,0 +1,3 @@ +class A { + implicit def y(i: Int): String = i.toString +} diff --git a/test/files/buildmanager/t2657/B.scala b/test/files/buildmanager/t2657/B.scala new file mode 100644 index 0000000000..77869890db --- /dev/null +++ b/test/files/buildmanager/t2657/B.scala @@ -0,0 +1,4 @@ +object B extends A { + val x: String = 3 +} + diff --git a/test/files/buildmanager/t2657/t2657.changes/A2.scala b/test/files/buildmanager/t2657/t2657.changes/A2.scala new file mode 100644 index 0000000000..7dc99d425e --- /dev/null +++ b/test/files/buildmanager/t2657/t2657.changes/A2.scala @@ -0,0 +1,3 @@ +class A { + def y(i: Int): String = i.toString +} diff --git a/test/files/buildmanager/t2657/t2657.check b/test/files/buildmanager/t2657/t2657.check new file mode 100644 index 0000000000..9713f66024 --- /dev/null +++ b/test/files/buildmanager/t2657/t2657.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(class A -> List(Changed(Definition(A.y))[method y changed from (i: Int)java.lang.String to (i: Int)java.lang.String flags: implicit <method>])) +invalidate B.scala because inherited method changed [Changed(Definition(A.y))[method y changed from (i: Int)java.lang.String to (i: Int)java.lang.String flags: implicit <method>]] +compiling Set(B.scala) +B.scala:2: error: type mismatch; + found : Int(3) + required: String + val x: String = 3 + ^ diff --git a/test/files/buildmanager/t2657/t2657.test b/test/files/buildmanager/t2657/t2657.test new file mode 100644 index 0000000000..6f3bd03361 --- /dev/null +++ b/test/files/buildmanager/t2657/t2657.test @@ -0,0 +1,3 @@ +>>compile A.scala B.scala +>>update A.scala=>A2.scala +>>compile A.scala |