From ecc11d270138c31755e459085b391f8650f58a64 Mon Sep 17 00:00:00 2001 From: Chris Lelievre Date: Fri, 21 Nov 2025 09:52:48 +1300 Subject: [PATCH 1/3] NZP-5516 Update tests to remove usage of deprecated NZ API fields --- .../xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java | 2 +- .../xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java index 99c3f4b5..d444e5d6 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java @@ -45,7 +45,7 @@ public void createEmployeeLeaveSetupTest() throws IOException { assertThat(response.getLeaveSetup().getHolidayPayOpeningBalance(), is(equalTo(10.0))); assertThat(response.getLeaveSetup().getAnnualLeaveOpeningBalance(), is(equalTo(100.0))); - assertThat(response.getLeaveSetup().getSickLeaveHoursToAccrueAnnually(), is(equalTo(20.0))); + assertThat(response.getLeaveSetup().getSickLeaveToAccrueAnnually(), is(equalTo(20.0))); assertThat(response.getLeaveSetup().getSickLeaveOpeningBalance(), is(equalTo(10.0))); //System.out.println(response.toString()); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java index dc5cd87f..c459a40c 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java @@ -46,7 +46,7 @@ public void getEmployeeLeaveTypesTest() throws IOException { assertThat(response.getLeaveTypes().get(0).getLeaveTypeID(), is(equalTo(UUID.fromString("0441497f-5dc7-4cd3-a90d-f2e07e21b2a6")))); assertThat(response.getLeaveTypes().get(0).getScheduleOfAccrual(), is(equalTo(com.xero.models.payrollnz.EmployeeLeaveType.ScheduleOfAccrualEnum.PERCENTAGEOFGROSSEARNINGS))); - assertThat(response.getLeaveTypes().get(0).getHoursAccruedAnnually(), is(equalTo(0.0))); + assertThat(response.getLeaveTypes().get(0).getUnitsAccruedAnnually(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getMaximumToAccrue(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getOpeningBalance(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getPercentageOfGrossEarnings(), is(equalTo(8.0))); @@ -65,7 +65,7 @@ public void createEmployeeLeaveTypesTest() throws IOException { assertThat(response.getLeaveType().getLeaveTypeID(), is(equalTo(UUID.fromString("35da97ae-05b9-427f-9a98-69157ba42cec")))); assertThat(response.getLeaveType().getScheduleOfAccrual(), is(equalTo(com.xero.models.payrollnz.EmployeeLeaveType.ScheduleOfAccrualEnum.ANNUALLYAFTER6MONTHS))); - assertThat(response.getLeaveType().getHoursAccruedAnnually(), is(equalTo(10.0))); + assertThat(response.getLeaveType().getUnitsAccruedAnnually(), is(equalTo(0.0))); assertThat(response.getLeaveType().getMaximumToAccrue(), is(equalTo(80.0))); assertThat(response.getLeaveType().getOpeningBalance(), is(equalTo(100.0))); assertThat(response.getLeaveType().getPercentageOfGrossEarnings(), is(equalTo(0.0))); From eb94ee7362c54123c23020e7df622d5db93f446a Mon Sep 17 00:00:00 2001 From: Chris Lelievre Date: Fri, 21 Nov 2025 09:52:48 +1300 Subject: [PATCH 2/3] NZP-5516 Update tests to remove usage of deprecated NZ API fields --- .../xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java | 2 +- .../xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java index 99c3f4b5..d444e5d6 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java @@ -45,7 +45,7 @@ public void createEmployeeLeaveSetupTest() throws IOException { assertThat(response.getLeaveSetup().getHolidayPayOpeningBalance(), is(equalTo(10.0))); assertThat(response.getLeaveSetup().getAnnualLeaveOpeningBalance(), is(equalTo(100.0))); - assertThat(response.getLeaveSetup().getSickLeaveHoursToAccrueAnnually(), is(equalTo(20.0))); + assertThat(response.getLeaveSetup().getSickLeaveToAccrueAnnually(), is(equalTo(20.0))); assertThat(response.getLeaveSetup().getSickLeaveOpeningBalance(), is(equalTo(10.0))); //System.out.println(response.toString()); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java index dc5cd87f..c459a40c 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java @@ -46,7 +46,7 @@ public void getEmployeeLeaveTypesTest() throws IOException { assertThat(response.getLeaveTypes().get(0).getLeaveTypeID(), is(equalTo(UUID.fromString("0441497f-5dc7-4cd3-a90d-f2e07e21b2a6")))); assertThat(response.getLeaveTypes().get(0).getScheduleOfAccrual(), is(equalTo(com.xero.models.payrollnz.EmployeeLeaveType.ScheduleOfAccrualEnum.PERCENTAGEOFGROSSEARNINGS))); - assertThat(response.getLeaveTypes().get(0).getHoursAccruedAnnually(), is(equalTo(0.0))); + assertThat(response.getLeaveTypes().get(0).getUnitsAccruedAnnually(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getMaximumToAccrue(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getOpeningBalance(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getPercentageOfGrossEarnings(), is(equalTo(8.0))); @@ -65,7 +65,7 @@ public void createEmployeeLeaveTypesTest() throws IOException { assertThat(response.getLeaveType().getLeaveTypeID(), is(equalTo(UUID.fromString("35da97ae-05b9-427f-9a98-69157ba42cec")))); assertThat(response.getLeaveType().getScheduleOfAccrual(), is(equalTo(com.xero.models.payrollnz.EmployeeLeaveType.ScheduleOfAccrualEnum.ANNUALLYAFTER6MONTHS))); - assertThat(response.getLeaveType().getHoursAccruedAnnually(), is(equalTo(10.0))); + assertThat(response.getLeaveType().getUnitsAccruedAnnually(), is(equalTo(0.0))); assertThat(response.getLeaveType().getMaximumToAccrue(), is(equalTo(80.0))); assertThat(response.getLeaveType().getOpeningBalance(), is(equalTo(100.0))); assertThat(response.getLeaveType().getPercentageOfGrossEarnings(), is(equalTo(0.0))); From c53b6cce6ac9269048dd44336d810030b0e71d3e Mon Sep 17 00:00:00 2001 From: Chris Lelievre Date: Wed, 26 Nov 2025 10:49:40 +1300 Subject: [PATCH 3/3] NZP-5516 remove deprecated NZ api fields --- .../xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java | 1 - .../xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java index d444e5d6..fc696992 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java @@ -45,7 +45,6 @@ public void createEmployeeLeaveSetupTest() throws IOException { assertThat(response.getLeaveSetup().getHolidayPayOpeningBalance(), is(equalTo(10.0))); assertThat(response.getLeaveSetup().getAnnualLeaveOpeningBalance(), is(equalTo(100.0))); - assertThat(response.getLeaveSetup().getSickLeaveToAccrueAnnually(), is(equalTo(20.0))); assertThat(response.getLeaveSetup().getSickLeaveOpeningBalance(), is(equalTo(10.0))); //System.out.println(response.toString()); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java index c459a40c..bcdac31b 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java @@ -43,10 +43,9 @@ public void getEmployeeLeaveTypesTest() throws IOException { LocalDate startDate = LocalDate.of(2020, Month.MARCH, 30); LocalDate endDate = LocalDate.of(2020, Month.MARCH, 30); EmployeeLeaveTypes response = payrollNzApi.getEmployeeLeaveTypes(accessToken, xeroTenantId, employeeId); - + assertThat(response.getLeaveTypes().get(0).getLeaveTypeID(), is(equalTo(UUID.fromString("0441497f-5dc7-4cd3-a90d-f2e07e21b2a6")))); assertThat(response.getLeaveTypes().get(0).getScheduleOfAccrual(), is(equalTo(com.xero.models.payrollnz.EmployeeLeaveType.ScheduleOfAccrualEnum.PERCENTAGEOFGROSSEARNINGS))); - assertThat(response.getLeaveTypes().get(0).getUnitsAccruedAnnually(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getMaximumToAccrue(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getOpeningBalance(), is(equalTo(0.0))); assertThat(response.getLeaveTypes().get(0).getPercentageOfGrossEarnings(), is(equalTo(8.0))); @@ -65,7 +64,6 @@ public void createEmployeeLeaveTypesTest() throws IOException { assertThat(response.getLeaveType().getLeaveTypeID(), is(equalTo(UUID.fromString("35da97ae-05b9-427f-9a98-69157ba42cec")))); assertThat(response.getLeaveType().getScheduleOfAccrual(), is(equalTo(com.xero.models.payrollnz.EmployeeLeaveType.ScheduleOfAccrualEnum.ANNUALLYAFTER6MONTHS))); - assertThat(response.getLeaveType().getUnitsAccruedAnnually(), is(equalTo(0.0))); assertThat(response.getLeaveType().getMaximumToAccrue(), is(equalTo(80.0))); assertThat(response.getLeaveType().getOpeningBalance(), is(equalTo(100.0))); assertThat(response.getLeaveType().getPercentageOfGrossEarnings(), is(equalTo(0.0)));