diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-09-14 10:41:55 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-09-17 20:26:08 +0200 |
| commit | 6854842cf88f020289b783983d13ebef4d7605f4 (patch) | |
| tree | f0cbba527845335526250cac11371fc369b44319 /test/files | |
| parent | 4ed7a60caf3648571de9a120e095f9cf3a0151c4 (diff) | |
| download | scala-6854842cf88f020289b783983d13ebef4d7605f4.tar.gz scala-6854842cf88f020289b783983d13ebef4d7605f4.tar.bz2 scala-6854842cf88f020289b783983d13ebef4d7605f4.zip | |
Revert "Fixes SI-6236."
This reverts commit faa114e2fb6003031efa2cdd56a32a3c44aa71fb.
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/run/static-annot/field.scala | 13 | ||||
| -rw-r--r-- | test/files/run/t6236.check | 2 | ||||
| -rw-r--r-- | test/files/run/t6236/file_1.scala | 9 | ||||
| -rw-r--r-- | test/files/run/t6236/file_2.scala | 10 |
4 files changed, 2 insertions, 32 deletions
diff --git a/test/files/run/static-annot/field.scala b/test/files/run/static-annot/field.scala index 8408a51800..a7d8158321 100644 --- a/test/files/run/static-annot/field.scala +++ b/test/files/run/static-annot/field.scala @@ -23,10 +23,8 @@ class Foo trait Check { def checkStatic(cls: Class[_]) { cls.getDeclaredFields.find(_.getName == "bar") match { - case Some(f) => - assert(Modifier.isStatic(f.getModifiers), "no static modifier") - case None => - assert(false, "no static field bar in class") + case Some(f) => assert(Modifier.isStatic(f.getModifiers), "no static modifier") + case None => assert(false, "no static field bar in class") } } @@ -172,10 +170,6 @@ object Foo7 { @static val bar = "string" } class AndHisFriend - - object AndHisLonelyFriend { - @static val bar = "another" - } } @@ -183,9 +177,6 @@ object Test7 extends Check { def test() { checkStatic(classOf[Foo7.AndHisFriend]) assert(Foo7.AndHisFriend.bar == "string") - - checkStatic(Class.forName("Foo7$AndHisLonelyFriend")) - assert(Foo7.AndHisLonelyFriend.bar == "another") } } diff --git a/test/files/run/t6236.check b/test/files/run/t6236.check deleted file mode 100644 index a0a2e88d0a..0000000000 --- a/test/files/run/t6236.check +++ /dev/null @@ -1,2 +0,0 @@ -353 -353
\ No newline at end of file diff --git a/test/files/run/t6236/file_1.scala b/test/files/run/t6236/file_1.scala deleted file mode 100644 index 92d22799fc..0000000000 --- a/test/files/run/t6236/file_1.scala +++ /dev/null @@ -1,9 +0,0 @@ - - -package p { - object y { - object x { - @scala.annotation.static val foo: Int = 353 - } - } -} diff --git a/test/files/run/t6236/file_2.scala b/test/files/run/t6236/file_2.scala deleted file mode 100644 index 51823004ca..0000000000 --- a/test/files/run/t6236/file_2.scala +++ /dev/null @@ -1,10 +0,0 @@ - - - -object Test { - def main(args: Array[String]): Unit = { - println(p.y.x.foo) - println(p.y.x.foo) - } -} - |