Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(fix): refactor SQL query assertions in compoundNameConventionTest for accuracy #3277

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

test(fix): refactor SQL query assertions in compoundNameConventionTest for accuracy #3277

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aa7f9b
refactor SQL query assertions
Jake-Zhi0Wang Sep 2, 2024
b753000
Test Fix: Refactor SQL query assertions in test for accuracy in compo…
Jake-Zhi0Wang Sep 2, 2024
b20f79a
Merge branch 'fix-flaky' of Jake-Zhi0Wang:Jake-Zhi0Wang/spring-cloud-…
Jake-Zhi0Wang Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions ...ava/com/google/cloud/spring/data/spanner/repository/query/SpannerStatementQueryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -118,15 +120,30 @@ void compoundNameConventionTest() throws NoSuchMethodException {
invocation -> {
Statement statement = invocation.getArgument(1);

String expectedQuery =
"SELECT DISTINCT shares, trader_id, ticker, price, action, id, value FROM trades"
+ " WHERE ( LOWER(action)=LOWER(@tag0) AND ticker=@tag1 ) OR ("
+ " trader_id=@tag2 AND price<@tag3 ) OR ( price>=@tag4 AND id IS NOT NULL AND"
+ " trader_id=NULL AND trader_id LIKE @tag7 AND price=TRUE AND price=FALSE"
+ " AND price>@tag10 AND price<=@tag11 AND price IN UNNEST(@tag12) AND"
+ " value<@tag13 ) ORDER BY id DESC LIMIT 3";
String actualSql = statement.getSql();

assertThat(actualSql.trim()).startsWith("SELECT DISTINCT");

String actualSelectClause = actualSql.substring(
actualSql.indexOf("SELECT DISTINCT") + "SELECT DISTINCT".length(),
actualSql.indexOf("FROM trades")
).trim();

String expectedSelectClause = "shares, trader_id, ticker, price, action, id, value";

Set<String> actualSelectFields = new HashSet<>(Arrays.asList(actualSelectClause.split(",\\s*")));
Set<String> expectedSelectFields = new HashSet<>(Arrays.asList(expectedSelectClause.split(",\\s*")));

assertThat(actualSelectFields).isEqualTo(expectedSelectFields);

String actualWhereAndOrderClause = actualSql.substring(actualSql.indexOf("FROM trades")).trim();
String expectedWhereAndOrderClause = "FROM trades WHERE ( LOWER(action)=LOWER(@tag0) AND ticker=@tag1 ) OR ("
+ " trader_id=@tag2 AND price<@tag3 ) OR ( price>=@tag4 AND id IS NOT NULL AND"
+ " trader_id=NULL AND trader_id LIKE @tag7 AND price=TRUE AND price=FALSE"
+ " AND price>@tag10 AND price<=@tag11 AND price IN UNNEST(@tag12) AND"
+ " value<@tag13 ) ORDER BY id DESC LIMIT 3";

assertThat(statement.getSql()).isEqualTo(expectedQuery);
assertThat(actualWhereAndOrderClause).isEqualTo(expectedWhereAndOrderClause);

Map<String, Value> paramMap = statement.getParameters();

Expand Down