Skip to content

Commit 72e3e01

Browse files
committed
Simplify ParsedArgsTest range assertions
1 parent e02a41a commit 72e3e01

1 file changed

Lines changed: 6 additions & 13 deletions

File tree

core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,10 @@ class ParsedArgsTest {
139139

140140
@Test
141141
fun `parseOptions recognizes --line alias`() {
142-
assertThat(parseOptions("--line=1", "foo.kt"))
143-
.isEqualTo(
144-
parseResultOk(
145-
fileNames = listOf("foo.kt"),
146-
lineRanges = ranges(Range.closedOpen(0, 1)),
147-
)
148-
)
142+
val parsed = assertSucceeds(parseOptions("--line=1", "foo.kt"))
143+
assertThat(parsed.fileNames).containsExactly("foo.kt")
144+
assertThat(parsed.lineRanges).isEqualTo(ranges(Range.closedOpen(0, 1)))
145+
149146
assertThat(assertSucceeds(parseOptions("--line", "2", "foo.kt")).lineRanges)
150147
.isEqualTo(ranges(Range.closedOpen(1, 2)))
151148
}
@@ -364,12 +361,10 @@ class ParsedArgsTest {
364361
stdinName: String? = null,
365362
editorConfig: Boolean = false,
366363
quiet: Boolean = false,
367-
lineRanges: RangeSet<Int> = TreeRangeSet.create(),
368-
characterRanges: RangeSet<Int> = TreeRangeSet.create(),
369364
): ParseResult.Ok {
370365
val returnedFormattingOptions =
371366
formattingOptions.copy(removeUnusedImports = removedUnusedImports)
372-
val parsedArgs =
367+
return ParseResult.Ok(
373368
ParsedArgs(
374369
fileNames,
375370
returnedFormattingOptions,
@@ -379,9 +374,7 @@ class ParsedArgsTest {
379374
editorConfig,
380375
quiet,
381376
)
382-
parsedArgs.lineRanges.addAll(lineRanges)
383-
parsedArgs.characterRanges.addAll(characterRanges)
384-
return ParseResult.Ok(parsedArgs)
377+
)
385378
}
386379

387380
private fun ranges(vararg ranges: Range<Int>): RangeSet<Int> {

0 commit comments

Comments
 (0)