Skip to content

Commit 9858f61

Browse files
GedochaoGedochao
committed
Adjust tests to work around os-lib / expecty macro bugs
1 parent 1dd30d7 commit 9858f61

File tree

6 files changed

+55
-32
lines changed

6 files changed

+55
-32
lines changed

‎modules/build/src/test/scala/scala/build/tests/ActionableDiagnosticTests.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ class ActionableDiagnosticTests extends TestUtil.ScalaCliBuildSuite {
8080
val pprintLib =
8181
actionableDiagnostics.find(_.suggestion.startsWith("com.lihaoyi::pprint")).get
8282

83-
expect(osLib.positions == Seq(File(Right(root / "Foo.scala"), (0, 14), (0, 39))))
84-
expect(pprintLib.positions == Seq(File(Right(root / "Foo.scala"), (1, 14), (1, 39))))
83+
val path = root / "Foo.scala"
84+
expect(osLib.positions == Seq(File(Right(path), (0, 14), (0, 39))))
85+
expect(pprintLib.positions == Seq(File(Right(path), (1, 14), (1, 39))))
8586
}
8687
}
8788

‎modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,8 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
385385

386386
expect(resourceDirs.nonEmpty)
387387
expect(resourceDirs.length == 1)
388-
expect(resourceDirs == Seq(root / "foo"))
388+
val path = root / "foo"
389+
expect(resourceDirs == Seq(path))
389390
}
390391
}
391392
test("parse boolean for publish.doc") {
@@ -424,8 +425,9 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
424425
error.message == "Error parsing dependency 'not-a-dep': malformed module: not-a-dep"
425426
)
426427
expect(error.positions.length == 1)
428+
val path = root / "simple.sc"
427429
expect(error.positions.head == Position.File(
428-
Right(root / "simple.sc"),
430+
Right(path),
429431
(0, 14),
430432
(0, 23)
431433
))
@@ -457,8 +459,9 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
457459
expect(xyzError.message.startsWith("Error downloading org.xyz:foo"))
458460
expect(!xyzError.message.contains("com.lihaoyi"))
459461
expect(!xyzError.message.contains("org.qwerty"))
462+
val path = root / "simple.sc"
460463
expect(xyzError.positions.head == Position.File(
461-
Right(root / "simple.sc"),
464+
Right(path),
462465
(0, 14),
463466
(0, 32)
464467
))
@@ -469,8 +472,9 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
469472
expect(qwertyError.message.contains("Error downloading org.qwerty:bar"))
470473
expect(!qwertyError.message.contains("com.lihaoyi"))
471474
expect(!qwertyError.message.contains("org.xyz"))
475+
val path = root / "simple.sc"
472476
expect(qwertyError.positions.head == Position.File(
473-
Right(root / "simple.sc"),
477+
Right(path),
474478
(1, 40),
475479
(1, 61)
476480
))

‎modules/build/src/test/scala/scala/build/tests/ExcludeTests.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ class ExcludeTests extends TestUtil.ScalaCliBuildSuite {
107107

108108
expect(sources.paths.nonEmpty)
109109
expect(sources.paths.length == 2)
110-
expect(sources.paths.map(_._2) == Seq(os.rel / "Hello.scala", os.rel / "project.scala"))
110+
val paths = Seq(os.rel / "Hello.scala", os.rel / "project.scala")
111+
expect(sources.paths.map(_._2) == paths)
111112
}
112113
}
113114

@@ -141,7 +142,8 @@ class ExcludeTests extends TestUtil.ScalaCliBuildSuite {
141142

142143
expect(sources.paths.nonEmpty)
143144
expect(sources.paths.length == 2)
144-
expect(sources.paths.map(_._2) == Seq(os.rel / "Hello.scala", os.rel / "project.scala"))
145+
val paths = Seq(os.rel / "Hello.scala", os.rel / "project.scala")
146+
expect(sources.paths.map(_._2) == paths)
145147
}
146148
}
147149

@@ -175,7 +177,8 @@ class ExcludeTests extends TestUtil.ScalaCliBuildSuite {
175177

176178
expect(sources.paths.nonEmpty)
177179
expect(sources.paths.length == 2)
178-
expect(sources.paths.map(_._2) == Seq(os.rel / "Hello.scala", os.rel / "project.scala"))
180+
val paths = Seq(os.rel / "Hello.scala", os.rel / "project.scala")
181+
expect(sources.paths.map(_._2) == paths)
179182
}
180183
}
181184

@@ -209,7 +212,8 @@ class ExcludeTests extends TestUtil.ScalaCliBuildSuite {
209212

210213
expect(sources.paths.nonEmpty)
211214
expect(sources.paths.length == 2)
212-
expect(sources.paths.map(_._2) == Seq(os.rel / "Hello.scala", os.rel / "project.scala"))
215+
val paths = Seq(os.rel / "Hello.scala", os.rel / "project.scala")
216+
expect(sources.paths.map(_._2) == paths)
213217
}
214218
}
215219

‎modules/build/src/test/scala/scala/build/tests/InputsTests.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ class InputsTests extends TestUtil.ScalaCliBuildSuite {
167167
case (el: VirtualScript, url) =>
168168
expect(el.source == url)
169169
expect(el.content.isEmpty)
170-
expect(el.wrapperPath.endsWith(os.rel / "test.sc"))
170+
val path = os.rel / "test.sc"
171+
expect(el.wrapperPath.endsWith(path))
171172
case (el: VirtualScalaFile, url) =>
172173
expect(el.source == url)
173174
expect(el.content.isEmpty)

‎modules/build/src/test/scala/scala/build/tests/SourcesTests.scala

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
7979

8080
expect(obtainedDeps.sortBy(_.version) == expectedDeps.sortBy(_.version))
8181
expect(sources.paths.length == 1)
82-
expect(sources.paths.map(_._2) == Seq(os.rel / "something.scala"))
82+
val path = os.rel / "something.scala"
83+
expect(sources.paths.map(_._2) == Seq(path))
8384
expect(sources.inMemory.isEmpty)
8485
}
8586
}
@@ -243,7 +244,8 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
243244
sources.buildOptions.classPathOptions.extraDependencies.toSeq.map(_.value) == expectedDeps
244245
)
245246
expect(sources.paths.length == 1)
246-
expect(sources.paths.map(_._2) == Seq(os.rel / "something.scala"))
247+
val path = os.rel / "something.scala"
248+
expect(sources.paths.map(_._2) == Seq(path))
247249
expect(sources.inMemory.isEmpty)
248250
}
249251
}
@@ -288,7 +290,8 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
288290
sources.buildOptions.classPathOptions.extraDependencies.toSeq.map(_.value) == expectedDeps
289291
)
290292
expect(sources.paths.length == 1)
291-
expect(sources.paths.map(_._2) == Seq(os.rel / "Something.java"))
293+
val path = os.rel / "Something.java"
294+
expect(sources.paths.map(_._2) == Seq(path))
292295
expect(sources.inMemory.isEmpty)
293296
}
294297
}
@@ -441,7 +444,8 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
441444
)
442445
expect(sources.paths.isEmpty)
443446
expect(sources.inMemory.length == 1)
444-
expect(sources.inMemory.map(_.generatedRelPath) == Seq(os.rel / "something.scala"))
447+
val path = os.rel / "something.scala"
448+
expect(sources.inMemory.map(_.generatedRelPath) == Seq(path))
445449
}
446450
}
447451

@@ -485,7 +489,8 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
485489
)
486490
expect(sources.paths.isEmpty)
487491
expect(sources.inMemory.length == 1)
488-
expect(sources.inMemory.map(_.generatedRelPath) == Seq(os.rel / "something.scala"))
492+
val path = os.rel / "something.scala"
493+
expect(sources.inMemory.map(_.generatedRelPath) == Seq(path))
489494
}
490495
}
491496

@@ -516,11 +521,12 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
516521
.orThrow
517522
val javaOpts = sources.buildOptions.javaOptions.javaOpts.toSeq.sortBy(_.toString)
518523

524+
val path = root / "something.sc"
519525
expect(
520-
javaOpts(0).value.value == "-Dfoo1",
521-
javaOpts(0).positions == Seq(Position.File(Right(root / "something.sc"), (0, 19), (0, 23))),
526+
javaOpts.head.value.value == "-Dfoo1",
527+
javaOpts.head.positions == Seq(Position.File(Right(path), (0, 19), (0, 23))),
522528
javaOpts(1).value.value == "-Dfoo2=bar2",
523-
javaOpts(1).positions == Seq(Position.File(Right(root / "something.sc"), (1, 19), (1, 28)))
529+
javaOpts(1).positions == Seq(Position.File(Right(path), (1, 19), (1, 28)))
524530
)
525531
}
526532
}

‎modules/build/src/test/scala/scala/build/tests/markdown/MarkdownCodeBlockTests.scala

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
2323
|Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
2424
|Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
2525
|""".stripMargin
26-
expect(MarkdownCodeBlock.findCodeBlocks(os.sub / "Example.md", markdown) == Right(Seq.empty))
26+
val path = os.sub / "Example.md"
27+
expect(MarkdownCodeBlock.findCodeBlocks(path, markdown) == Right(Seq.empty))
2728
}
2829

2930
test("a simple Scala code block is extracted correctly from markdown") {
@@ -42,8 +43,8 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
4243
startLine = 3,
4344
endLine = 3
4445
)
45-
val Right(Seq(actualResult)) =
46-
MarkdownCodeBlock.findCodeBlocks(os.sub / "Example.md", markdown)
46+
val path = os.sub / "Example.md"
47+
val Right(Seq(actualResult)) = MarkdownCodeBlock.findCodeBlocks(path, markdown)
4748
expect(actualResult == expectedResult)
4849
}
4950

@@ -64,8 +65,9 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
6465
startLine = 3,
6566
endLine = 4
6667
)
68+
val path = os.sub / "Example.md"
6769
val Right(Seq(actualResult: MarkdownCodeBlock)) =
68-
MarkdownCodeBlock.findCodeBlocks(os.sub / "Example.md", markdown)
70+
MarkdownCodeBlock.findCodeBlocks(path, markdown)
6971
showDiffs(actualResult, expectedResult)
7072
expect(actualResult == expectedResult)
7173
}
@@ -87,8 +89,9 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
8789
startLine = 3,
8890
endLine = 4
8991
)
92+
val path = os.sub / "Example.md"
9093
val Right(Seq(actualResult: MarkdownCodeBlock)) =
91-
MarkdownCodeBlock.findCodeBlocks(os.sub / "Example.md", markdown)
94+
MarkdownCodeBlock.findCodeBlocks(path, markdown)
9295
showDiffs(actualResult, expectedResult)
9396
expect(actualResult == expectedResult)
9497
}
@@ -111,8 +114,8 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
111114
startLine = 3,
112115
endLine = 5
113116
)
114-
val Right(Seq(actualResult)) =
115-
MarkdownCodeBlock.findCodeBlocks(os.sub / "Example.md", markdown)
117+
val path = os.sub / "Example.md"
118+
val Right(Seq(actualResult)) = MarkdownCodeBlock.findCodeBlocks(path, markdown)
116119
expect(actualResult == expectedResult)
117120
}
118121

@@ -136,8 +139,9 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
136139
startLine = 3,
137140
endLine = 6
138141
)
142+
val path = os.sub / "Example.md"
139143
val Right(Seq(actualResult: MarkdownCodeBlock)) =
140-
MarkdownCodeBlock.findCodeBlocks(os.sub / "Example.md", markdown)
144+
MarkdownCodeBlock.findCodeBlocks(path, markdown)
141145
showDiffs(actualResult, expectedResult)
142146
expect(actualResult == expectedResult)
143147
}
@@ -162,8 +166,8 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
162166
startLine = 3,
163167
endLine = 6
164168
)
165-
val Right(Seq(actualResult)) =
166-
MarkdownCodeBlock.findCodeBlocks(os.sub / "Example.md", markdown)
169+
val path = os.sub / "Example.md"
170+
val Right(Seq(actualResult)) = MarkdownCodeBlock.findCodeBlocks(path, markdown)
167171
expect(actualResult == expectedResult)
168172
}
169173

@@ -176,7 +180,8 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
176180
|$code
177181
|```
178182
|""".stripMargin
179-
expect(MarkdownCodeBlock.findCodeBlocks(os.sub / "Example.md", markdown) == Right(Seq.empty))
183+
val path = os.sub / "Example.md"
184+
expect(MarkdownCodeBlock.findCodeBlocks(path, markdown) == Right(Seq.empty))
180185
}
181186

182187
test("an unclosed code block produces a build error") {
@@ -188,7 +193,8 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
188193
|$code
189194
|""".stripMargin
190195
val subPath = os.sub / "Example.md"
191-
val expectedPosition = Position.File(Right(os.pwd / subPath), 2 -> 0, 2 -> 3)
196+
val path = os.pwd / subPath
197+
val expectedPosition = Position.File(Right(path), 2 -> 0, 2 -> 3)
192198
val expectedError = MarkdownUnclosedBackticksError("```", Seq(expectedPosition))
193199
val Left(result) = MarkdownCodeBlock.findCodeBlocks(subPath, markdown)
194200
expect(result.message == expectedError.message)
@@ -228,7 +234,8 @@ class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
228234
endLine = 2
229235
)
230236
expect(actualResult == expectedResult)
231-
val expectedPosition = Position.File(Right(os.pwd / subPath), 7 -> 0, 7 -> 4)
237+
val path = os.pwd / subPath
238+
val expectedPosition = Position.File(Right(path), 7 -> 0, 7 -> 4)
232239
val expectedError = MarkdownUnclosedBackticksError("````", Seq(expectedPosition))
233240
val Some(actualError) = maybeError
234241
expect(actualError.positions == expectedError.positions)

0 commit comments

Comments
 (0)