Skip to content

Commit 9728df0

Browse files
mp911demp911de
committed
DATACASS-809 - Polishing.
Remove leading space in test strings to simplify assertions.
1 parent d6a3281 commit 9728df0

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void queryWithResultSetExtractorShouldCallExecution() {
179179
List<String> rows = getUninterruptibly(
180180
asyncCqlTemplate.query("SELECT * from USERS", (row, index) -> row.getString(0)));
181181

182-
assertThat(rows).hasSize(3).contains("Walter", "Hank", " Jesse");
182+
assertThat(rows).hasSize(3).contains("Walter", "Hank", "Jesse");
183183
verify(session).executeAsync(any(Statement.class));
184184
});
185185
}
@@ -192,7 +192,7 @@ void queryWithResultSetExtractorWithArgumentsShouldCallExecution() {
192192
List<String> rows = getUninterruptibly(
193193
asyncCqlTemplate.query("SELECT * from USERS", (row, index) -> row.getString(0)));
194194

195-
assertThat(rows).hasSize(3).contains("Walter", "Hank", " Jesse");
195+
assertThat(rows).hasSize(3).contains("Walter", "Hank", "Jesse");
196196
verify(session).executeAsync(any(Statement.class));
197197
});
198198
}
@@ -357,7 +357,7 @@ void queryWithResultSetStatementExtractorShouldCallExecution() {
357357
ListenableFuture<List<String>> future = asyncCqlTemplate.query(SimpleStatement.newInstance("SELECT * from USERS"),
358358
(row, index) -> row.getString(0));
359359

360-
assertThat(getUninterruptibly(future)).hasSize(3).contains("Walter", "Hank", " Jesse");
360+
assertThat(getUninterruptibly(future)).hasSize(3).contains("Walter", "Hank", "Jesse");
361361
verify(session).executeAsync(any(Statement.class));
362362
});
363363
}
@@ -370,7 +370,7 @@ void queryWithResultSetStatementExtractorWithArgumentsShouldCallExecution() {
370370
ListenableFuture<List<String>> future = asyncCqlTemplate.query(SimpleStatement.newInstance("SELECT * from USERS"),
371371
(row, index) -> row.getString(0));
372372

373-
assertThat(getUninterruptibly(future)).hasSize(3).contains("Walter", "Hank", " Jesse");
373+
assertThat(getUninterruptibly(future)).hasSize(3).contains("Walter", "Hank", "Jesse");
374374
verify(session).executeAsync(any(Statement.class));
375375
});
376376
}
@@ -783,7 +783,7 @@ private void doTestStrings(@Nullable Integer fetchSize, @Nullable ConsistencyLev
783783
@Nullable CqlIdentifier keyspace,
784784
Consumer<AsyncCqlTemplate> cqlTemplateConsumer) {
785785

786-
String[] results = { "Walter", "Hank", " Jesse" };
786+
String[] results = { "Walter", "Hank", "Jesse" };
787787

788788
when(this.session.executeAsync((Statement) any())).thenReturn(new TestResultSetFuture(resultSet));
789789
when(this.resultSet.currentPage()).thenReturn(Arrays.asList(row, row, row));

‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void queryWithResultSetExtractorShouldCallExecution() {
158158

159159
List<String> rows = cqlTemplate.query("SELECT * from USERS", (row, index) -> row.getString(0));
160160

161-
assertThat(rows).hasSize(3).contains("Walter", "Hank", " Jesse");
161+
assertThat(rows).hasSize(3).contains("Walter", "Hank", "Jesse");
162162
verify(session).execute(any(Statement.class));
163163
});
164164
}
@@ -170,7 +170,7 @@ void queryWithResultSetExtractorWithArgumentsShouldCallExecution() {
170170

171171
List<String> rows = cqlTemplate.query("SELECT * from USERS", (row, index) -> row.getString(0));
172172

173-
assertThat(rows).hasSize(3).contains("Walter", "Hank", " Jesse");
173+
assertThat(rows).hasSize(3).contains("Walter", "Hank", "Jesse");
174174
verify(session).execute(any(Statement.class));
175175
});
176176
}
@@ -321,7 +321,7 @@ void queryWithResultSetStatementExtractorShouldCallExecution() {
321321
List<String> result = cqlTemplate.query(SimpleStatement.newInstance("SELECT * from USERS"),
322322
(row, index) -> row.getString(0));
323323

324-
assertThat(result).hasSize(3).contains("Walter", "Hank", " Jesse");
324+
assertThat(result).hasSize(3).contains("Walter", "Hank", "Jesse");
325325
verify(session).execute(any(Statement.class));
326326
});
327327
}
@@ -334,7 +334,7 @@ void queryWithResultSetStatementExtractorWithArgumentsShouldCallExecution() {
334334
List<String> result = cqlTemplate.query(SimpleStatement.newInstance("SELECT * from USERS"),
335335
(row, index) -> row.getString(0));
336336

337-
assertThat(result).hasSize(3).contains("Walter", "Hank", " Jesse");
337+
assertThat(result).hasSize(3).contains("Walter", "Hank", "Jesse");
338338
verify(session).execute(any(Statement.class));
339339
});
340340
}
@@ -347,7 +347,7 @@ public void queryForStreamWithResultSetStatementExtractorWithArgumentsShouldCall
347347
Stream<String> result = cqlTemplate.queryForStream(SimpleStatement.newInstance("SELECT * from USERS"),
348348
(row, index) -> row.getString(0));
349349

350-
assertThat(result.collect(Collectors.toList())).hasSize(3).contains("Walter", "Hank", " Jesse");
350+
assertThat(result.collect(Collectors.toList())).hasSize(3).contains("Walter", "Hank", "Jesse");
351351
verify(session).execute(any(Statement.class));
352352
});
353353
}
@@ -756,7 +756,7 @@ private void doTestStrings(@Nullable Integer fetchSize, @Nullable ConsistencyLev
756756
@Nullable ConsistencyLevel serialConsistencyLevel, @Nullable String executionProfile,
757757
@Nullable CqlIdentifier keyspace, Consumer<CqlTemplate> cqlTemplateConsumer) {
758758

759-
String[] results = { "Walter", "Hank", " Jesse" };
759+
String[] results = { "Walter", "Hank", "Jesse" };
760760

761761
List<Row> rows = Arrays.asList(row, row, row);
762762
when(this.session.execute((Statement) any())).thenReturn(resultSet);

‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void queryWithResultSetExtractorShouldCallExecution() {
182182

183183
Flux<String> flux = reactiveCqlTemplate.query("SELECT * from USERS", (row, index) -> row.getString(0));
184184

185-
flux.as(StepVerifier::create).expectNext("Walter", "Hank", " Jesse").verifyComplete();
185+
flux.as(StepVerifier::create).expectNext("Walter", "Hank", "Jesse").verifyComplete();
186186

187187
verify(session).execute(any(Statement.class));
188188
});
@@ -195,7 +195,7 @@ void queryWithResultSetExtractorWithArgumentsShouldCallExecution() {
195195

196196
Flux<String> flux = reactiveCqlTemplate.query("SELECT * from USERS", (row, index) -> row.getString(0));
197197

198-
flux.as(StepVerifier::create).expectNext("Walter", "Hank", " Jesse").verifyComplete();
198+
flux.as(StepVerifier::create).expectNext("Walter", "Hank", "Jesse").verifyComplete();
199199

200200
verify(session).execute(any(Statement.class));
201201
});
@@ -387,7 +387,7 @@ void queryWithResultSetStatementExtractorShouldCallExecution() {
387387
Flux<String> flux = reactiveCqlTemplate.query(SimpleStatement.newInstance("SELECT * from USERS"),
388388
(row, index) -> row.getString(0));
389389

390-
flux.as(StepVerifier::create).expectNext("Walter", "Hank", " Jesse").verifyComplete();
390+
flux.as(StepVerifier::create).expectNext("Walter", "Hank", "Jesse").verifyComplete();
391391

392392
verify(session).execute(any(Statement.class));
393393
});
@@ -403,7 +403,7 @@ void queryWithResultSetStatementExtractorWithArgumentsShouldCallExecution() {
403403

404404
flux.collectList().as(StepVerifier::create).consumeNextWith(rows -> {
405405

406-
assertThat(rows).hasSize(3).contains("Walter", "Hank", " Jesse");
406+
assertThat(rows).hasSize(3).contains("Walter", "Hank", "Jesse");
407407
}).verifyComplete();
408408

409409
verify(session).execute(any(Statement.class));
@@ -817,7 +817,7 @@ private void doTestStrings(@Nullable Integer fetchSize, @Nullable ConsistencyLev
817817
@Nullable ConsistencyLevel serialConsistencyLevel, @Nullable String executionProfile,
818818
@Nullable CqlIdentifier keyspace, Consumer<ReactiveCqlTemplate> cqlTemplateConsumer) {
819819

820-
String[] results = { "Walter", "Hank", " Jesse" };
820+
String[] results = { "Walter", "Hank", "Jesse" };
821821

822822
when(this.session.execute((Statement) any())).thenReturn(Mono.just(reactiveResultSet));
823823
when(this.reactiveResultSet.rows()).thenReturn(Flux.just(row, row, row));

0 commit comments

Comments
 (0)