Skip to content

Commit a7d7392

Browse files
authored
[Internal] Fixed SqlIT integration tests (#326)
## Changes <!-- Summary of your changes that are easy to understand --> Queries return null, we need to add a check to iterate if non null. Note: Ideally the test should create the query history and then fetch those followed by verifying if it's the same data to properly check for E2E lifecycle. But for just listing, the requests work (although get null response) and more tests should be added for checking create etc... ## Tests <!-- How is this tested? --> Ran Integration test locally.
1 parent c7f2582 commit a7d7392

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

databricks-sdk-java/src/test/java/com/databricks/sdk/integration/QueriesIT.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
import com.databricks.sdk.integration.framework.CollectionUtils;
55
import com.databricks.sdk.integration.framework.EnvContext;
66
import com.databricks.sdk.integration.framework.EnvTest;
7-
import com.databricks.sdk.service.sql.ListQueriesRequest;
8-
import com.databricks.sdk.service.sql.ListQueryObjectsResponseQuery;
9-
import java.util.ArrayList;
10-
import java.util.Iterator;
7+
import com.databricks.sdk.service.sql.LegacyQuery;
8+
import com.databricks.sdk.service.sql.ListQueriesLegacyRequest;
119
import org.junit.jupiter.api.Test;
1210
import org.junit.jupiter.api.extension.ExtendWith;
1311

@@ -16,12 +14,9 @@
1614
class QueriesIT {
1715
@Test
1816
void listsQueries(WorkspaceClient w) {
19-
Iterator<ListQueryObjectsResponseQuery> list =
20-
w.queries().list(new ListQueriesRequest().setPageSize(1000L)).iterator();
21-
22-
java.util.List<ListQueryObjectsResponseQuery> all = new ArrayList<>();
23-
list.forEachRemaining(all::add);
24-
17+
Iterable<LegacyQuery> list =
18+
w.queriesLegacy().list(new ListQueriesLegacyRequest().setPageSize(1000L));
19+
java.util.List<LegacyQuery> all = CollectionUtils.asList(list);
2520
CollectionUtils.assertUnique(all);
2621
}
2722
}

databricks-sdk-java/src/test/java/com/databricks/sdk/integration/SqlIT.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ void listQueryHistoryTimeRange(WorkspaceClient w) {
2222
new ListQueryHistoryRequest()
2323
.setFilterBy(new QueryFilter().setQueryStartTimeRange(timeRange));
2424
Iterable<QueryInfo> queries = w.queryHistory().list(request).getRes();
25-
for (QueryInfo query : queries) {
26-
System.out.println(query);
25+
if (queries != null) {
26+
for (QueryInfo query : queries) {
27+
System.out.println(query);
28+
}
2729
}
2830
}
2931

@@ -33,8 +35,10 @@ void listQueryHistoryUserIds(WorkspaceClient w) {
3335
new ListQueryHistoryRequest()
3436
.setFilterBy(new QueryFilter().setUserIds(Arrays.asList(123L, 456L)));
3537
Iterable<QueryInfo> queries = w.queryHistory().list(request).getRes();
36-
for (QueryInfo query : queries) {
37-
System.out.println(query);
38+
if (queries != null) {
39+
for (QueryInfo query : queries) {
40+
System.out.println(query);
41+
}
3842
}
3943
}
4044
}

0 commit comments

Comments
 (0)