diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/disabled/run/t7843-jsr223-service.check (renamed from test/files/run/t7843-jsr223-service.check) | 0 | ||||
-rw-r--r-- | test/disabled/run/t7843-jsr223-service.scala (renamed from test/files/run/t7843-jsr223-service.scala) | 0 | ||||
-rw-r--r-- | test/disabled/run/t7933.check (renamed from test/files/run/t7933.check) | 0 | ||||
-rw-r--r-- | test/disabled/run/t7933.scala (renamed from test/files/run/t7933.scala) | 0 | ||||
-rw-r--r-- | test/osgi/src/logback.xml | 10 | ||||
-rw-r--r-- | test/scaladoc/.gitignore | 2 | ||||
-rw-r--r-- | test/scaladoc/run/SI-191.scala | 12 | ||||
-rw-r--r-- | test/scaladoc/run/t8557.scala | 20 |
8 files changed, 37 insertions, 7 deletions
diff --git a/test/files/run/t7843-jsr223-service.check b/test/disabled/run/t7843-jsr223-service.check index a668df3567..a668df3567 100644 --- a/test/files/run/t7843-jsr223-service.check +++ b/test/disabled/run/t7843-jsr223-service.check diff --git a/test/files/run/t7843-jsr223-service.scala b/test/disabled/run/t7843-jsr223-service.scala index 3c853878ba..3c853878ba 100644 --- a/test/files/run/t7843-jsr223-service.scala +++ b/test/disabled/run/t7843-jsr223-service.scala diff --git a/test/files/run/t7933.check b/test/disabled/run/t7933.check index 317e9677c3..317e9677c3 100644 --- a/test/files/run/t7933.check +++ b/test/disabled/run/t7933.check diff --git a/test/files/run/t7933.scala b/test/disabled/run/t7933.scala index 58e39dd384..58e39dd384 100644 --- a/test/files/run/t7933.scala +++ b/test/disabled/run/t7933.scala diff --git a/test/osgi/src/logback.xml b/test/osgi/src/logback.xml new file mode 100644 index 0000000000..692ccbfdd9 --- /dev/null +++ b/test/osgi/src/logback.xml @@ -0,0 +1,10 @@ +<configuration> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>*** \(%logger{30}\)%green(%X{debugId}) %msg%n</pattern> + </encoder> + </appender> + <root level="${log.root:-warn}"> + <appender-ref ref="STDOUT" /> + </root> +</configuration> diff --git a/test/scaladoc/.gitignore b/test/scaladoc/.gitignore new file mode 100644 index 0000000000..161be5b55f --- /dev/null +++ b/test/scaladoc/.gitignore @@ -0,0 +1,2 @@ +*.log +*.obj/ diff --git a/test/scaladoc/run/SI-191.scala b/test/scaladoc/run/SI-191.scala index 29b1e7dd29..f3d269ceb0 100644 --- a/test/scaladoc/run/SI-191.scala +++ b/test/scaladoc/run/SI-191.scala @@ -33,10 +33,14 @@ object Test extends ScaladocModelTest { def scalaURL = "http://bog.us" override def scaladocSettings = { - 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 + val samplePath = getClass.getClassLoader.getResource("scala/Function1.class").getPath + val scalaLibPath = if(samplePath.contains("!")) { // in scala-library.jar + val scalaLibUri = samplePath.split("!")(0) + new URI(scalaLibUri).getPath + } else { // individual class files on disk + samplePath.replace('\\', '/').dropRight("scala/Function1.class".length) + } + s"-no-link-warnings -doc-external-doc $scalaLibPath#$scalaURL" } def testModel(rootPackage: Package) { diff --git a/test/scaladoc/run/t8557.scala b/test/scaladoc/run/t8557.scala index 451f004d7d..7876896bb7 100644 --- a/test/scaladoc/run/t8557.scala +++ b/test/scaladoc/run/t8557.scala @@ -1,3 +1,5 @@ +import java.net.URI + import scala.tools.nsc.doc.base._ import scala.tools.nsc.doc.model._ import scala.tools.partest.ScaladocModelTest @@ -15,10 +17,22 @@ object Test extends ScaladocModelTest { class A """ + def scalaURL = "http://www.scala-lang.org/api/current/" + // a non-canonical path to scala-library.jar should still work - // this is a bit fragile (depends on the current directory being the root of the repo ; - // ant & partest seem to do that properly) - def scaladocSettings = "-doc-external-doc build/pack/bin/../lib/scala-library.jar#http://www.scala-lang.org/api/current/" + override def scaladocSettings = { + val samplePath = getClass.getClassLoader.getResource("scala/Function1.class").getPath.replace('\\', '/') + val scalaLibPath = if(samplePath.contains("!")) { // in scala-library.jar + val scalaLibUri = samplePath.split("!")(0) + val p = new URI(scalaLibUri).getPath + // this is a bit fragile (depends on the scala library being in build/pack as produced by ant) + p.replace("/pack/lib/scala-library.jar", "/pack/bin/../lib/scala-library.jar") + } else { // individual class files on disk + val p = samplePath.dropRight("scala/Function1.class".length + 1) + p + "/.." + p.takeRight(p.length - p.lastIndexOf('/')) + } + s"-doc-external-doc $scalaLibPath#$scalaURL" + } def testModel(rootPackage: Package) = { // get the quick access implicit defs in scope (_package(s), _class(es), _trait(s), object(s) _method(s), _value(s)) |