summaryrefslogtreecommitdiff
path: root/test/scaladoc
diff options
context:
space:
mode:
authorKato Kazuyoshi <kato.kazuyoshi@gmail.com>2011-10-06 13:53:26 +0000
committerKato Kazuyoshi <kato.kazuyoshi@gmail.com>2011-10-06 13:53:26 +0000
commit77aae5843ab901340aa410e7c7dd20034238ef7e (patch)
treec12e1414ec9de0c500879fa5d2068d9a48ede295 /test/scaladoc
parent0afd6d1b192900f2a0cda3a8fa3d8498ded91d5f (diff)
downloadscala-77aae5843ab901340aa410e7c7dd20034238ef7e.tar.gz
scala-77aae5843ab901340aa410e7c7dd20034238ef7e.tar.bz2
scala-77aae5843ab901340aa410e7c7dd20034238ef7e.zip
Add "Google tokens for Scala" for symbolic name...
Add "Google tokens for Scala" for symbolic names on Scaladoc. Review by ureche. We can't use Scala's symbolic names on Google. Instead of waiting Google, we'll introduce mapping from the names to equivalent searchable representations. This idea proposed by Grzegorz Kossakowski. https://groups.google.com/group/scala-internals/browse_thread/thread/413 dbc691542f76f
Diffstat (limited to 'test/scaladoc')
-rw-r--r--test/scaladoc/resources/basic.scala7
-rw-r--r--test/scaladoc/scala/html/HtmlFactoryTest.scala10
2 files changed, 15 insertions, 2 deletions
diff --git a/test/scaladoc/resources/basic.scala b/test/scaladoc/resources/basic.scala
index 8645efd818..00db6669b4 100644
--- a/test/scaladoc/resources/basic.scala
+++ b/test/scaladoc/resources/basic.scala
@@ -8,6 +8,13 @@ package com.example.p1 {
class Clazz {
def foo = packageObjectMethod
implicit def intToClass1(n: Int) = new Clazz
+
+ @deprecated("This method is deprecated.")
+ def depracatedMethod = 0
+
+ // Google Token for Scala
+ def :: = 0
+ @deprecated("This method is deprecated.") def :::: = 0
}
class UpperBound[T <: Int]
diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala
index 2c81be5d08..f265ddc8cf 100644
--- a/test/scaladoc/scala/html/HtmlFactoryTest.scala
+++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala
@@ -141,8 +141,8 @@ object Test extends Properties("HtmlFactory") {
createTemplate("Trac4372.scala") match {
case node: scala.xml.Node => {
val html = node.toString
- html.contains("<span class=\"name\">+:</span>\n") &&
- html.contains("<span class=\"name\">-:</span>\n") &&
+ html.contains("<span class=\"name\" title=\"gt4s: $plus$colon\">+:</span>\n") &&
+ html.contains("<span class=\"name\" title=\"gt4s: $minus$colon\">-:</span>\n") &&
html.contains("""<span class="params">(<span name="n">n: <span name="scala.Int" class="extype">Int</span></span>)</span><span class="result">: <span name="scala.Int" class="extype">Int</span></span>""")
}
case _ => false
@@ -381,6 +381,12 @@ object Test extends Properties("HtmlFactory") {
case Some(node: scala.xml.Node) => {
property("implicit convertion") =
node.toString contains "<span class=\"modifier\">implicit </span>"
+
+ property("gt4s") =
+ node.toString contains "title=\"gt4s: $colon$colon\""
+
+ property("gt4s of a deprecated method") =
+ node.toString contains "title=\"gt4s: $colon$colon$colon$colon. Deprecated: "
true
}
case _ => false