summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-01-08 15:01:03 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-01-08 15:01:03 -0800
commitf219ade08ed8174c7bded654e8070f4b61843513 (patch)
tree1a5a7f2e4745dbd9b26f8e1cff3e553343d06cb3 /test
parent1381cda86ddeca1b9829a9c53ff9372cfd816735 (diff)
parent103a478dfc1b3f918e0643333635e3d8d254a9a0 (diff)
downloadscala-f219ade08ed8174c7bded654e8070f4b61843513.tar.gz
scala-f219ade08ed8174c7bded654e8070f4b61843513.tar.bz2
scala-f219ade08ed8174c7bded654e8070f4b61843513.zip
Merge pull request #1787 from vigdorchik/si_6803
SI-6803: do not use java.net.URI, even more so incorrectly.
Diffstat (limited to 'test')
-rwxr-xr-xtest/scaladoc/run/SI-191.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/scaladoc/run/SI-191.scala b/test/scaladoc/run/SI-191.scala
index 6fb5339d66..29b1e7dd29 100755
--- a/test/scaladoc/run/SI-191.scala
+++ b/test/scaladoc/run/SI-191.scala
@@ -33,10 +33,10 @@ object Test extends ScaladocModelTest {
def scalaURL = "http://bog.us"
override def scaladocSettings = {
- val scalaLibUri = getClass.getClassLoader.getResource("scala/Function1.class").toURI.getSchemeSpecificPart.split("!")(0)
- val scalaLib = new File(new URL(scalaLibUri).getPath).getPath
- val extArg = new URI("file", scalaLib, scalaURL).toString
- "-no-link-warnings -doc-external-uris " + extArg
+ val scalaLibUri = getClass.getClassLoader.getResource("scala/Function1.class").getPath.split("!")(0)
+ val scalaLibPath = new URI(scalaLibUri).getPath
+ val externalArg = s"$scalaLibPath#$scalaURL"
+ "-no-link-warnings -doc-external-doc " + externalArg
}
def testModel(rootPackage: Package) {