Skip to content

Commit 2932711

Browse files
varkartewanharris
varkart
authored and
ewanharris
committed
test: improve test coverage for ListStores
1 parent b300f64 commit 2932711

5 files changed

Lines changed: 138 additions & 3 deletions

File tree

‎src/test-integration/java/dev/openfga/sdk/api/OpenFgaApiIntegrationTest.java‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class OpenFgaApiIntegrationTest {
3737

3838
@Container
39-
private static final OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.5.1");
39+
private static final OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.10.2");
4040

4141
private static final ObjectMapper mapper = new ObjectMapper().findAndRegisterModules();
4242
private static final String DEFAULT_USER = "user:81684243-9356-4421-8fbf-a4f8d36aa31b";
@@ -124,6 +124,30 @@ public void listStores() throws Exception {
124124
}
125125
}
126126

127+
@Test
128+
public void listStoresWithNameFilter() throws Exception {
129+
// Given
130+
String testName = thisTestName();
131+
String targetStore = testName + "-target-store";
132+
String otherStore1 = testName + "-other-store-1";
133+
String otherStore2 = testName + "-other-store-2";
134+
135+
// Create multiple stores
136+
createStore(targetStore);
137+
createStore(otherStore1);
138+
createStore(otherStore2);
139+
140+
// When - Filter by name
141+
ListStoresResponse response =
142+
api.listStores(100, null, targetStore).get().getData();
143+
144+
// Then - Should only return the target store
145+
List<String> storeNames =
146+
response.getStores().stream().map(Store::getName).collect(java.util.stream.Collectors.toList());
147+
assertTrue(storeNames.contains(targetStore), "Target store should be in the filtered response");
148+
assertEquals(1, storeNames.size(), "Should return only one store when filtering by exact name");
149+
}
150+
127151
@Test
128152
public void readAuthModel() throws Exception {
129153
// Given

‎src/test-integration/java/dev/openfga/sdk/api/client/OpenFgaClientIntegrationTest.java‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
public class OpenFgaClientIntegrationTest {
3838

3939
@Container
40-
private static final OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.5.1");
40+
private static final OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.10.2");
4141

4242
private static final ObjectMapper mapper = new ObjectMapper().findAndRegisterModules();
4343
private static final String DEFAULT_USER = "user:81684243-9356-4421-8fbf-a4f8d36aa31b";
@@ -141,6 +141,32 @@ public void listStores() throws Exception {
141141
}
142142
}
143143

144+
@Test
145+
public void listStoresWithNameFilter() throws Exception {
146+
// Given
147+
String testName = thisTestName();
148+
String targetStore = testName + "-target";
149+
String otherStore1 = testName + "-other-1";
150+
String otherStore2 = testName + "-other-2";
151+
152+
// Create multiple stores
153+
createStore(targetStore);
154+
createStore(otherStore1);
155+
createStore(otherStore2);
156+
157+
ClientListStoresOptions options = new ClientListStoresOptions().name(targetStore);
158+
159+
// When - Filter by name using client options
160+
ClientListStoresResponse response = fga.listStores(options).get();
161+
162+
// Then - Should only return the target store
163+
assertNotNull(response.getStores());
164+
List<String> storeNames =
165+
response.getStores().stream().map(Store::getName).collect(java.util.stream.Collectors.toList());
166+
assertTrue(storeNames.contains(targetStore), "Target store should be in the filtered response");
167+
assertEquals(1, storeNames.size(), "Should return only one store when filtering by exact name");
168+
}
169+
144170
@Test
145171
public void readAuthModel() throws Exception {
146172
// Given

‎src/test-integration/java/dev/openfga/sdk/example/ExampleTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@Testcontainers
99
public class ExampleTest {
1010
@Container
11-
private static final OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.5.1");
11+
private static final OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.10.2");
1212

1313
private final Example1 example1 = new Example1();
1414

‎src/test/java/dev/openfga/sdk/api/OpenFgaApiTest.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import static org.hamcrest.Matchers.*;
1616
import static org.junit.jupiter.api.Assertions.*;
17+
import static org.mockito.ArgumentMatchers.any;
1718
import static org.mockito.Mockito.*;
1819

1920
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,6 +32,7 @@
3132
import java.util.concurrent.ExecutionException;
3233
import org.junit.jupiter.api.BeforeEach;
3334
import org.junit.jupiter.api.Test;
35+
import org.mockito.ArgumentMatchers;
3436

3537
/**
3638
* API tests for OpenFgaApi.
@@ -74,6 +76,9 @@ public void beforeEachTest() throws Exception {
7476
when(mockConfiguration.getMaxRetries()).thenReturn(DEFAULT_MAX_RETRIES);
7577
when(mockConfiguration.getMinimumRetryDelay()).thenReturn(DEFAULT_RETRY_DELAY);
7678
when(mockConfiguration.getTelemetryConfiguration()).thenReturn(DEFAULT_TELEMETRY_CONFIG);
79+
when(mockConfiguration.override(ArgumentMatchers.any(ConfigurationOverride.class)))
80+
.thenReturn(mockConfiguration);
81+
doNothing().when(mockConfiguration).assertValid();
7782

7883
mockApiClient = mock(ApiClient.class);
7984
when(mockApiClient.getObjectMapper()).thenReturn(mapper);
@@ -134,6 +139,57 @@ public void listStoresTest_withNameFilter() throws Exception {
134139
assertEquals(storeName, stores.get(0).getName());
135140
}
136141

142+
@Test
143+
public void listStoresTest_withNameOnly() throws Exception {
144+
// Given
145+
String responseBody =
146+
String.format("{\"stores\":[{\"id\":\"%s\",\"name\":\"%s\"}]}", DEFAULT_STORE_ID, DEFAULT_STORE_NAME);
147+
String storeName = "test-store";
148+
String getUrl = String.format("https://api.fga.example/stores?name=%s", storeName);
149+
mockHttpClient.onGet(getUrl).doReturn(200, responseBody);
150+
Integer pageSize = null; // Input is optional
151+
String continuationToken = null; // Input is optional
152+
153+
// When - This covers the specific line: return listStores(pageSize, continuationToken, name,
154+
// this.configuration);
155+
var response = fga.listStores(pageSize, continuationToken, storeName).get();
156+
157+
// Then
158+
mockHttpClient.verify().get(getUrl).called(1);
159+
assertNotNull(response.getData());
160+
assertNotNull(response.getData().getStores());
161+
var stores = response.getData().getStores();
162+
assertEquals(1, stores.size());
163+
assertEquals(DEFAULT_STORE_ID, stores.get(0).getId());
164+
assertEquals(DEFAULT_STORE_NAME, stores.get(0).getName());
165+
}
166+
167+
@Test
168+
public void listStoresTest_withConfigurationOverride() throws Exception {
169+
// Given
170+
String responseBody =
171+
String.format("{\"stores\":[{\"id\":\"%s\",\"name\":\"%s\"}]}", DEFAULT_STORE_ID, DEFAULT_STORE_NAME);
172+
mockHttpClient.onGet("https://api.fga.example/stores").doReturn(200, responseBody);
173+
Integer pageSize = null; // Input is optional
174+
String continuationToken = null; // Input is optional
175+
String name = null;
176+
ConfigurationOverride configOverride = new ConfigurationOverride();
177+
178+
// When - This covers the specific line: return listStores(pageSize, continuationToken, null,
179+
// this.configuration.override(configurationOverride));
180+
var response = fga.listStores(pageSize, continuationToken, name, configOverride)
181+
.get();
182+
183+
// Then
184+
mockHttpClient.verify().get("https://api.fga.example/stores").called(1);
185+
assertNotNull(response.getData());
186+
assertNotNull(response.getData().getStores());
187+
var stores = response.getData().getStores();
188+
assertEquals(1, stores.size());
189+
assertEquals(DEFAULT_STORE_ID, stores.get(0).getId());
190+
assertEquals(DEFAULT_STORE_NAME, stores.get(0).getName());
191+
}
192+
137193
@Test
138194
public void listStores_400() {
139195
// Given

‎src/test/java/dev/openfga/sdk/api/client/OpenFgaClientTest.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import static org.hamcrest.core.StringContains.containsString;
1818
import static org.junit.jupiter.api.Assertions.*;
1919
import static org.mockito.ArgumentMatchers.any;
20+
import static org.mockito.ArgumentMatchers.anyInt;
2021
import static org.mockito.Mockito.*;
2122

2223
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -315,6 +316,34 @@ public void listStoresTest_withNameFilter() throws Exception {
315316
assertEquals(storeName, response.getStores().get(0).getName());
316317
}
317318

319+
@Test
320+
public void listStoresTest_withAllParameters() throws Exception {
321+
// Given
322+
String responseBody =
323+
String.format("{\"stores\":[{\"id\":\"%s\",\"name\":\"%s\"}]}", DEFAULT_STORE_ID, DEFAULT_STORE_NAME);
324+
int pageSize = 10;
325+
String continuationToken = "continuationToken";
326+
String storeName = "test-store";
327+
String getUrl = String.format(
328+
"https://api.fga.example/stores?page_size=%d&continuation_token=%s&name=%s",
329+
pageSize, continuationToken, storeName);
330+
mockHttpClient.onGet(getUrl).doReturn(200, responseBody);
331+
ClientListStoresOptions options = new ClientListStoresOptions()
332+
.pageSize(pageSize)
333+
.continuationToken(continuationToken)
334+
.name(storeName);
335+
336+
// When
337+
ClientListStoresResponse response = fga.listStores(options).get();
338+
339+
// Then
340+
mockHttpClient.verify().get(getUrl).called(1);
341+
assertNotNull(response.getStores());
342+
assertEquals(1, response.getStores().size());
343+
assertEquals(DEFAULT_STORE_ID, response.getStores().get(0).getId());
344+
assertEquals(DEFAULT_STORE_NAME, response.getStores().get(0).getName());
345+
}
346+
318347
/**
319348
* Create a store.
320349
*/

0 commit comments

Comments
 (0)