Skip to content

fix: test fixes #703

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

Merged
merged 1 commit into from
Jun 7, 2023
Merged

fix: test fixes #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/test/java/io/supertokens/test/httpRequest/HttpRequestForTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public static <T> T sendGETRequest(Main main, String requestID, String url, Map<
try {
con = (HttpURLConnection) obj.openConnection();
con.setConnectTimeout(connectionTimeoutMS);
con.setReadTimeout(readTimeoutMS);
con.setReadTimeout(readTimeoutMS + 1000);
if (version != null) {
con.setRequestProperty("api-version", version + "");
}
Expand Down Expand Up @@ -139,7 +139,7 @@ private static <T> T sendJsonRequest(Main main, String requestID, String url, Js
con = (HttpURLConnection) obj.openConnection();
con.setRequestMethod(method);
con.setConnectTimeout(connectionTimeoutMS);
con.setReadTimeout(readTimeoutMS);
con.setReadTimeout(readTimeoutMS + 1000);
con.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
if (version != null) {
con.setRequestProperty("api-version", version + "");
Expand Down Expand Up @@ -249,7 +249,7 @@ public static <T> T sendJsonDELETERequestWithQueryParams(Main main, String reque
con = (HttpURLConnection) obj.openConnection();
con.setRequestMethod("DELETE");
con.setConnectTimeout(connectionTimeoutMS);
con.setReadTimeout(readTimeoutMS);
con.setReadTimeout(readTimeoutMS + 1000);
if (version != null) {
con.setRequestProperty("api-version", version + "");
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/supertokens/test/multitenant/StorageLayerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,7 +1689,7 @@ public void testOverwriteTenantForRaceConditions()
));
break;
} catch (Exception e) {
if (e.getMessage().toLowerCase().contains("request timed out") || e.getMessage().contains("concurrent delete")) {
if (e.getMessage().toLowerCase().contains("request timed out") || e.getMessage().contains("concurrent delete") || e.getMessage().contains("concurrent update")) {
// retry, because connection was timed out, or
// in case of postgres, number of retries may not be enough, we retry here anyway
continue;
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/io/supertokens/test/totp/TOTPRecipeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,8 @@ public void updateDeviceNameTest() throws Exception {
// Verify that the device name has been updated:
TOTPDevice[] devices = Totp.getDevices(main, "user");
assert (devices.length == 2);
assert (devices[0].deviceName.equals("device2"));
assert (devices[1].deviceName.equals("new-device-name"));
assert (devices[0].deviceName.equals("device2") && devices[1].deviceName.equals("new-device-name")
|| devices[0].deviceName.equals("new-device-name") && devices[1].deviceName.equals("device2"));

// Verify that TOTP verification still works:
Totp.verifyDevice(main, "user", devices[0].deviceName, generateTotpCode(main, devices[0]));
Expand Down Expand Up @@ -533,8 +533,7 @@ public void getDevicesTest() throws Exception {

TOTPDevice[] devices = Totp.getDevices(main, "user");
assert (devices.length == 2);
assert devices[0].equals(device1);
assert devices[1].equals(device2);
assert (devices[0].equals(device1) && devices[1].equals(device2)) || (devices[1].equals(device1) && devices[0].equals(device2));
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/io/supertokens/test/totp/TOTPStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ public void createDeviceTests() throws Exception {
storedDevices = storage.getDevices(new AppIdentifier(null, null), "user");

assert (storedDevices.length == 2);
assert storedDevices[0].equals(device1);
assert storedDevices[1].equals(device2);
assert (storedDevices[0].equals(device1) && storedDevices[1].equals(device2))
|| (storedDevices[0].equals(device2) && storedDevices[1].equals(device1));

assertThrows(DeviceAlreadyExistsException.class,
() -> storage.createDevice(new AppIdentifier(null, null), device2Duplicate));
Expand Down Expand Up @@ -365,8 +365,8 @@ public void getDevicesTest() throws Exception {
TOTPDevice[] storedDevices = storage.getDevices(new AppIdentifier(null, null), "user");

assert (storedDevices.length == 2);
assert (storedDevices[0].deviceName.equals("d1"));
assert (storedDevices[1].deviceName.equals("d2"));
assert (storedDevices[0].deviceName.equals("d1") || storedDevices[1].deviceName.equals("d2"))
|| (storedDevices[0].deviceName.equals("d2") || storedDevices[1].deviceName.equals("d1"));

storedDevices = storage.getDevices(new AppIdentifier(null, null), "non-existent-user");
assert (storedDevices.length == 0);
Expand Down