Skip to content

fix some tests in user #17

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 2 commits into from
Jul 17, 2025
Merged

fix some tests in user #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a31b9
fix some tests in user
Avinash-Kamath Jul 17, 2025
51f9f87
fix some tests in user
Avinash-Kamath Jul 17, 2025
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
31 changes: 23 additions & 8 deletions src/test/java/UserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import com.scalekit.ScalekitClient;
import com.scalekit.exceptions.APIException;
import com.scalekit.grpc.scalekit.v1.organizations.CreateOrganization;
import com.scalekit.grpc.scalekit.v1.organizations.Organization;
import com.scalekit.grpc.scalekit.v1.users.*;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand All @@ -10,7 +12,7 @@ public class UserTests {

private static ScalekitClient client;
private static String testOrg;
private static String testOrg2;


@BeforeAll
static void init() {
Expand All @@ -19,7 +21,6 @@ static void init() {
String clientId = System.getenv("SCALEKIT_CLIENT_ID");
String apiSecret = System.getenv("SCALEKIT_CLIENT_SECRET");
testOrg = System.getenv("TEST_ORGANIZATION");
testOrg2 = System.getenv("TEST_ORGANIZATION2");
client = new ScalekitClient(environmentUrl, clientId, apiSecret);
}

Expand Down Expand Up @@ -99,8 +100,10 @@ public void testUpdateUser() {
@Test
public void testCreateAndDeleteUser() {
// Create a user

String userEmail = "sdktest" + System.currentTimeMillis() + "@example.com"; // Unique email for each test run
CreateUser user = CreateUser.newBuilder()
.setEmail("testin@example.com")
.setEmail(userEmail)
.build();

CreateUserAndMembershipRequest createRequest = CreateUserAndMembershipRequest.newBuilder()
Expand Down Expand Up @@ -131,8 +134,10 @@ public void testCreateAndDeleteUser() {
@Test
public void testAddUserToOrganization() {
// First create a user

String userEmail = "sdktest" + System.currentTimeMillis() + "@example.com"; // Unique email for each test run
CreateUser user = CreateUser.newBuilder()
.setEmail("org2.user@example.com")
.setEmail(userEmail)
.build();

CreateUserAndMembershipRequest createRequest = CreateUserAndMembershipRequest.newBuilder()
Expand All @@ -149,19 +154,29 @@ public void testAddUserToOrganization() {
CreateMembership membership = CreateMembership.newBuilder()
.build(); // Add any required membership fields here if needed

Organization testOrgUser = client.organizations().create(
CreateOrganization.newBuilder()
.setDisplayName("Test Organization For User Membership")
.build()
);

CreateMembershipRequest addRequest = CreateMembershipRequest.newBuilder()
.setOrganizationId(testOrg2)
.setOrganizationId(testOrgUser.getId())
.setId(userId) // Set the user ID
.setMembership(membership) // Set the required membership field
.build();

CreateMembershipResponse addResponse = client.users().createMembership(testOrg2, userId, addRequest);


CreateMembershipResponse addResponse = client.users().createMembership(testOrgUser.getId(), userId, addRequest);
assertNotNull(addResponse);
assertNotNull(addResponse.getUser());
String userId2 = addResponse.getUser().getId();


// Cleanup
client.users().deleteUser(userId);
client.users().deleteUser(userId2);
client.organizations().deleteById(testOrgUser.getId());


}
}