Skip to content

Commit 3daac00

Browse files
nikagradkropachev
andauthored
Apply suggestion from @dkropachev
Rearranging assertions in `should_never_update_statement_id_for_conditional_updates` Co-authored-by: Dmitry Kropachev <[email protected]>
1 parent 3f1fc3f commit 3daac00

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

driver-core/src/test/java/com/datastax/driver/core/PreparedStatementInvalidationTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -336,17 +336,17 @@ private void should_never_update_statement_id_for_conditional_updates(Session se
336336
assertThat(row.getInt("a")).isEqualTo(5);
337337
assertThat(row.getInt("b")).isEqualTo(5);
338338
assertThat(row.getInt("c")).isEqualTo(5);
339-
if (isScylla && !supportsUseMetadataId) {
340-
assertThat(row.getColumnDefinitions()).doesNotContainVariable("d");
341-
assertThat(ps.getPreparedId().resultSetMetadata.variables).hasSize(4);
342-
} else if (isScylla) {
339+
if (!isScylla) {
340+
assertThat(row.isNull("d")).isTrue();
341+
assertThat(ps.getPreparedId().resultSetMetadata.variables).isNull();
342+
assertThat(ps.getPreparedId().resultSetMetadata.id).isEqualTo(idBefore);
343+
} else if (supportsUseMetadataId) {
343344
assertThat(row.isNull("d")).isTrue();
344345
assertThat(ps.getPreparedId().resultSetMetadata.variables).hasSize(5);
345346
assertThat(ps.getPreparedId().resultSetMetadata.id).isNotEqualTo(idBefore);
346347
} else {
347-
assertThat(row.isNull("d")).isTrue();
348-
assertThat(ps.getPreparedId().resultSetMetadata.variables).isNull();
349-
assertThat(ps.getPreparedId().resultSetMetadata.id).isEqualTo(idBefore);
348+
assertThat(row.getColumnDefinitions()).doesNotContainVariable("d");
349+
assertThat(ps.getPreparedId().resultSetMetadata.variables).hasSize(4);
350350
}
351351
}
352352

0 commit comments

Comments
 (0)