summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKato Kazuyoshi <kato.kazuyoshi@gmail.com>2013-03-20 04:10:07 +0900
committerKato Kazuyoshi <kato.kazuyoshi@gmail.com>2013-04-03 00:55:17 +0900
commit5f9bc0570f0e2fc4a80eee592bf2eb3eaddf1390 (patch)
tree1cebe8be1cf22d72222b883c2246fc0b146e9116 /test
parent8e8370362f7c779139a07acaf5de32137dd2ae1b (diff)
downloadscala-5f9bc0570f0e2fc4a80eee592bf2eb3eaddf1390.tar.gz
scala-5f9bc0570f0e2fc4a80eee592bf2eb3eaddf1390.tar.bz2
scala-5f9bc0570f0e2fc4a80eee592bf2eb3eaddf1390.zip
SI-6715 Shouldn't return "" from TermNames.originalName
Diffstat (limited to 'test')
-rw-r--r--test/files/run/t6715.scala15
-rw-r--r--test/scaladoc/run/SI-6715.check1
-rw-r--r--test/scaladoc/run/SI-6715.scala15
3 files changed, 31 insertions, 0 deletions
diff --git a/test/files/run/t6715.scala b/test/files/run/t6715.scala
new file mode 100644
index 0000000000..07ff34218a
--- /dev/null
+++ b/test/files/run/t6715.scala
@@ -0,0 +1,15 @@
+import scala.reflect.runtime.universe._
+
+class A {
+ def $$ = 1
+ def $times = 1
+}
+
+object Test {
+ def main(args: Array[String]): Unit = {
+ val memberSet: Set[String] = typeOf[A].members.map{ _.toString }.toSet
+ assert(memberSet contains "method *")
+ assert(memberSet contains "method $$")
+ assert(! (memberSet contains "method"))
+ }
+}
diff --git a/test/scaladoc/run/SI-6715.check b/test/scaladoc/run/SI-6715.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-6715.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-6715.scala b/test/scaladoc/run/SI-6715.scala
new file mode 100644
index 0000000000..92d3376234
--- /dev/null
+++ b/test/scaladoc/run/SI-6715.scala
@@ -0,0 +1,15 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+ def scaladocSettings = ""
+
+ override def code = "object A { def $$ = 123 }"
+
+ def testModel(rootPackage: Package) = {
+ import access._
+
+ val method = rootPackage._object("A")._method("$$")
+ assert(method != null)
+ }
+}