Skip to content

Commit 660b525

Browse files
committed
fix tests
1 parent 2a6ab23 commit 660b525

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

src/sbt-test/sbt-api-mappings/all-libraries/build.sbt

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
def assertDownloadableApiDocumentation(url: URL) = {
2-
import java.net.HttpURLConnection
3-
val connection = url.openConnection().asInstanceOf[HttpURLConnection]
4-
try {
5-
assert(
6-
(200 to 399).contains(connection.getResponseCode),
7-
s"Unexpected HTTP response code ${connection.getResponseCode} when fetching $url"
8-
)
9-
} finally {
10-
connection.disconnect()
11-
}
2+
java.lang.System.setProperty("http.agent", "Chrome");
3+
assert(IO.readLinesURL(url).nonEmpty)
124
}
135

146
val check = TaskKey[Unit]("check")
157

168
val scalacheckModuleId = "org.scalacheck" %% "scalacheck" % "1.14.3"
179
check := {
18-
assertDownloadableApiDocumentation(
19-
(apiMappings in Compile in doc).value(scalaInstance.value.libraryJar)
10+
// The expected URL is browsable but not accessible from JRE 8's java.net.HttpURLConnection
11+
val expectedScaladocUrl =
12+
"https://www.scala-lang.org/api/2.13.1/"
13+
14+
assert(
15+
(apiMappings in Compile in doc).value(scalaInstance.value.libraryJar).toString == expectedScaladocUrl
2016
)
21-
assertDownloadableApiDocumentation(
22-
(apiMappings in Test in doc).value(scalaInstance.value.libraryJar)
17+
assert(
18+
(apiMappings in Test in doc).value(scalaInstance.value.libraryJar).toString == expectedScaladocUrl
2319
)
2420

2521
val scalacheckJarName = Artifact.artifactName(
@@ -30,7 +26,6 @@ check := {
3026
val Some((_, url)) =
3127
(apiMappings in Test in doc).value.find(_._1.getName == scalacheckJarName)
3228

33-
// The expected URL is browsable but not accessible from java.net.HttpURLConnection
3429
val expectedUrl =
3530
"https://javadoc.io/page/org.scalacheck/scalacheck_2.13/1.14.3/"
3631
assert(url.toString == expectedUrl)

src/test/scala/com/thoughtworks/sbtApiMappings/BootstrapApiMappingsSpec.scala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ import org.scalatest.wordspec.AnyWordSpec
66

77
class BootstrapApiMappingsSpec extends AnyWordSpec with Matchers {
88
"BootstrapSbtApiMappings" should {
9-
"provide a working default bootstrapJavadocURL" in {
10-
val src = Source.fromURL(BootstrapApiMappings.defaultBootstrapJavadocUrl)
11-
src.take(200).mkString should include("Generated by javadoc")
12-
src.close()
9+
"provide a working default bootstrapJavadocURL including java.lang package" in {
10+
val src = Source.fromURL(raw"${BootstrapApiMappings.defaultBootstrapJavadocUrl}java/lang/package-summary.html")
11+
try {
12+
src.take(200).mkString should include("Generated by javadoc")
13+
} finally {
14+
src.close()
15+
}
1316
}
1417
}
1518
}

0 commit comments

Comments
 (0)