From e1af9737d0e68a5a14e2837e14b91ad3bd93f0fb Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <eugene.vigdorchik@gmail.com>
Date: Wed, 10 Apr 2013 16:58:07 +0400
Subject: Remove scaladoc deprecated option.

Remove -external-urls that had been previously deprecated in 2.10.
---
 test/scaladoc/run/SI-191-deprecated.check |  1 -
 test/scaladoc/run/SI-191-deprecated.scala | 72 -------------------------------
 2 files changed, 73 deletions(-)
 delete mode 100755 test/scaladoc/run/SI-191-deprecated.check
 delete mode 100755 test/scaladoc/run/SI-191-deprecated.scala

(limited to 'test/scaladoc')

diff --git a/test/scaladoc/run/SI-191-deprecated.check b/test/scaladoc/run/SI-191-deprecated.check
deleted file mode 100755
index 3925a0d464..0000000000
--- a/test/scaladoc/run/SI-191-deprecated.check
+++ /dev/null
@@ -1 +0,0 @@
-Done.
\ No newline at end of file
diff --git a/test/scaladoc/run/SI-191-deprecated.scala b/test/scaladoc/run/SI-191-deprecated.scala
deleted file mode 100755
index 4ed24ff8d1..0000000000
--- a/test/scaladoc/run/SI-191-deprecated.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-import scala.tools.nsc.doc.model._
-import scala.tools.nsc.doc.base._
-import scala.tools.nsc.doc.base.comment._
-import scala.tools.partest.ScaladocModelTest
-import java.net.{URI, URL}
-import java.io.File
-
-object Test extends ScaladocModelTest {
-
-  override def code =
-    """
-        /** See:
-         *  - [[scala.collection.Map]] Simple linking
-         *  - [[scala.collection.immutable.::]] Linking with symbolic name
-         *  - [[scala.Int]].toLong Linking to a class
-         *  - [[scala.Predef]] Linking to an object
-         *  - [[scala.Int.toLong]] Linking to a method
-         *  - [[scala]] Linking to a package
-         *  - [[scala.AbstractMethodError]] Linking to a member in the package object
-         *  - [[scala.Predef.String]] Linking to a member in an object
-         *
-         *  Don't look at:
-         *  - [[scala.NoLink]] Not linking :)
-         */
-        object Test {
-          def foo(param: Any) {}
-          def barr(l: scala.collection.immutable.List[Any]) {}
-          def bar(l: List[String]) {}   // TODO: Should be able to link to type aliases
-          def baz(d: java.util.Date) {} // Should not be resolved
-        }
-    """
-
-  def scalaURL = "http://bog.us"
-
-  override def scaladocSettings =  "-no-link-warnings -external-urls scala=" + scalaURL
-
-  def testModel(rootPackage: Package) {
-    import access._
-    val test = rootPackage._object("Test")
-
-    def check(memberDef: Def, expected: Int) {
-      val externals = memberDef.valueParams(0)(0).resultType.refEntity collect {
-        case (_, (LinkToExternal(name, url), _)) => assert(url.contains(scalaURL)); name
-      }
-      assert(externals.size == expected)
-    }
-
-    check(test._method("foo"), 1)
-    check(test._method("bar"), 0)
-    check(test._method("barr"), 2)
-    check(test._method("baz"), 0)
-
-    val expectedUrls = collection.mutable.Set[String](
-                         "scala.collection.Map",
-                         "scala.collection.immutable.::",
-                         "scala.Int",
-                         "scala.Predef$",
-                         "scala.Int@toLong:Long",
-                         "scala.package",
-                         "scala.package@AbstractMethodError=AbstractMethodError",
-                         "scala.Predef$@String=String"
-                       ).map(scalaURL + "/index.html#" + _)
-
-    def isExpectedExternalLink(l: EntityLink) = l.link match {
-      case LinkToExternal(name, url) => assert(expectedUrls contains url, url); true
-      case _ => false
-    }
-
-    assert(countLinks(test.comment.get, isExpectedExternalLink) == 8,
-           countLinks(test.comment.get, isExpectedExternalLink) + " == 8")
-  }
-}
-- 
cgit v1.2.3