diff options
author | Paul Phillips <paulp@improving.org> | 2012-08-21 08:21:53 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-08-21 08:21:53 -0700 |
commit | 376427590178989e1eefd2bf12123399169c3235 (patch) | |
tree | 6fffcb2da40a43a25600a341fd7153dafa09df2c /test | |
parent | d70e41fabd540a1c9f244d9d82227a249b8712a5 (diff) | |
parent | dfc6928383dbeddf4e24560ae24556717abb751b (diff) | |
download | scala-376427590178989e1eefd2bf12123399169c3235.tar.gz scala-376427590178989e1eefd2bf12123399169c3235.tar.bz2 scala-376427590178989e1eefd2bf12123399169c3235.zip |
Merge pull request #1176 from scalamacros/topic/nondeterministic
fixes non-determinism in reflection-sorted-decls
Diffstat (limited to 'test')
-rw-r--r-- | test/files/run/reflection-sorted-decls.check | 4 | ||||
-rw-r--r-- | test/files/run/reflection-sorted-decls.scala | 2 | ||||
-rw-r--r-- | test/files/run/reflection-sorted-members.check | 30 | ||||
-rw-r--r-- | test/files/run/reflection-sorted-members.scala | 2 |
4 files changed, 2 insertions, 36 deletions
diff --git a/test/files/run/reflection-sorted-decls.check b/test/files/run/reflection-sorted-decls.check index 9a9832a683..02168c4e5f 100644 --- a/test/files/run/reflection-sorted-decls.check +++ b/test/files/run/reflection-sorted-decls.check @@ -1,7 +1,3 @@ value a
value b
value c
-method c
-method b
-method a
-constructor Foo$1
diff --git a/test/files/run/reflection-sorted-decls.scala b/test/files/run/reflection-sorted-decls.scala index 242f17d9bb..5616e10b3b 100644 --- a/test/files/run/reflection-sorted-decls.scala +++ b/test/files/run/reflection-sorted-decls.scala @@ -3,6 +3,6 @@ object Test { class Foo(val a: Int, val b: Int, val c: Int) import scala.reflect.runtime.{currentMirror => cm} val decls = cm.classSymbol(classOf[Foo]).typeSignature.declarations - decls.sorted.toList foreach System.out.println + decls.sorted.toList.filter(!_.isMethod) foreach System.out.println } } diff --git a/test/files/run/reflection-sorted-members.check b/test/files/run/reflection-sorted-members.check index d58b691c42..bb85b5a13c 100644 --- a/test/files/run/reflection-sorted-members.check +++ b/test/files/run/reflection-sorted-members.check @@ -1,34 +1,4 @@ value a
value b
value c
-method c
-method b
-method a
-constructor Foo$1
value x
-method x
-constructor Bar$1
-method finalize
-method wait
-method wait
-method wait
-method equals
-method toString
-method hashCode
-method getClass
-method clone
-method notify
-method notifyAll
-constructor Object
-method eq
-method ne
-method ==
-method !=
-method ##
-method synchronized
-method $isInstanceOf
-method $asInstanceOf
-method ==
-method !=
-method isInstanceOf
-method asInstanceOf
diff --git a/test/files/run/reflection-sorted-members.scala b/test/files/run/reflection-sorted-members.scala index 9980d79999..a8379234c0 100644 --- a/test/files/run/reflection-sorted-members.scala +++ b/test/files/run/reflection-sorted-members.scala @@ -6,6 +6,6 @@ object Test { class Foo(val a: Int, val b: Int, val c: Int) extends Bar(a + b + c) with T1 with T2 import scala.reflect.runtime.{currentMirror => cm} val members = cm.classSymbol(classOf[Foo]).typeSignature.members - members.sorted.toList foreach System.out.println + members.sorted.toList.filter(!_.isMethod) foreach System.out.println } } |