Clean up code

This commit is contained in:
Mike Cifelli 2018-05-05 14:18:29 -04:00
parent 9064acd7ed
commit e672247738
2 changed files with 5 additions and 13 deletions

View File

@ -15,9 +15,8 @@ class FilePositionTrackerTest {
private lateinit var trackerUnderTest: FilePositionTracker
private fun createFilePosition(lineNumber: Int, columnNumber: Int): FilePosition {
return FilePosition(FILE_NAME, lineNumber, columnNumber)
}
private fun createFilePosition(lineNumber: Int, columnNumber: Int) =
FilePosition(FILE_NAME, lineNumber, columnNumber)
private fun assertTrackerPositionEquals(expectedPosition: FilePosition) {
assertThat(trackerUnderTest.currentPosition()).isEqualTo(expectedPosition)

View File

@ -27,15 +27,8 @@ import token.TokenFactory.BadCharacterException
@TestInstance(PER_CLASS)
class LispParserTest {
private fun createLispParser(input: String): LispParser {
val stringInputStream = createInputStreamFromString(input)
return LispParser(stringInputStream, "testFile")
}
private fun createIOExceptionThrowingLispParser(): LispParser {
val stringInputStream = createIOExceptionThrowingInputStream()
return LispParser(stringInputStream, "testFile")
}
private fun createLispParser(input: String) = LispParser(createInputStreamFromString(input), "testFile")
private fun createIOExceptionThrowingLispParser() = LispParser(createIOExceptionThrowingInputStream(), "testFile")
@Test
fun `EOF check is true with no input`() {
@ -200,7 +193,7 @@ class LispParserTest {
} catch (e: BadCharacterException) {
val message = e.message
assertThat(message).isNotEmpty();
assertThat(message).isNotEmpty()
assertThat(e.severity).isEqualTo(ERROR)
}
}