Skip to content

Commit 4c5f25d

Browse files
javadevjavadev
committed
Fixed sonar
1 parent e41b794 commit 4c5f25d

File tree

2 files changed

+47
-51
lines changed
  • src
    • main/java/g3401_3500/s3475_dna_pattern_recognition
    • test/java/g3401_3500/s3475_dna_pattern_recognition

2 files changed

+47
-51
lines changed

‎src/main/java/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/java/g3401_3500/s3475_dna_pattern_recognition/MysqlTest.java

Lines changed: 44 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -56,63 +56,58 @@ void testScript(@EmbeddedDatabase DataSource dataSource)
5656
.collect(Collectors.joining("\n"))
5757
.replaceAll("#.*?\\r?\\n", ""))) {
5858
assertThat(resultSet.next(), equalTo(true));
59-
assertThat(resultSet.getNString(1), equalTo("1"));
60-
assertThat(resultSet.getNString(2), equalTo("ATGCTAGCTAGCTAA"));
61-
assertThat(resultSet.getNString(3), equalTo("Human"));
62-
assertThat(resultSet.getNString(4), equalTo("TRUE"));
63-
assertThat(resultSet.getNString(5), equalTo("TRUE"));
64-
assertThat(resultSet.getNString(6), equalTo("FALSE"));
65-
assertThat(resultSet.getNString(7), equalTo("FALSE"));
59+
checkRow(
60+
resultSet, 1, "ATGCTAGCTAGCTAA", "Human", "TRUE", "TRUE", "FALSE", "FALSE");
6661
assertThat(resultSet.next(), equalTo(true));
67-
assertThat(resultSet.getNString(1), equalTo("2"));
68-
assertThat(resultSet.getNString(2), equalTo("GGGTCAATCATC"));
69-
assertThat(resultSet.getNString(3), equalTo("Human"));
70-
assertThat(resultSet.getNString(4), equalTo("FALSE"));
71-
assertThat(resultSet.getNString(5), equalTo("FALSE"));
72-
assertThat(resultSet.getNString(6), equalTo("FALSE"));
73-
assertThat(resultSet.getNString(7), equalTo("TRUE"));
62+
checkRow(resultSet, 2, "GGGTCAATCATC", "Human", "FALSE", "FALSE", "FALSE", "TRUE");
7463
assertThat(resultSet.next(), equalTo(true));
75-
assertThat(resultSet.getNString(1), equalTo("3"));
76-
assertThat(resultSet.getNString(2), equalTo("ATATATCGTAGCTA"));
77-
assertThat(resultSet.getNString(3), equalTo("Human"));
78-
assertThat(resultSet.getNString(4), equalTo("FALSE"));
79-
assertThat(resultSet.getNString(5), equalTo("FALSE"));
80-
assertThat(resultSet.getNString(6), equalTo("TRUE"));
81-
assertThat(resultSet.getNString(7), equalTo("FALSE"));
64+
checkRow(
65+
resultSet, 3, "ATATATCGTAGCTA", "Human", "FALSE", "FALSE", "TRUE", "FALSE");
8266
assertThat(resultSet.next(), equalTo(true));
83-
assertThat(resultSet.getNString(1), equalTo("4"));
84-
assertThat(resultSet.getNString(2), equalTo("ATGGGGTCATCATAA"));
85-
assertThat(resultSet.getNString(3), equalTo("Human"));
86-
assertThat(resultSet.getNString(4), equalTo("TRUE"));
87-
assertThat(resultSet.getNString(5), equalTo("TRUE"));
88-
assertThat(resultSet.getNString(6), equalTo("FALSE"));
89-
assertThat(resultSet.getNString(7), equalTo("TRUE"));
67+
checkRow(resultSet, 4, "ATGGGGTCATCATAA", "Human", "TRUE", "TRUE", "FALSE", "TRUE");
9068
assertThat(resultSet.next(), equalTo(true));
91-
assertThat(resultSet.getNString(1), equalTo("5"));
92-
assertThat(resultSet.getNString(2), equalTo("TCAGTCAGTCAG"));
93-
assertThat(resultSet.getNString(3), equalTo("Human"));
94-
assertThat(resultSet.getNString(4), equalTo("FALSE"));
95-
assertThat(resultSet.getNString(5), equalTo("FALSE"));
96-
assertThat(resultSet.getNString(6), equalTo("FALSE"));
97-
assertThat(resultSet.getNString(7), equalTo("FALSE"));
69+
checkRow(resultSet, 5, "TCAGTCAGTCAG", "Human", "FALSE", "FALSE", "FALSE", "FALSE");
9870
assertThat(resultSet.next(), equalTo(true));
99-
assertThat(resultSet.getNString(1), equalTo("6"));
100-
assertThat(resultSet.getNString(2), equalTo("ATATCGCGCTAG"));
101-
assertThat(resultSet.getNString(3), equalTo("Zebrafish"));
102-
assertThat(resultSet.getNString(4), equalTo("FALSE"));
103-
assertThat(resultSet.getNString(5), equalTo("TRUE"));
104-
assertThat(resultSet.getNString(6), equalTo("TRUE"));
105-
assertThat(resultSet.getNString(7), equalTo("FALSE"));
71+
checkRow(
72+
resultSet,
73+
6,
74+
"ATATCGCGCTAG",
75+
"Zebrafish",
76+
"FALSE",
77+
"TRUE",
78+
"TRUE",
79+
"FALSE");
10680
assertThat(resultSet.next(), equalTo(true));
107-
assertThat(resultSet.getNString(1), equalTo("7"));
108-
assertThat(resultSet.getNString(2), equalTo("CGTATGCGTCGTA"));
109-
assertThat(resultSet.getNString(3), equalTo("Zebrafish"));
110-
assertThat(resultSet.getNString(4), equalTo("FALSE"));
111-
assertThat(resultSet.getNString(5), equalTo("FALSE"));
112-
assertThat(resultSet.getNString(6), equalTo("FALSE"));
113-
assertThat(resultSet.getNString(7), equalTo("FALSE"));
81+
checkRow(
82+
resultSet,
83+
7,
84+
"CGTATGCGTCGTA",
85+
"Zebrafish",
86+
"FALSE",
87+
"FALSE",
88+
"FALSE",
89+
"FALSE");
11490
assertThat(resultSet.next(), equalTo(false));
11591
}
11692
}
11793
}
94+
95+
private void checkRow(
96+
ResultSet resultSet,
97+
int sampleId,
98+
String dnaSequence,
99+
String species,
100+
String hasStart,
101+
String hasStop,
102+
String hasAtat,
103+
String hasGgg)
104+
throws SQLException {
105+
assertThat(resultSet.getInt(1), equalTo(sampleId));
106+
assertThat(resultSet.getNString(2), equalTo(dnaSequence));
107+
assertThat(resultSet.getNString(3), equalTo(species));
108+
assertThat(resultSet.getNString(4), equalTo(hasStart));
109+
assertThat(resultSet.getNString(5), equalTo(hasStop));
110+
assertThat(resultSet.getNString(6), equalTo(hasAtat));
111+
assertThat(resultSet.getNString(7), equalTo(hasGgg));
112+
}
118113
}

0 commit comments

Comments
 (0)