summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-16 04:42:40 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-16 04:42:40 -0700
commit6d0d5054faab2c0d2d4c112def6d58f7965ad69b (patch)
treeab5a75c5139c8260b9a576e09604cc0a1eb0008a /test
parent1cb4ed8484f147830e90fb881a98b3b58edcf1c9 (diff)
parent2c5890b3a7aa227643fde86ba72820a8016bc453 (diff)
downloadscala-6d0d5054faab2c0d2d4c112def6d58f7965ad69b.tar.gz
scala-6d0d5054faab2c0d2d4c112def6d58f7965ad69b.tar.bz2
scala-6d0d5054faab2c0d2d4c112def6d58f7965ad69b.zip
Merge pull request #897 from lrytz/t5956
SI-5956 trigger copy generation with correct namer
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t1286.check6
-rw-r--r--test/files/neg/t5956.check20
-rw-r--r--test/files/neg/t5956.scala2
3 files changed, 23 insertions, 5 deletions
diff --git a/test/files/neg/t1286.check b/test/files/neg/t1286.check
index c937fb9cf1..912709613c 100644
--- a/test/files/neg/t1286.check
+++ b/test/files/neg/t1286.check
@@ -1,9 +1,5 @@
-a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file:
- Found in t1286/b.scala and t1286/a.scala
-trait Foo {
- ^
b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file:
Found in t1286/a.scala and t1286/b.scala
object Foo extends Foo {
^
-two errors found
+one error found
diff --git a/test/files/neg/t5956.check b/test/files/neg/t5956.check
new file mode 100644
index 0000000000..6641dac97f
--- /dev/null
+++ b/test/files/neg/t5956.check
@@ -0,0 +1,20 @@
+t5956.scala:1: warning: case classes without a parameter list have been deprecated;
+use either case objects or case classes with `()' as parameter list.
+object O { case class C[T]; class C }
+ ^
+t5956.scala:2: warning: case classes without a parameter list have been deprecated;
+use either case objects or case classes with `()' as parameter list.
+object T { case class C[T]; case class C }
+ ^
+t5956.scala:2: warning: case classes without a parameter list have been deprecated;
+use either case objects or case classes with `()' as parameter list.
+object T { case class C[T]; case class C }
+ ^
+t5956.scala:1: error: C is already defined as case class C
+object O { case class C[T]; class C }
+ ^
+t5956.scala:2: error: C is already defined as case class C
+object T { case class C[T]; case class C }
+ ^
+three warnings found
+two errors found
diff --git a/test/files/neg/t5956.scala b/test/files/neg/t5956.scala
new file mode 100644
index 0000000000..d985fa97a4
--- /dev/null
+++ b/test/files/neg/t5956.scala
@@ -0,0 +1,2 @@
+object O { case class C[T]; class C }
+object T { case class C[T]; case class C }