diff options
author | Paul Phillips <paulp@improving.org> | 2010-12-11 14:57:06 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-12-11 14:57:06 +0000 |
commit | 262ee3a852f278f97b083a05376de0eab96c805d (patch) | |
tree | 482c62113aeb64e1bc7170610a958d58ec60cd19 /test/files/run/t3897 | |
parent | 4cfcc156f404f574451d2ddcaf62326d32d0ef95 (diff) | |
download | scala-262ee3a852f278f97b083a05376de0eab96c805d.tar.gz scala-262ee3a852f278f97b083a05376de0eab96c805d.tar.bz2 scala-262ee3a852f278f97b083a05376de0eab96c805d.zip |
When was the last time -Xcheckinit was run? It ...
When was the last time -Xcheckinit was run? It must have been a long
time. All these changes are to address bugs revealed by -Xcheckinit,
mostly in test cases, some in the compiler. I'm guessing the partest
-Xcheckinit runs are hanging the first time they run into a failure, so
if it starts "working" again after this commit don't get too confident.
No review.
Diffstat (limited to 'test/files/run/t3897')
-rw-r--r-- | test/files/run/t3897/J_2.java | 8 | ||||
-rw-r--r-- | test/files/run/t3897/a_2.scala | 14 |
2 files changed, 18 insertions, 4 deletions
diff --git a/test/files/run/t3897/J_2.java b/test/files/run/t3897/J_2.java index 5d5131737e..a4c9a98fb1 100644 --- a/test/files/run/t3897/J_2.java +++ b/test/files/run/t3897/J_2.java @@ -4,13 +4,17 @@ public class J_2 { public void f1(Class<?> clazz) { Field[] fields = clazz.getDeclaredFields(); for (int i = 0 ; i < fields.length; i++) { - System.out.println("(" + fields[i].getName() + "," + fields[i].getGenericType() + ")"); + String name = fields[i].getName(); + if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { } + else System.out.println("(" + name + "," + fields[i].getGenericType() + ")"); } } public void f2(Class<?> clazz) { Method[] methods = clazz.getDeclaredMethods(); for (int i = 0 ; i < methods.length; i++) { - System.out.println("(" + methods[i].getName() + "," + methods[i].getGenericReturnType() + ")"); + String name = methods[i].getName(); + if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { } + else System.out.println("(" + name + "," + methods[i].getGenericReturnType() + ")"); } } diff --git a/test/files/run/t3897/a_2.scala b/test/files/run/t3897/a_2.scala index da5f8df63e..7a161fcbe4 100644 --- a/test/files/run/t3897/a_2.scala +++ b/test/files/run/t3897/a_2.scala @@ -1,6 +1,16 @@ object Test { - def f1(clazz: Class[_]) = clazz.getDeclaredFields.toList map (f => (f.getName, f.getGenericType)) foreach println - def f2(clazz: Class[_]) = clazz.getDeclaredMethods.toList map (f => (f.getName, f.getGenericReturnType)) foreach println + def f1(clazz: Class[_]) = ( + clazz.getDeclaredFields.toList + . filterNot (_.getName contains "bitmap$") + . map (f => (f.getName, f.getGenericType)) + . foreach (println) + ) + def f2(clazz: Class[_]) = ( + clazz.getDeclaredMethods.toList + . filterNot (_.getName contains "bitmap$") + . map (f => (f.getName, f.getGenericReturnType)) + . foreach (println) + ) def main(args: Array[String]): Unit = { f1(classOf[One]) |