Skip to content

Commit 82f2228

Browse files
committed
Use non-virtual files in dottydoc tests
To avoid the trying to load virtual files based on their pickled names.
1 parent 11fe765 commit 82f2228

File tree

5 files changed

+38
-36
lines changed

5 files changed

+38
-36
lines changed

doc-tool/test/dotty/tools/dottydoc/ConstructorTest.scala

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ class ConstructorsFromTastyTest extends ConstructorsBase with CheckFromTasty
1414

1515
abstract class ConstructorsBase extends DottyDocTest {
1616
@Test def singleClassConstructor = {
17-
val source = new SourceFile (
18-
"Class.scala",
17+
val source = SourceUtil.makeTemp(
1918
"""
2019
|package scala
2120
|
@@ -38,8 +37,7 @@ abstract class ConstructorsBase extends DottyDocTest {
3837
}
3938

4039
@Test def constructorPlusImplicitArgList = {
41-
val source = new SourceFile (
42-
"Class.scala",
40+
val source = SourceUtil.makeTemp(
4341
"""
4442
|package scala
4543
|
@@ -65,8 +63,7 @@ abstract class ConstructorsBase extends DottyDocTest {
6563
}
6664

6765
@Test def multipleArgumentListsForConstructor = {
68-
val source = new SourceFile (
69-
"Class.scala",
66+
val source = SourceUtil.makeTemp(
7067
"""
7168
|package scala
7269
|
@@ -93,8 +90,7 @@ abstract class ConstructorsBase extends DottyDocTest {
9390
}
9491

9592
@Test def multipleConstructors = {
96-
val source = new SourceFile (
97-
"Class.scala",
93+
val source = SourceUtil.makeTemp(
9894
"""
9995
|package scala
10096
|
@@ -133,8 +129,7 @@ abstract class ConstructorsBase extends DottyDocTest {
133129
}
134130

135131
@Test def multipleConstructorsCC = {
136-
val source = new SourceFile (
137-
"Class.scala",
132+
val source = SourceUtil.makeTemp(
138133
"""
139134
|package scala
140135
|
@@ -174,8 +169,7 @@ abstract class ConstructorsBase extends DottyDocTest {
174169
}
175170

176171
@Test def traitParameters = {
177-
val source = new SourceFile (
178-
"Trait.scala",
172+
val source = SourceUtil.makeTemp(
179173
"""
180174
|package scala
181175
|

doc-tool/test/dotty/tools/dottydoc/PackageStructure.scala

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ class PackageStructureFromTastyTest extends PackageStructureBase with CheckFromT
1313
abstract class PackageStructureBase extends DottyDocTest {
1414

1515
@Test def sourceFileAnnotIsStripped = {
16-
val source = new SourceFile(
17-
"A.scala",
16+
val source = SourceUtil.makeTemp(
1817
"""package scala
1918
|
2019
|/** Some doc */
@@ -33,17 +32,15 @@ abstract class PackageStructureBase extends DottyDocTest {
3332
}
3433

3534
@Test def multipleCompilationUnits = {
36-
val source1 = new SourceFile(
37-
"TraitA.scala",
35+
val source1 = SourceUtil.makeTemp(
3836
"""
3937
|package scala
4038
|
4139
|trait A
4240
""".stripMargin
4341
)
4442

45-
val source2 = new SourceFile(
46-
"TraitB.scala",
43+
val source2 = SourceUtil.makeTemp(
4744
"""
4845
|package scala
4946
|
@@ -67,17 +64,15 @@ abstract class PackageStructureBase extends DottyDocTest {
6764

6865

6966
@Test def multiplePackages = {
70-
val source1 = new SourceFile(
71-
"TraitA.scala",
67+
val source1 = SourceUtil.makeTemp(
7268
"""
7369
|package scala
7470
|package collection
7571
|
7672
|trait A
7773
""".stripMargin)
7874

79-
val source2 = new SourceFile(
80-
"TraitB.scala",
75+
val source2 = SourceUtil.makeTemp(
8176
"""
8277
|package scala
8378
|package collection

doc-tool/test/dotty/tools/dottydoc/SimpleComments.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package dottydoc
33

44
import model.internal._
55
import dotc.util.SourceFile
6+
import dotty.tools.io._
67

78
import org.junit.Test
89
import org.junit.Assert._
@@ -35,8 +36,7 @@ abstract class SimpleCommentsBase extends DottyDocTest {
3536
}
3637

3738
@Test def simpleComment = {
38-
val source = new SourceFile(
39-
"HelloWorld.scala",
39+
val source = SourceUtil.makeTemp(
4040
"""
4141
|package scala
4242
|
@@ -45,6 +45,7 @@ abstract class SimpleCommentsBase extends DottyDocTest {
4545
""".stripMargin
4646
)
4747

48+
4849
val className = "scala.HelloWorld"
4950

5051
check(className :: Nil, source :: Nil) { (ctx, packages) =>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package dotty.tools.dottydoc
2+
3+
import dotty.tools.dotc.util.SourceFile
4+
import dotty.tools.io.{Path, PlainFile}
5+
6+
object SourceUtil {
7+
8+
/** Create a temporary `.scala` source file with the given content */
9+
def makeTemp(content: String): SourceFile = {
10+
val tempFile = java.io.File.createTempFile("dottydoc-test-", ".scala")
11+
tempFile.deleteOnExit()
12+
val file = new PlainFile(Path(tempFile.toPath))
13+
val out = file.output
14+
out.write(content.getBytes)
15+
new SourceFile(file, scala.io.Codec.UTF8)
16+
}
17+
18+
}

doc-tool/test/dotty/tools/dottydoc/UsecaseTest.scala

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ class UsecaseFromTastyTest extends UsecaseBase with CheckFromTasty
1515

1616
abstract class UsecaseBase extends DottyDocTest {
1717
@Test def simpleUsecase = {
18-
val source = new SourceFile(
19-
"DefWithUseCase.scala",
18+
val source = SourceUtil.makeTemp(
2019
"""
2120
|package scala
2221
|
@@ -61,8 +60,7 @@ abstract class UsecaseBase extends DottyDocTest {
6160
}
6261

6362
@Test def simpleUsecaseAddedArg = {
64-
val source = new SourceFile(
65-
"DefWithUseCase.scala",
63+
val source = SourceUtil.makeTemp(
6664
"""
6765
|package scala
6866
|
@@ -108,8 +106,7 @@ abstract class UsecaseBase extends DottyDocTest {
108106
}
109107

110108
@Test def simpleTparamUsecase = {
111-
val source = new SourceFile(
112-
"DefWithUseCase.scala",
109+
val source = SourceUtil.makeTemp(
113110
"""
114111
|package scala
115112
|
@@ -154,8 +151,7 @@ abstract class UsecaseBase extends DottyDocTest {
154151
}
155152

156153
@Test def expandColl = {
157-
val source = new SourceFile(
158-
"ExpandColl.scala",
154+
val source = SourceUtil.makeTemp(
159155
"""
160156
|package scala
161157
|
@@ -199,8 +195,7 @@ abstract class UsecaseBase extends DottyDocTest {
199195
}
200196

201197
@Test def checkStripping = {
202-
val source = new SourceFile(
203-
"CheckStripping.scala",
198+
val source = SourceUtil.makeTemp(
204199
"""
205200
|package scala
206201
|
@@ -236,8 +231,7 @@ abstract class UsecaseBase extends DottyDocTest {
236231
}
237232

238233
@Test def multipleUseCases: Unit = {
239-
val source = new SourceFile(
240-
name = "MultipleUseCases.scala",
234+
val source = SourceUtil.makeTemp(
241235
"""
242236
|package scala
243237
|

0 commit comments

Comments
 (0)