Skip to content

Commit c3e649b

Browse files
committed
Fix issue with empty line and add tests
1 parent 8b2bc18 commit c3e649b

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.telerik.metadata.security.filtering.input.user
22

3-
class UserLineCommentFilter {
3+
class UserLineFilter {
44
fun isCommentLine(line: String) = line.startsWith("//") || line.startsWith("#")
5+
fun isEmptyLine(line: String) = line.isBlank()
56
}

test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/security/filtering/input/user/UserPatternsCollection.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,13 @@ object UserPatternsCollection : PatternsCollection {
4040
private fun parseFile(path: Path): Collection<PatternEntry> {
4141
val fileLines = Files.readAllLines(path)
4242
val lineSplitter = UserLineSplitter()
43-
val commentFilter = UserLineCommentFilter()
43+
val lineFilter = UserLineFilter()
4444

4545
return fileLines
46-
.filter { !commentFilter.isCommentLine(it) }
46+
.asSequence()
47+
.filter { !lineFilter.isCommentLine(it) }
48+
.filter { !lineFilter.isEmptyLine(it) }
4749
.map { lineSplitter.splitLine(it) }
50+
.toList()
4851
}
4952
}
Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import org.junit.Test
44

55
import org.junit.Assert.*
66

7-
class UserLineCommentFilterTest {
7+
class UserLineFilterTest {
88

99
companion object {
1010
private const val UNEXPECTED_LINE_FILTERING_RESULT_MESSAGE = "Unexpected line filtering result"
1111
}
1212

13-
private val filter = UserLineCommentFilter()
13+
private val filter = UserLineFilter()
1414

1515
@Test
1616
fun `Is regular commented line`() {
@@ -38,4 +38,22 @@ class UserLineCommentFilterTest {
3838

3939
assertFalse(UNEXPECTED_LINE_FILTERING_RESULT_MESSAGE, isComment)
4040
}
41+
42+
@Test
43+
fun `Is empty line`(){
44+
val line = System.lineSeparator()
45+
46+
val isEmptyLine = filter.isEmptyLine(line)
47+
48+
assertTrue(UNEXPECTED_LINE_FILTERING_RESULT_MESSAGE, isEmptyLine)
49+
}
50+
51+
@Test
52+
fun `Is whitespace line`(){
53+
val line = " "
54+
55+
val isEmptyLine = filter.isEmptyLine(line)
56+
57+
assertTrue(UNEXPECTED_LINE_FILTERING_RESULT_MESSAGE, isEmptyLine)
58+
}
4159
}

0 commit comments

Comments
 (0)