From bc14d466c231a3a928031ffc51b246d88976c484 Mon Sep 17 00:00:00 2001 From: dan-thera Date: Mon, 8 Jul 2024 11:15:44 -0400 Subject: [PATCH] Fix tests --- .gitignore | 1 + src/main/java/com/seam/api/SeamBuilder.java | 42 ------------------- .../types/ConnectedAccountsGetRequest.java | 8 ++++ .../ConnectWebviewsClient.java | 6 +++ .../seam/api/accesscode/AccessCodesTest.java | 6 ++- .../api/actionattempt/ActionAttemptsTest.java | 3 +- .../ConnectedAccountsTest.java | 2 +- .../connectwebview/ConnectWebviewsTest.java | 2 +- 8 files changed, 23 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index d4199ab..7570ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ .settings .node build +src/main/java/com/seam/api/SeamBuilder.java # IntelliJ *.iml diff --git a/src/main/java/com/seam/api/SeamBuilder.java b/src/main/java/com/seam/api/SeamBuilder.java index 9f6790b..05a0bed 100644 --- a/src/main/java/com/seam/api/SeamBuilder.java +++ b/src/main/java/com/seam/api/SeamBuilder.java @@ -11,12 +11,6 @@ public final class SeamBuilder { private String apiKey = null; - private String seamWorkspace = null; - - private String seamClientSessionToken = null; - - private String clientSessionToken = null; - private Environment environment = Environment.DEFAULT; /** @@ -27,30 +21,6 @@ public SeamBuilder apiKey(String apiKey) { return this; } - /** - * Sets seamWorkspace - */ - public SeamBuilder seamWorkspace(String seamWorkspace) { - this.seamWorkspace = seamWorkspace; - return this; - } - - /** - * Sets seamClientSessionToken - */ - public SeamBuilder seamClientSessionToken(String seamClientSessionToken) { - this.seamClientSessionToken = seamClientSessionToken; - return this; - } - - /** - * Sets clientSessionToken - */ - public SeamBuilder clientSessionToken(String clientSessionToken) { - this.clientSessionToken = clientSessionToken; - return this; - } - public SeamBuilder environment(Environment environment) { this.environment = environment; return this; @@ -63,18 +33,6 @@ public SeamBuilder url(String url) { public Seam build() { this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.apiKey); - if (seamWorkspace == null) { - throw new RuntimeException("Please provide seamWorkspace"); - } - this.clientOptionsBuilder.addHeader("seam-workspace", this.seamWorkspace); - if (seamClientSessionToken == null) { - throw new RuntimeException("Please provide seamClientSessionToken"); - } - this.clientOptionsBuilder.addHeader("seam-client-session-token", this.seamClientSessionToken); - if (clientSessionToken == null) { - throw new RuntimeException("Please provide clientSessionToken"); - } - this.clientOptionsBuilder.addHeader("client-session-token", this.clientSessionToken); clientOptionsBuilder.environment(this.environment); return new Seam(clientOptionsBuilder.build()); } diff --git a/src/main/java/com/seam/api/resources/connectedaccounts/types/ConnectedAccountsGetRequest.java b/src/main/java/com/seam/api/resources/connectedaccounts/types/ConnectedAccountsGetRequest.java index e80780d..96ec080 100644 --- a/src/main/java/com/seam/api/resources/connectedaccounts/types/ConnectedAccountsGetRequest.java +++ b/src/main/java/com/seam/api/resources/connectedaccounts/types/ConnectedAccountsGetRequest.java @@ -66,6 +66,14 @@ public static ConnectedAccountsGetRequest of(ConnectedAccountsGetRequestEmail va return new ConnectedAccountsGetRequest(value, 1); } + public static ConnectedAccountsGetRequest id(String id) { + return new ConnectedAccountsGetRequest( + ConnectedAccountsGetRequestConnectedAccountId.builder() + .connectedAccountId(id) + .build(), + 0); + } + public interface Visitor { T visit(ConnectedAccountsGetRequestConnectedAccountId value); diff --git a/src/main/java/com/seam/api/resources/connectwebviews/ConnectWebviewsClient.java b/src/main/java/com/seam/api/resources/connectwebviews/ConnectWebviewsClient.java index df2b87f..fe95bf5 100644 --- a/src/main/java/com/seam/api/resources/connectwebviews/ConnectWebviewsClient.java +++ b/src/main/java/com/seam/api/resources/connectwebviews/ConnectWebviewsClient.java @@ -154,6 +154,12 @@ public ConnectWebview get(ConnectWebviewsGetRequest request) { return get(request, null); } + public ConnectWebview getById(String connectWebviewId) { + return get(ConnectWebviewsGetRequest.builder() + .connectWebviewId(connectWebviewId) + .build()); + } + public ConnectWebview get(ConnectWebviewsGetRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() diff --git a/src/test/java/com/seam/api/accesscode/AccessCodesTest.java b/src/test/java/com/seam/api/accesscode/AccessCodesTest.java index 821a38a..ac60f34 100644 --- a/src/test/java/com/seam/api/accesscode/AccessCodesTest.java +++ b/src/test/java/com/seam/api/accesscode/AccessCodesTest.java @@ -1,5 +1,6 @@ package com.seam.api.accesscode; +import com.seam.api.resources.accesscodes.types.AccessCodesDeleteResponse; import java.util.List; import java.util.stream.Collectors; @@ -118,11 +119,12 @@ public void test_access_codes() { // .build()); // Assertions.assertThat(accessCode.getType()).isEqualTo(AccessCodeType.TIME_BOUND); - ActionAttempt deleteActionAttempt = seam.accessCodes() + AccessCodesDeleteResponse deleteActionAttempt = seam.accessCodes() .delete(AccessCodesDeleteRequest.builder() .accessCodeId(createdAccessCode.getAccessCodeId()) .build()); - Assertions.assertThat(deleteActionAttempt.isSuccess()); + Assertions.assertThat(deleteActionAttempt).isNotNull(); + Assertions.assertThat(deleteActionAttempt.getActionAttempt()).isNotNull(); accessCodes = seam.accessCodes() .createMultiple(AccessCodesCreateMultipleRequest.builder() diff --git a/src/test/java/com/seam/api/actionattempt/ActionAttemptsTest.java b/src/test/java/com/seam/api/actionattempt/ActionAttemptsTest.java index 3c713d3..68a5db0 100644 --- a/src/test/java/com/seam/api/actionattempt/ActionAttemptsTest.java +++ b/src/test/java/com/seam/api/actionattempt/ActionAttemptsTest.java @@ -5,6 +5,7 @@ import com.seam.api.TestUtils.FakeSeamStartedResponse; import com.seam.api.resources.accesscodes.requests.AccessCodesCreateRequest; import com.seam.api.resources.accesscodes.requests.AccessCodesDeleteRequest; +import com.seam.api.resources.accesscodes.types.AccessCodesDeleteResponse; import com.seam.api.types.AccessCode; import com.seam.api.types.ActionAttempt; import com.seam.api.types.Device; @@ -41,7 +42,7 @@ public void test_access_attempts() { .code("4444") .build()); - ActionAttempt deleteActionAttempt = seam.accessCodes() + AccessCodesDeleteResponse deleteActionAttempt = seam.accessCodes() .delete(AccessCodesDeleteRequest.builder() .accessCodeId(createdAccessCode.getAccessCodeId()) .build()); diff --git a/src/test/java/com/seam/api/connectedaccounts/ConnectedAccountsTest.java b/src/test/java/com/seam/api/connectedaccounts/ConnectedAccountsTest.java index 040a006..5302a70 100644 --- a/src/test/java/com/seam/api/connectedaccounts/ConnectedAccountsTest.java +++ b/src/test/java/com/seam/api/connectedaccounts/ConnectedAccountsTest.java @@ -1,5 +1,6 @@ package com.seam.api.connectedaccounts; +import com.seam.api.resources.connectedaccounts.types.ConnectedAccountsGetRequest; import java.util.List; import org.assertj.core.api.Assertions; @@ -11,7 +12,6 @@ import com.seam.api.TestUtils; import com.seam.api.TestUtils.FakeSeamStartedResponse; import com.seam.api.types.ConnectedAccount; -import com.seam.api.types.ConnectedAccountsGetRequest; public final class ConnectedAccountsTest { diff --git a/src/test/java/com/seam/api/connectwebview/ConnectWebviewsTest.java b/src/test/java/com/seam/api/connectwebview/ConnectWebviewsTest.java index 01f31c6..bf0b1bb 100644 --- a/src/test/java/com/seam/api/connectwebview/ConnectWebviewsTest.java +++ b/src/test/java/com/seam/api/connectwebview/ConnectWebviewsTest.java @@ -5,7 +5,7 @@ import com.seam.api.TestUtils.FakeSeamStartedResponse; import com.seam.api.resources.connectwebviews.requests.ConnectWebviewsCreateRequest; import com.seam.api.resources.connectwebviews.requests.ConnectWebviewsGetRequest; -import com.seam.api.types.AcceptedProvider; +import com.seam.api.resources.connectwebviews.types.AcceptedProvider; import com.seam.api.types.ConnectWebview; import com.seam.api.types.ProviderCategory; import java.util.List;