diff options
author | Paul Phillips <paulp@improving.org> | 2011-03-22 04:28:21 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-03-22 04:28:21 +0000 |
commit | 063e8a9dfee3d2c889f9e2e28cda2e8a28aa61cc (patch) | |
tree | 6b71b04f71cc2eacea4f0464c22b29c823337e96 /test/files/pos | |
parent | 971653e40d8273d300bba17e1d25bf282dad6e5e (diff) | |
download | scala-063e8a9dfee3d2c889f9e2e28cda2e8a28aa61cc.tar.gz scala-063e8a9dfee3d2c889f9e2e28cda2e8a28aa61cc.tar.bz2 scala-063e8a9dfee3d2c889f9e2e28cda2e8a28aa61cc.zip |
Not yet learned my lesson about partest and emp...
Not yet learned my lesson about partest and empty directories. Rather
than reapply that bandaid, went after partest. Attempts to make partest
ignore empty directories. Discover directory tests aren't run when the
command line tool is used, make them run like everyone else. Find more
tests which due to misplacement are silently ignored, move them into
tested locations. No review.
Diffstat (limited to 'test/files/pos')
-rw-r--r-- | test/files/pos/bug3938/Parent.java | 9 | ||||
-rw-r--r-- | test/files/pos/bug3938/UseParent.scala | 7 | ||||
-rw-r--r-- | test/files/pos/t3622/AsyncTask.java (renamed from test/files/pos/t3622/test/AsyncTask.java) | 0 | ||||
-rw-r--r-- | test/files/pos/t3622/MyAsyncTask.java (renamed from test/files/pos/t3622/test/MyAsyncTask.java) | 0 | ||||
-rw-r--r-- | test/files/pos/t3622/Test.scala (renamed from test/files/pos/t3622/test/Test.scala) | 0 |
5 files changed, 16 insertions, 0 deletions
diff --git a/test/files/pos/bug3938/Parent.java b/test/files/pos/bug3938/Parent.java new file mode 100644 index 0000000000..08fae330bb --- /dev/null +++ b/test/files/pos/bug3938/Parent.java @@ -0,0 +1,9 @@ +public class Parent<A>{ + class I1 {} + class I2 extends Parent.I1 {} + + // OKAY: + class I3 extends I1 {} + static class I4 {} + static class I5 extends Parent.I4 {} +} diff --git a/test/files/pos/bug3938/UseParent.scala b/test/files/pos/bug3938/UseParent.scala new file mode 100644 index 0000000000..685d1a03a8 --- /dev/null +++ b/test/files/pos/bug3938/UseParent.scala @@ -0,0 +1,7 @@ +object UseParent { + classOf[Parent[AnyRef]#I2] + + // OKAY + classOf[Parent[AnyRef]#I3] + classOf[Parent.I5] +} diff --git a/test/files/pos/t3622/test/AsyncTask.java b/test/files/pos/t3622/AsyncTask.java index cfcea3fe1a..cfcea3fe1a 100644 --- a/test/files/pos/t3622/test/AsyncTask.java +++ b/test/files/pos/t3622/AsyncTask.java diff --git a/test/files/pos/t3622/test/MyAsyncTask.java b/test/files/pos/t3622/MyAsyncTask.java index 9ef4947052..9ef4947052 100644 --- a/test/files/pos/t3622/test/MyAsyncTask.java +++ b/test/files/pos/t3622/MyAsyncTask.java diff --git a/test/files/pos/t3622/test/Test.scala b/test/files/pos/t3622/Test.scala index fb82c581f9..fb82c581f9 100644 --- a/test/files/pos/t3622/test/Test.scala +++ b/test/files/pos/t3622/Test.scala |