diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2011-04-13 08:14:26 +0000 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2011-04-13 08:14:26 +0000 |
commit | 260a41241e7c4bde3280fb80d2a509102c77c114 (patch) | |
tree | 19550796656b3688c2cb10ffd354e424541387fa /test | |
parent | 825f3691fae26d3cc54dc04b4a559d197c46f780 (diff) | |
download | scala-260a41241e7c4bde3280fb80d2a509102c77c114.tar.gz scala-260a41241e7c4bde3280fb80d2a509102c77c114.tar.bz2 scala-260a41241e7c4bde3280fb80d2a509102c77c114.zip |
Merged revisions 24727-24728,24730-24734,24736-...
Merged revisions 24727-24728,24730-24734,24736-24746 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r24727 | odersky | 2011-04-11 12:49:20 +0200 (Mon, 11 Apr 2011) | 1 line
Closes #4390, unfortunately by taking the stricter standpoint. No
review. ........ r24728 | odersky | 2011-04-11 12:50:59 +0200 (Mon, 11
Apr 2011) | 1 line
FreshRunReq's are no longer suppressed when thrown in a
respondGradually. ........ r24730 | malayeri | 2011-04-11 14:20:07 +0200
(Mon, 11 Apr 2011) | 1 line
[scaladoc] Improve visual design and layout of Scaladoc, using
contributions from Heather Miller. No review. ........ r24731 | malayeri
| 2011-04-11 14:22:12 +0200 (Mon, 11 Apr 2011) | 1 line
[scaladoc] Add missing file. No review.
........
r24732 | kzys | 2011-04-11 15:52:29 +0200 (Mon, 11 Apr 2011) | 2 lines
[scaladoc] Closes #4452. Review by malayeri.
........
r24733 | kzys | 2011-04-11 15:53:45 +0200 (Mon, 11 Apr 2011) | 2 lines
[scaladoc] Forget to add test case at r24732. No review. ........
r24734 | odersky | 2011-04-11 16:50:57 +0200 (Mon, 11 Apr 2011) | 1 line
Closes #4402. Review by plocinic.
........
r24736 | extempore | 2011-04-11 22:20:04 +0200 (Mon, 11 Apr 2011) | 2 lines
Pulled daemonized from the process API based on input from harrah. No
review. ........ r24737 | odersky | 2011-04-12 16:40:34 +0200 (Tue, 12
Apr 2011) | 1 line
Ensured invariant that notPRIVATE can be set only for PRIVATE members.
........ r24738 | dragos | 2011-04-12 16:42:10 +0200 (Tue, 12 Apr 2011)
| 2 lines
Made the 'onCompilerThread' flag a field, correctly indicating wether
the work item was asked from the compiler thread or not. Fixes issues in
the IDE. no review. ........ r24739 | kzys | 2011-04-12 16:48:39 +0200
(Tue, 12 Apr 2011) | 2 lines
[scaladoc] Closes #4452 again. Review by malayeri. ........ r24740 |
odersky | 2011-04-12 18:08:27 +0200 (Tue, 12 Apr 2011) | 1 line
Closes #4275. Review by plocinic since this is the first code that
treats errors as trees. As discussed, it would be good to use this
pattern more systematically. ........ r24741 | odersky | 2011-04-12
18:18:27 +0200 (Tue, 12 Apr 2011) | 1 line
Added test to pending.
........
r24742 | plocinic | 2011-04-12 19:12:24 +0200 (Tue, 12 Apr 2011) | 1 line
Closes #4432. review by dragos
........
r24743 | plocinic | 2011-04-12 19:12:29 +0200 (Tue, 12 Apr 2011) | 1 line
closes #4426. name mangling for private lazy vals that are lifted
during explicitouter is now taken into account. this also handles lazy
vals/objects inside anonymous classes. review by dragos. ........ r24744
| extempore | 2011-04-13 05:25:51 +0200 (Wed, 13 Apr 2011) | 2 lines
An alteration to r24740 to fix failing test files/neg/sensitive.scala.
Review by odersky. ........ r24745 | extempore | 2011-04-13 05:26:10
+0200 (Wed, 13 Apr 2011) | 2 lines
An alteration to r24740 to fix failing test
files/neg/protected-constructors. Review by odersky. ........ r24746 |
extempore | 2011-04-13 05:26:27 +0200 (Wed, 13 Apr 2011) | 2 lines
Test cases for #1071 and #4275 since I don't see a lot of test cases,
hint hint, no review. ........
Diffstat (limited to 'test')
-rw-r--r-- | test/files/pos/t4402/A.scala | 3 | ||||
-rw-r--r-- | test/files/pos/t4402/Bar.java | 7 | ||||
-rw-r--r-- | test/files/pos/t4402/Foo.java | 8 | ||||
-rw-r--r-- | test/pending/run/t4283/AbstractFoo.java | 5 | ||||
-rw-r--r-- | test/pending/run/t4283/IllegalAccess.scala | 5 | ||||
-rw-r--r-- | test/pending/run/t4283/ScalaBipp.scala | 5 | ||||
-rw-r--r-- | test/scaladoc/scala/html/HtmlFactoryTest.scala | 8 |
7 files changed, 41 insertions, 0 deletions
diff --git a/test/files/pos/t4402/A.scala b/test/files/pos/t4402/A.scala new file mode 100644 index 0000000000..f43f0865f0 --- /dev/null +++ b/test/files/pos/t4402/A.scala @@ -0,0 +1,3 @@ +package ohmy + +class A extends other.Bar diff --git a/test/files/pos/t4402/Bar.java b/test/files/pos/t4402/Bar.java new file mode 100644 index 0000000000..edc00a5fd1 --- /dev/null +++ b/test/files/pos/t4402/Bar.java @@ -0,0 +1,7 @@ +package other; + +public class Bar extends test.Foo { + void createMeSth(test.Foo.Inner aaa) { + aaa.hello(); + } +} diff --git a/test/files/pos/t4402/Foo.java b/test/files/pos/t4402/Foo.java new file mode 100644 index 0000000000..585a5e0a2c --- /dev/null +++ b/test/files/pos/t4402/Foo.java @@ -0,0 +1,8 @@ +package test; + +public abstract class Foo { + protected interface Inner { + public void hello(); + } +} + diff --git a/test/pending/run/t4283/AbstractFoo.java b/test/pending/run/t4283/AbstractFoo.java new file mode 100644 index 0000000000..6d4e8f4e22 --- /dev/null +++ b/test/pending/run/t4283/AbstractFoo.java @@ -0,0 +1,5 @@ +package test; + +/* package private */ class AbstractFoo { + public int t; +}
\ No newline at end of file diff --git a/test/pending/run/t4283/IllegalAccess.scala b/test/pending/run/t4283/IllegalAccess.scala new file mode 100644 index 0000000000..e1bce15cf8 --- /dev/null +++ b/test/pending/run/t4283/IllegalAccess.scala @@ -0,0 +1,5 @@ +package other + +object IllegalAccess { + val x = (new test.ScalaBipp).make.get.t // java.lang.IllegalAccessError: tried to access class test.AbstractFoo from class other.IllegalAccess$ +} diff --git a/test/pending/run/t4283/ScalaBipp.scala b/test/pending/run/t4283/ScalaBipp.scala new file mode 100644 index 0000000000..36dea9f4de --- /dev/null +++ b/test/pending/run/t4283/ScalaBipp.scala @@ -0,0 +1,5 @@ +package test + +class ScalaBipp extends AbstractFoo { + def make: Option[ScalaBipp] = Option(this) +} diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala index c0a3f1ad95..15f5249c90 100644 --- a/test/scaladoc/scala/html/HtmlFactoryTest.scala +++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala @@ -266,4 +266,12 @@ object Test extends Properties("HtmlFactory") { case _ => false } } + + property("Trac #4452") = { + createTemplate("Trac4452.scala") match { + case node: scala.xml.Node => + ! node.toString.contains(">*") + case _ => false + } + } } |