Skip to content

Commit 745ad35

Browse files
javadevjavadev
committed
Fixed sonar
1 parent 64ca61a commit 745ad35

File tree

2 files changed

+30
-78
lines changed
  • src
    • main/kotlin/g3401_3500/s3475_dna_pattern_recognition
    • test/kotlin/g3401_3500/s3475_dna_pattern_recognition

2 files changed

+30
-78
lines changed

‎src/main/kotlin/g3401_3500/s3475_dna_pattern_recognition/script.sql‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ WITH SampleAnalysisCte AS (
99
FROM Samples
1010
)
1111

12-
SELECT * FROM SampleAnalysisCte
13-
ORDER BY sample_id;
12+
SELECT sample_id, dna_sequence, species, has_start, has_stop, has_atat, has_ggg
13+
FROM SampleAnalysisCte
14+
ORDER BY sample_id ASC;

‎src/test/kotlin/g3401_3500/s3475_dna_pattern_recognition/MysqlTest.kt‎

Lines changed: 27 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.zapodot.junit.db.common.CompatibilityMode
99
import java.io.BufferedReader
1010
import java.io.FileNotFoundException
1111
import java.io.FileReader
12+
import java.sql.ResultSet
1213
import java.sql.SQLException
1314
import java.util.stream.Collectors
1415
import javax.sql.DataSource
@@ -60,91 +61,41 @@ internal class MysqlTest {
6061
.replace("#.*?\\r?\\n".toRegex(), ""),
6162
).use { resultSet ->
6263
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
63-
assertThat<String>(resultSet.getNString(1), equalTo<String>("1"))
64-
assertThat<String>(
65-
resultSet.getNString(2),
66-
equalTo<String>("ATGCTAGCTAGCTAA"),
67-
)
68-
assertThat<String>(resultSet.getNString(3), equalTo<String>("Human"))
69-
assertThat<String>(resultSet.getNString(4), equalTo<String>("TRUE"))
70-
assertThat<String>(resultSet.getNString(5), equalTo<String>("TRUE"))
71-
assertThat<String>(resultSet.getNString(6), equalTo<String>("FALSE"))
72-
assertThat<String>(resultSet.getNString(7), equalTo<String>("FALSE"))
64+
checkRow(resultSet, 1, "ATGCTAGCTAGCTAA", "Human", "TRUE", "TRUE", "FALSE", "FALSE")
7365
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
74-
assertThat<String>(resultSet.getNString(1), equalTo<String>("2"))
75-
assertThat<String>(
76-
resultSet.getNString(2),
77-
equalTo<String>("GGGTCAATCATC"),
78-
)
79-
assertThat<String>(resultSet.getNString(3), equalTo<String>("Human"))
80-
assertThat<String>(resultSet.getNString(4), equalTo<String>("FALSE"))
81-
assertThat<String>(resultSet.getNString(5), equalTo<String>("FALSE"))
82-
assertThat<String>(resultSet.getNString(6), equalTo<String>("FALSE"))
83-
assertThat<String>(resultSet.getNString(7), equalTo<String>("TRUE"))
66+
checkRow(resultSet, 2, "GGGTCAATCATC", "Human", "FALSE", "FALSE", "FALSE", "TRUE")
8467
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
85-
assertThat<String>(resultSet.getNString(1), equalTo<String>("3"))
86-
assertThat<String>(
87-
resultSet.getNString(2),
88-
equalTo<String>("ATATATCGTAGCTA"),
89-
)
90-
assertThat<String>(resultSet.getNString(3), equalTo<String>("Human"))
91-
assertThat<String>(resultSet.getNString(4), equalTo<String>("FALSE"))
92-
assertThat<String>(resultSet.getNString(5), equalTo<String>("FALSE"))
93-
assertThat<String>(resultSet.getNString(6), equalTo<String>("TRUE"))
94-
assertThat<String>(resultSet.getNString(7), equalTo<String>("FALSE"))
68+
checkRow(resultSet, 3, "ATATATCGTAGCTA", "Human", "FALSE", "FALSE", "TRUE", "FALSE")
9569
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
96-
assertThat<String>(resultSet.getNString(1), equalTo<String>("4"))
97-
assertThat<String>(
98-
resultSet.getNString(2),
99-
equalTo<String>("ATGGGGTCATCATAA"),
100-
)
101-
assertThat<String>(resultSet.getNString(3), equalTo<String>("Human"))
102-
assertThat<String>(resultSet.getNString(4), equalTo<String>("TRUE"))
103-
assertThat<String>(resultSet.getNString(5), equalTo<String>("TRUE"))
104-
assertThat<String>(resultSet.getNString(6), equalTo<String>("FALSE"))
105-
assertThat<String>(resultSet.getNString(7), equalTo<String>("TRUE"))
70+
checkRow(resultSet, 4, "ATGGGGTCATCATAA", "Human", "TRUE", "TRUE", "FALSE", "TRUE")
10671
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
107-
assertThat<String>(resultSet.getNString(1), equalTo<String>("5"))
108-
assertThat<String>(
109-
resultSet.getNString(2),
110-
equalTo<String>("TCAGTCAGTCAG"),
111-
)
112-
assertThat<String>(resultSet.getNString(3), equalTo<String>("Human"))
113-
assertThat<String>(resultSet.getNString(4), equalTo<String>("FALSE"))
114-
assertThat<String>(resultSet.getNString(5), equalTo<String>("FALSE"))
115-
assertThat<String>(resultSet.getNString(6), equalTo<String>("FALSE"))
116-
assertThat<String>(resultSet.getNString(7), equalTo<String>("FALSE"))
72+
checkRow(resultSet, 5, "TCAGTCAGTCAG", "Human", "FALSE", "FALSE", "FALSE", "FALSE")
11773
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
118-
assertThat<String>(resultSet.getNString(1), equalTo<String>("6"))
119-
assertThat<String>(
120-
resultSet.getNString(2),
121-
equalTo<String>("ATATCGCGCTAG"),
122-
)
123-
assertThat<String>(
124-
resultSet.getNString(3),
125-
equalTo<String>("Zebrafish"),
126-
)
127-
assertThat<String>(resultSet.getNString(4), equalTo<String>("FALSE"))
128-
assertThat<String>(resultSet.getNString(5), equalTo<String>("TRUE"))
129-
assertThat<String>(resultSet.getNString(6), equalTo<String>("TRUE"))
130-
assertThat<String>(resultSet.getNString(7), equalTo<String>("FALSE"))
74+
checkRow(resultSet, 6, "ATATCGCGCTAG", "Zebrafish", "FALSE", "TRUE", "TRUE", "FALSE")
13175
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
132-
assertThat<String>(resultSet.getNString(1), equalTo<String>("7"))
133-
assertThat<String>(
134-
resultSet.getNString(2),
135-
equalTo<String>("CGTATGCGTCGTA"),
136-
)
137-
assertThat<String>(
138-
resultSet.getNString(3),
139-
equalTo<String>("Zebrafish"),
140-
)
141-
assertThat<String>(resultSet.getNString(4), equalTo<String>("FALSE"))
142-
assertThat<String>(resultSet.getNString(5), equalTo<String>("FALSE"))
143-
assertThat<String>(resultSet.getNString(6), equalTo<String>("FALSE"))
144-
assertThat<String>(resultSet.getNString(7), equalTo<String>("FALSE"))
76+
checkRow(resultSet, 7, "CGTATGCGTCGTA", "Zebrafish", "FALSE", "FALSE", "FALSE", "FALSE")
14577
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
14678
}
14779
}
14880
}
14981
}
82+
83+
private fun checkRow(
84+
resultSet: ResultSet,
85+
sampleId: Int,
86+
dnaSequence: String,
87+
species: String,
88+
hasStart: String,
89+
hasStop: String,
90+
hasAtat: String,
91+
hasGgg: String,
92+
) {
93+
assertThat<Int>(resultSet.getInt(1), equalTo<Int>(sampleId))
94+
assertThat<String>(resultSet.getNString(2), equalTo<String>(dnaSequence))
95+
assertThat<String>(resultSet.getNString(3), equalTo<String>(species))
96+
assertThat<String>(resultSet.getNString(4), equalTo<String>(hasStart))
97+
assertThat<String>(resultSet.getNString(5), equalTo<String>(hasStop))
98+
assertThat<String>(resultSet.getNString(6), equalTo<String>(hasAtat))
99+
assertThat<String>(resultSet.getNString(7), equalTo<String>(hasGgg))
100+
}
150101
}

0 commit comments

Comments
 (0)