From 04da323ef602b564b4a5f4a28f2097b30abebb9a Mon Sep 17 00:00:00 2001 From: Ryan McCarthy Date: Wed, 22 Oct 2025 14:45:05 +1300 Subject: [PATCH 1/3] [PETOSS-829] Removed tests for endpoints that have also been removed --- .../api/client/PayrollNzApiPayRunsTest.java | 38 +------------------ .../api/client/PayrollUkApiPayRunsTest.java | 37 +----------------- 2 files changed, 2 insertions(+), 73 deletions(-) diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java index 9e8cdf0a..8b087d6c 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java @@ -128,40 +128,4 @@ public void createPayRunTest() throws IOException { } - @Test - public void updatePayRunTest() throws IOException { - System.out.println("@Test NZ Payroll - updatePayRunTest"); - - UUID payRunID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); - PayRun payRun = new PayRun(); - PayRunObject response = payrollNzApi.updatePayRun(accessToken, xeroTenantId, payRunID, payRun, null); - - assertThat(response.getPayRun().getPayRunID(), is(equalTo(UUID.fromString("8ba9831d-38e4-43d4-808e-472a5d195bce")))); - assertThat(response.getPayRun().getPayrollCalendarID(), is(equalTo(UUID.fromString("9aa56064-990f-4ad3-a189-d966d8f6a030")))); - assertThat(response.getPayRun().getPayRunType(), is(equalTo(com.xero.models.payrollnz.PayRun.PayRunTypeEnum.SCHEDULED))); - assertThat(response.getPayRun().getPeriodStartDate(), is(equalTo(LocalDate.of(2019, 06, 10)))); - assertThat(response.getPayRun().getPeriodEndDate(), is(equalTo(LocalDate.of(2019, 06, 16)))); - assertThat(response.getPayRun().getPaymentDate(), is(equalTo(LocalDate.of(2019, 07, 01)))); - assertThat(response.getPayRun().getTotalCost(), is(equalTo(9806.03))); - assertThat(response.getPayRun().getTotalPay(), is(equalTo(6362.53))); - assertThat(response.getPayRun().getPayRunStatus(), is(equalTo(com.xero.models.payrollnz.PayRun.PayRunStatusEnum.DRAFT))); - assertThat(response.getPayRun().getCalendarType(), is(equalTo(com.xero.models.payrollnz.CalendarType.WEEKLY))); - assertThat(response.getPayRun().getPaySlips().get(0).getPaySlipID(), is(equalTo(UUID.fromString("51a01760-cf9d-4ba1-bf3a-2065d4f8e073")))); - assertThat(response.getPayRun().getPaySlips().get(0).getEmployeeID(), is(equalTo(UUID.fromString("68342973-c405-4b86-b5d3-d7b877c27995")))); - assertThat(response.getPayRun().getPaySlips().get(0).getFirstName(), is(equalTo("Tony"))); - assertThat(response.getPayRun().getPaySlips().get(0).getLastName(), is(equalTo("Starkwpjgdjxdvwson"))); - assertThat(response.getPayRun().getPaySlips().get(0).getLastEdited(), is(equalTo(LocalDateTime.of(2020, 9, 10, 17, 20, 23)))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalEarnings(), is(equalTo(3628.8))); - assertThat(response.getPayRun().getPaySlips().get(0).getGrossEarnings(), is(equalTo(3628.8))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalPay(), is(equalTo(2362.72))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalEmployerTaxes(), is(equalTo(18.9))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalEmployeeTaxes(), is(equalTo(1057.22))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalDeductions(), is(equalTo(100.0))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalReimbursements(), is(equalTo(0.0))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalStatutoryDeductions(), is(equalTo(108.86))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalSuperannuation(), is(equalTo(108.86))); - assertThat(response.getPayRun().getPaySlips().get(0).getPaymentMethod(), is(equalTo(com.xero.models.payrollnz.PaySlip.PaymentMethodEnum.ELECTRONICALLY))); - - //System.out.println(response.toString()); - } -} + diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java index 96540344..e42eeb12 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java @@ -90,39 +90,4 @@ public void getPayRunTest() throws IOException { - @Test - public void updatePayRunTest() throws IOException { - System.out.println("@Test UK Payroll - updatePayRunTest"); - - UUID payRunID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); - PayRun payRun = new PayRun(); - PayRunObject response = payrollUkApi.updatePayRun(accessToken, xeroTenantId, payRunID, payRun, null); - - assertThat(response.getPayRun().getPayRunID(), is(equalTo(UUID.fromString("e0a59d82-6229-4be4-9d66-49891b4d933e")))); - assertThat(response.getPayRun().getPayrollCalendarID(), is(equalTo(UUID.fromString("216d80e6-af55-47b1-b718-9457c3f5d2fe")))); - assertThat(response.getPayRun().getPayRunType(), is(equalTo(com.xero.models.payrolluk.PayRun.PayRunTypeEnum.SCHEDULED))); - assertThat(response.getPayRun().getPeriodStartDate(), is(equalTo(LocalDate.of(2020, 02, 03)))); - assertThat(response.getPayRun().getPeriodEndDate(), is(equalTo(LocalDate.of(2020, 02, 9)))); - assertThat(response.getPayRun().getPaymentDate(), is(equalTo(LocalDate.of(2020, 05, 01)))); - assertThat(response.getPayRun().getTotalCost(), is(equalTo(523.79))); - assertThat(response.getPayRun().getTotalPay(), is(equalTo(445.04))); - assertThat(response.getPayRun().getPayRunStatus(), is(equalTo(com.xero.models.payrolluk.PayRun.PayRunStatusEnum.DRAFT))); - assertThat(response.getPayRun().getCalendarType(), is(equalTo(com.xero.models.payrolluk.PayRun.CalendarTypeEnum.WEEKLY))); - assertThat(response.getPayRun().getPaySlips().get(0).getPaySlipID(), is(equalTo(UUID.fromString("ed3fb9b3-e9a1-44fa-a224-8be49facbbe8")))); - assertThat(response.getPayRun().getPaySlips().get(0).getEmployeeID(), is(equalTo(UUID.fromString("aad6b292-7b94-408b-93f6-e489867e3fb0")))); - assertThat(response.getPayRun().getPaySlips().get(0).getFirstName(), is(equalTo("Mike"))); - assertThat(response.getPayRun().getPaySlips().get(0).getLastName(), is(equalTo("Johncfvhitgezvson"))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalEarnings(), is(equalTo(480.77))); - assertThat(response.getPayRun().getPaySlips().get(0).getGrossEarnings(), is(equalTo(480.77))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalPay(), is(equalTo(445.04))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalEmployerTaxes(), is(equalTo(43.02))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalEmployeeTaxes(), is(equalTo(35.73))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalDeductions(), is(equalTo(0.0))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalReimbursements(), is(equalTo(0.0))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalCourtOrders(), is(equalTo(0.0))); - assertThat(response.getPayRun().getPaySlips().get(0).getTotalBenefits(), is(equalTo(0.0))); - assertThat(response.getPayRun().getPaySlips().get(0).getPaymentMethod(), is(equalTo(com.xero.models.payrolluk.Payslip.PaymentMethodEnum.ELECTRONICALLY))); - - //System.out.println(response.toString()); - } -} + \ No newline at end of file From dac39aaa3f321c29f41fec69572689caac78db5f Mon Sep 17 00:00:00 2001 From: Ryan McCarthy Date: Wed, 22 Oct 2025 14:53:23 +1300 Subject: [PATCH 2/3] [PETOSS-829] formatting fix --- src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java | 2 +- src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java index 8b087d6c..e97b5fc7 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java @@ -127,5 +127,5 @@ public void createPayRunTest() throws IOException { //System.out.println(response.toString()); } - +} diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java index e42eeb12..56218c09 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java @@ -87,7 +87,6 @@ public void getPayRunTest() throws IOException { //System.out.println(response.toString()); } - - +} \ No newline at end of file From fbd551d2a41ad084f95cfce4e8541738591ccd37 Mon Sep 17 00:00:00 2001 From: Ryan McCarthy Date: Wed, 22 Oct 2025 15:12:15 +1300 Subject: [PATCH 3/3] [PETOSS-829] formatting fix -whitespace --- src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java | 1 - src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java index e97b5fc7..efb8afc2 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java @@ -128,4 +128,3 @@ public void createPayRunTest() throws IOException { } } - diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java index 56218c09..1c99dfc8 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java @@ -88,5 +88,3 @@ public void getPayRunTest() throws IOException { //System.out.println(response.toString()); } } - - \ No newline at end of file