summaryrefslogtreecommitdiff
path: root/test/scaladoc
diff options
context:
space:
mode:
authorVlad Ureche <vlad.ureche@gmail.com>2012-03-23 17:34:54 +0100
committerVlad Ureche <vlad.ureche@gmail.com>2012-03-23 17:34:54 +0100
commitdd2f367dc658aea30f108a8fb0f260a593b98e6e (patch)
tree14d21351aa94b299adb74099271a84abaa043665 /test/scaladoc
parentd26a92b5351ef31307b4c2c50657140e281979f3 (diff)
downloadscala-dd2f367dc658aea30f108a8fb0f260a593b98e6e.tar.gz
scala-dd2f367dc658aea30f108a8fb0f260a593b98e6e.tar.bz2
scala-dd2f367dc658aea30f108a8fb0f260a593b98e6e.zip
Adapted scaladoc test
Diffstat (limited to 'test/scaladoc')
-rw-r--r--test/scaladoc/scala/html/HtmlFactoryTest.scala15
1 files changed, 9 insertions, 6 deletions
diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala
index 7550faa536..28c7a4b94f 100644
--- a/test/scaladoc/scala/html/HtmlFactoryTest.scala
+++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala
@@ -442,8 +442,9 @@ object Test extends Properties("HtmlFactory") {
property("Use cases should override their original members") =
checkText("SI_5054_q1.scala")(
- (None,"""def test(): Int""", true),
- (None,"""def test(implicit lost: Int): Int""", false)
+ (None,"""def test(): Int""", true)
+ //Disabled because the full signature is now displayed
+ //(None,"""def test(implicit lost: Int): Int""", false)
)
property("Use cases should keep their flags - final should not be lost") =
@@ -599,8 +600,9 @@ object Test extends Properties("HtmlFactory") {
T StartT the type of the first argument EndT
arg1 Start1 The T term comment End1
arg2 Start2 The string comment End2
- returns StartRet The return comment EndRet
- Definition Classes InheritDocDerived → InheritDocBase
+ returns StartRet The return comment EndRet""", true),
+ (Some("InheritDocDerived"),
+ """Definition Classes InheritDocDerived → InheritDocBase
Example: StartExample function[Int](3, "something") EndExample
Version StartVer 0.0.2 EndVer
Since StartSince 0.0.1 EndSince
@@ -624,8 +626,9 @@ object Test extends Properties("HtmlFactory") {
T StartT the type of the first argument EndT
arg1 Start1 The T term comment End1
arg2 Start2 The string comment End2
- returns StartRet The return comment EndRet
- Example: StartExample function[Int](3,"something") EndExample
+ returns StartRet The return comment EndRet""", true),
+ (Some("UseCaseInheritDoc"),
+ """Example: StartExample function[Int](3,"something") EndExample
Version StartVer 0.0.2 EndVer
Since StartSince 0.0.1 EndSince
Exceptions thrown