Skip to content

Commit bc4a5fa

Browse files
committed
Refactor integration test
1 parent 8160511 commit bc4a5fa

File tree

1 file changed

+41
-35
lines changed

1 file changed

+41
-35
lines changed

src/test/java/com/squareup/square/integration/LaborTest.java

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@
1212
import com.squareup.square.labor.types.SearchShiftsRequest;
1313
import com.squareup.square.labor.types.UpdateBreakTypeRequest;
1414
import com.squareup.square.labor.types.UpdateShiftRequest;
15+
import com.squareup.square.types.Location;
16+
import com.squareup.square.types.SearchTeamMembersRequest;
17+
import com.squareup.square.types.SearchTeamMembersQuery;
18+
import com.squareup.square.types.SearchTeamMembersFilter;
19+
import com.squareup.square.types.TeamMemberStatus;
1520
import com.squareup.square.types.BreakType;
1621
import com.squareup.square.types.CreateBreakTypeResponse;
1722
import com.squareup.square.types.CreateShiftResponse;
18-
import com.squareup.square.types.CreateTeamMemberRequest;
19-
import com.squareup.square.types.CreateTeamMemberResponse;
2023
import com.squareup.square.types.DeleteBreakTypeResponse;
2124
import com.squareup.square.types.DeleteShiftResponse;
2225
import com.squareup.square.types.GetBreakTypeResponse;
@@ -28,8 +31,11 @@
2831
import com.squareup.square.types.UpdateBreakTypeResponse;
2932
import com.squareup.square.types.UpdateShiftResponse;
3033
import com.squareup.square.types.WorkweekConfig;
34+
3135
import java.time.OffsetDateTime;
3236
import java.time.format.DateTimeFormatter;
37+
import java.util.Collections;
38+
import java.util.List;
3339
import java.util.Optional;
3440
import java.util.UUID;
3541
import org.junit.jupiter.api.AfterEach;
@@ -47,21 +53,32 @@ public class LaborTest {
4753
@BeforeEach
4854
public void before() {
4955
client = TestClientFactory.create();
50-
locationId = Helpers.createLocation(client);
51-
52-
// Create team member for testing
53-
CreateTeamMemberResponse teamResponse = client.teamMembers()
54-
.create(CreateTeamMemberRequest.builder()
55-
.idempotencyKey(UUID.randomUUID().toString())
56-
.teamMember(TeamMember.builder()
57-
.givenName("Sherlock")
58-
.familyName("Holmes")
59-
.build())
60-
.build());
61-
if (!teamResponse.getTeamMember().get().getId().isPresent()) {
62-
throw new RuntimeException("Failed to create team member.");
56+
57+
// Get first available location
58+
List<Location> locations = client.locations().list().getLocations()
59+
.orElseThrow(() -> new RuntimeException("No locations available"));
60+
if (locations.isEmpty()) {
61+
throw new RuntimeException("No locations available for testing");
62+
}
63+
locationId = locations.get(0).getId().orElseThrow(() -> new RuntimeException("Location ID not present"));
64+
65+
// Get first available team member at this location
66+
List<TeamMember> teamMembers = client.teamMembers().search(
67+
SearchTeamMembersRequest.builder()
68+
.query(SearchTeamMembersQuery.builder()
69+
.filter(SearchTeamMembersFilter.builder()
70+
.locationIds(Collections.singletonList(locationId))
71+
.status(TeamMemberStatus.ACTIVE)
72+
.build())
73+
.build())
74+
.build()
75+
).getTeamMembers()
76+
.orElseThrow(() -> new RuntimeException("Failed to get team members"));
77+
78+
if (teamMembers.isEmpty()) {
79+
throw new RuntimeException("No team members available at location " + locationId);
6380
}
64-
memberId = teamResponse.getTeamMember().get().getId().get();
81+
memberId = teamMembers.get(0).getId().orElseThrow(() -> new RuntimeException("Team member ID not present"));
6582

6683
// Create break type for testing
6784
CreateBreakTypeResponse breakResponse = client.labor()
@@ -210,25 +227,14 @@ public void testUpdateShift() {
210227

211228
@Test
212229
public void testDeleteShift() {
213-
// create team member
214-
CreateTeamMemberResponse teamMemberResponse = client.teamMembers()
215-
.create(CreateTeamMemberRequest.builder()
216-
.idempotencyKey(UUID.randomUUID().toString())
217-
.teamMember(TeamMember.builder()
218-
.givenName("Sherlock")
219-
.familyName("Holmes")
220-
.build())
221-
.build());
222-
223-
// create shift
230+
// Create shift
224231
CreateShiftResponse shiftResponse = client.labor()
225232
.shifts()
226233
.create(CreateShiftRequest.builder()
227234
.shift(Shift.builder()
228235
.locationId(locationId)
229236
.startAt(OffsetDateTime.now().format(DateTimeFormatter.ISO_INSTANT))
230-
.teamMemberId(
231-
teamMemberResponse.getTeamMember().get().getId())
237+
.teamMemberId(memberId)
232238
.build())
233239
.idempotencyKey(UUID.randomUUID().toString())
234240
.build());
@@ -239,16 +245,16 @@ public void testDeleteShift() {
239245
if (!shiftResponse.getShift().get().getId().isPresent()) {
240246
throw new RuntimeException("Shift ID is null.");
241247
}
242-
shiftId = shiftResponse.getShift().get().getId().get();
248+
String testShiftId = shiftResponse.getShift().get().getId().get();
243249
DeleteShiftResponse response = client.labor()
244250
.shifts()
245-
.delete(DeleteShiftsRequest.builder().id(shiftId).build());
251+
.delete(DeleteShiftsRequest.builder().id(testShiftId).build());
246252
Assertions.assertNotNull(response);
247253
}
248254

249255
@Test
250256
public void testDeleteBreakType() {
251-
// create break type
257+
// Create break type
252258
CreateBreakTypeResponse breakResponse = client.labor()
253259
.breakTypes()
254260
.create(CreateBreakTypeRequest.builder()
@@ -268,11 +274,11 @@ public void testDeleteBreakType() {
268274
if (!breakType.get().getId().isPresent()) {
269275
throw new RuntimeException("Break ID is null.");
270276
}
271-
breakId = breakType.get().getId().get();
277+
String testBreakId = breakType.get().getId().get();
272278

273279
DeleteBreakTypeResponse response = client.labor()
274280
.breakTypes()
275-
.delete(DeleteBreakTypesRequest.builder().id(breakId).build());
281+
.delete(DeleteBreakTypesRequest.builder().id(testBreakId).build());
276282
Assertions.assertNotNull(response);
277283
}
278284

@@ -283,4 +289,4 @@ public void testListWorkweekConfigs() {
283289
.list(ListWorkweekConfigsRequest.builder().build());
284290
Assertions.assertFalse(response.getItems().isEmpty());
285291
}
286-
}
292+
}

0 commit comments

Comments
 (0)