Skip to content

Commit b284360

Browse files
GedochaoGedochao
committed
NIT Minor refactors in BSP integration tests
1 parent 58a5ea4 commit b284360

File tree

2 files changed

+31
-35
lines changed

2 files changed

+31
-35
lines changed

‎modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,21 +1608,21 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
16081608
)
16091609

16101610
val scalaDiagnostic = new Gson().fromJson[b.ScalaDiagnostic](
1611-
updateActionableDiagnostic.getData().asInstanceOf[JsonElement],
1611+
updateActionableDiagnostic.getData.asInstanceOf[JsonElement],
16121612
classOf[b.ScalaDiagnostic]
16131613
)
16141614

1615-
val actions = scalaDiagnostic.getActions().asScala.toList
1615+
val actions = scalaDiagnostic.getActions.asScala.toList
16161616
assert(actions.size == 1)
1617-
val changes = actions.head.getEdit().getChanges().asScala.toList
1617+
val changes = actions.head.getEdit.getChanges.asScala.toList
16181618
assert(changes.size == 1)
16191619
val textEdit = changes.head
16201620

1621-
expect(textEdit.getNewText().contains("com.lihaoyi::os-lib:"))
1622-
expect(textEdit.getRange().getStart.getLine == 0)
1623-
expect(textEdit.getRange().getStart.getCharacter == 15)
1624-
expect(textEdit.getRange().getEnd.getLine == 0)
1625-
expect(textEdit.getRange().getEnd.getCharacter == 40)
1621+
expect(textEdit.getNewText.contains("com.lihaoyi::os-lib:"))
1622+
expect(textEdit.getRange.getStart.getLine == 0)
1623+
expect(textEdit.getRange.getStart.getCharacter == 15)
1624+
expect(textEdit.getRange.getEnd.getLine == 0)
1625+
expect(textEdit.getRange.getEnd.getCharacter == 40)
16261626
}
16271627
}
16281628
}
@@ -1655,8 +1655,8 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
16551655
await(remoteServer.buildTargetCompile(new b.CompileParams(targets)).asScala)
16561656

16571657
val visibleDiagnostics =
1658-
localClient.diagnostics().map(_.getDiagnostics().asScala).find(
1659-
!_.isEmpty
1658+
localClient.diagnostics().map(_.getDiagnostics.asScala).find(
1659+
_.nonEmpty
16601660
).getOrElse(
16611661
Nil
16621662
)
@@ -1678,21 +1678,21 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
16781678
)
16791679

16801680
val scalaDiagnostic = new Gson().fromJson[b.ScalaDiagnostic](
1681-
updateActionableDiagnostic.getData().asInstanceOf[JsonElement],
1681+
updateActionableDiagnostic.getData.asInstanceOf[JsonElement],
16821682
classOf[b.ScalaDiagnostic]
16831683
)
16841684

1685-
val actions = scalaDiagnostic.getActions().asScala.toList
1685+
val actions = scalaDiagnostic.getActions.asScala.toList
16861686
assert(actions.size == 1)
1687-
val changes = actions.head.getEdit().getChanges().asScala.toList
1687+
val changes = actions.head.getEdit.getChanges.asScala.toList
16881688
assert(changes.size == 1)
16891689
val textEdit = changes.head
16901690

1691-
expect(textEdit.getNewText().contains("\n case TestB() => ???"))
1692-
expect(textEdit.getRange().getStart.getLine == 7)
1693-
expect(textEdit.getRange().getStart.getCharacter == 19)
1694-
expect(textEdit.getRange().getEnd.getLine == 7)
1695-
expect(textEdit.getRange().getEnd.getCharacter == 19)
1691+
expect(textEdit.getNewText.contains("\n case TestB() => ???"))
1692+
expect(textEdit.getRange.getStart.getLine == 7)
1693+
expect(textEdit.getRange.getStart.getCharacter == 19)
1694+
expect(textEdit.getRange.getEnd.getLine == 7)
1695+
expect(textEdit.getRange.getEnd.getCharacter == 19)
16961696
}
16971697
}
16981698
}
@@ -1940,11 +1940,11 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
19401940
}
19411941

19421942
val diagnostics = diagnosticsParams.flatMap(_.getDiagnostics.asScala)
1943-
.sortBy(_.getRange().getEnd().getCharacter())
1943+
.sortBy(_.getRange.getEnd.getCharacter())
19441944

19451945
{
19461946
checkDiagnostic(
1947-
diagnostic = diagnostics.apply(0),
1947+
diagnostic = diagnostics.head,
19481948
expectedMessage =
19491949
"Using 'latest' for toolkit is deprecated, use 'default' to get more stable behaviour",
19501950
expectedSeverity = b.DiagnosticSeverity.WARNING,
@@ -1955,7 +1955,7 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
19551955
)
19561956

19571957
checkScalaAction(
1958-
diagnostic = diagnostics.apply(0),
1958+
diagnostic = diagnostics.head,
19591959
expectedActionsSize = 1,
19601960
expectedTitle = "Change to: toolkit default",
19611961
expectedChanges = 1,
@@ -2092,7 +2092,7 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
20922092
expectedEndLine: Int,
20932093
expectedEndCharacter: Int,
20942094
expectedNewText: String
2095-
) = {
2095+
): Unit = {
20962096
expect(diagnostic.getDataKind == "scala")
20972097

20982098
val gson = new com.google.gson.Gson()
@@ -2131,7 +2131,6 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
21312131
}
21322132

21332133
object BspTestDefinitions {
2134-
21352134
private final case class Details(
21362135
name: String,
21372136
version: String,
@@ -2140,7 +2139,4 @@ object BspTestDefinitions {
21402139
languages: List[String]
21412140
)
21422141
private val detailsCodec: JsonValueCodec[Details] = JsonCodecMaker.make
2143-
2144-
private final case class TextEdit(range: b.Range, newText: String)
2145-
21462142
}

‎modules/integration/src/test/scala/scala/cli/integration/BspTests213.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class BspTests213 extends BspTestDefinitions with BspTests2Definitions with Test
3232
await(remoteServer.buildTargetCompile(new b.CompileParams(targets)).asScala)
3333

3434
val visibleDiagnostics =
35-
localClient.diagnostics().map(_.getDiagnostics().asScala).find(!_.isEmpty).getOrElse(
35+
localClient.diagnostics().map(_.getDiagnostics.asScala).find(_.nonEmpty).getOrElse(
3636
Nil
3737
)
3838

@@ -53,21 +53,21 @@ class BspTests213 extends BspTestDefinitions with BspTests2Definitions with Test
5353
)
5454

5555
val scalaDiagnostic = new Gson().fromJson[b.ScalaDiagnostic](
56-
updateActionableDiagnostic.getData().asInstanceOf[JsonElement],
56+
updateActionableDiagnostic.getData.asInstanceOf[JsonElement],
5757
classOf[b.ScalaDiagnostic]
5858
)
5959

60-
val actions = scalaDiagnostic.getActions().asScala.toList
60+
val actions = scalaDiagnostic.getActions.asScala.toList
6161
assert(actions.size == 1)
62-
val changes = actions.head.getEdit().getChanges().asScala.toList
62+
val changes = actions.head.getEdit.getChanges.asScala.toList
6363
assert(changes.size == 1)
6464
val textEdit = changes.head
6565

66-
expect(textEdit.getNewText().contains("(x: Int)"))
67-
expect(textEdit.getRange().getStart.getLine == 3)
68-
expect(textEdit.getRange().getStart.getCharacter == 4)
69-
expect(textEdit.getRange().getEnd.getLine == 3)
70-
expect(textEdit.getRange().getEnd.getCharacter == 10)
66+
expect(textEdit.getNewText.contains("(x: Int)"))
67+
expect(textEdit.getRange.getStart.getLine == 3)
68+
expect(textEdit.getRange.getStart.getCharacter == 4)
69+
expect(textEdit.getRange.getEnd.getLine == 3)
70+
expect(textEdit.getRange.getEnd.getCharacter == 10)
7171
}
7272
}
7373
}

0 commit comments

Comments
 (0)