diff --git a/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java index 4a26781e..f3267341 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiEmployeeTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java b/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java index a73ea525..02531fb5 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiLeaveApplicationTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } public void tearDown() { @@ -102,7 +73,7 @@ public void getLeaveApplicationTest() throws IOException { assertThat(response.getLeaveApplications().get(0).getEndDateAsDate(), is(equalTo(LocalDate.of(2019,11,12)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,8)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,14)))); - assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.0))); + assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED))); assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T05:30:08Z")))); //System.out.println(response.toString()); @@ -123,7 +94,7 @@ public void createLeaveApplicationTest() throws IOException { assertThat(response.getLeaveApplications().get(0).getEndDateAsDate(), is(equalTo(LocalDate.of(2019,11,01)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,1)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,07)))); - assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.6))); + assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED))); assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T21:16:31.897Z")))); //System.out.println(response.toString()); @@ -146,7 +117,7 @@ public void updateLeaveApplicationTest() throws IOException { assertThat(response.getLeaveApplications().get(0).getDescription(), is(equalTo("My updated Description"))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,01)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,07)))); - assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.6))); + assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED))); assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T21:16:32.293Z")))); //System.out.println(response.toString()); diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java index a18b3bb3..3e806a1b 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiPayItemTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java index 59ce8624..d30ff139 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiPayRunTest { @@ -54,10 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java index e9125234..2fdcc80f 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiPayrollCalendarTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); payrollAuApi = PayrollAuApi.getInstance(defaultClient); - } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java index aa7019bf..349ca07a 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiPayslipTest { @@ -54,10 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java b/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java index ceb82cad..343575b2 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiSettingsTest { @@ -54,10 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java b/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java index 4ced621a..5d7477a2 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiSuperFundTest { @@ -54,10 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java b/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java index 4e8c466d..e0761469 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java @@ -1,45 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; - public class PayrollAuApiSuperfundProductTest { ApiClient defaultClient; @@ -54,10 +23,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java b/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java index 1568d49b..908b0a75 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; +import java.io.InputStream; public class PayrollAuApiTimesheetTest { @@ -53,12 +26,9 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); - + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java index 058e9b40..b97fb373 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; +import com.xero.models.payrollnz.Deduction.DeductionCategoryEnum; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiDeductionsTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -104,6 +73,9 @@ public void createDeductionTest() throws IOException { System.out.println("@Test NZ Payroll - createDeductionTest"); Deduction deduction = new Deduction(); + deduction.setDeductionName("Test Name"); + deduction.setDeductionCategory(DeductionCategoryEnum.NZOTHER); + deduction.setLiabilityAccountId(UUID.randomUUID()); DeductionObject response = payrollNzApi.createDeduction(accessToken, xeroTenantId, deduction, null); assertThat(response.getDeduction().getDeductionId(), is(equalTo(UUID.fromString("0ee805eb-f5b0-4061-9b35-d9ea550da04e")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java index 04e263c0..28303e2f 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java @@ -1,43 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; +import com.xero.models.payrollnz.EarningsRate.EarningsTypeEnum; +import com.xero.models.payrollnz.EarningsRate.RateTypeEnum; -import java.io.File; import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEarningRatesTest { @@ -53,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -112,6 +83,11 @@ public void createEarningsRateTest() throws IOException { System.out.println("@Test NZ Payroll - createEarningsRateTest"); EarningsRate earningsRate = new EarningsRate(); + earningsRate.setName("My Earnings Rate"); + earningsRate.setEarningsType(EarningsTypeEnum.REGULAREARNINGS); + earningsRate.setRateType(RateTypeEnum.RATEPERUNIT); + earningsRate.setTypeOfUnits("hours"); + earningsRate.setExpenseAccountID(UUID.fromString("e4eb36f6-97e3-4427-a394-dd4e1b355c2e")); EarningsRateObject response = payrollNzApi.createEarningsRate(accessToken, xeroTenantId, earningsRate, null); assertThat(response.getEarningsRate().getEarningsRateID(),is(equalTo(UUID.fromString("4369b0ef-a64d-42e1-bb6d-f2fc984de133")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java index 58b507b7..f4464026 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeaveBalancesTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java index dcdddcbc..1528dee1 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeavePeriodsTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -77,7 +46,7 @@ public void getEmployeeLeavePeriodsTest() throws IOException { assertThat(response.getPeriods().get(0).getPeriodStartDate(), is(equalTo(LocalDate.of(2020, 02, 24)))); assertThat(response.getPeriods().get(0).getPeriodEndDate(), is(equalTo(LocalDate.of(2020, 03, 01)))); - assertThat(response.getPeriods().get(0).getNumberOfUnits() , is(equalTo(0.0))); + assertThat(response.getPeriods().get(0).getNumberOfUnits() , is(equalTo(24.0))); //System.out.println(response.toString()); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java index f8ceaca2..99c3f4b5 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeaveSetupTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java index bf06c15f..c60994e6 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeaveTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -93,6 +61,10 @@ public void createEmployeeLeaveTest() throws IOException { System.out.println("@Test NZ Payroll - createEmployeeLeaveTest"); EmployeeLeave employeeLeave = new EmployeeLeave(); + employeeLeave.setLeaveTypeID(UUID.fromString("b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4")); + employeeLeave.setDescription("Creating a Description"); + employeeLeave.setStartDate(LocalDate.of(2020, 04, 24)); + employeeLeave.setEndDate(LocalDate.of(2020, 04, 26)); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeaveObject response = payrollNzApi.createEmployeeLeave(accessToken, xeroTenantId, employeeId, employeeLeave, null); @@ -119,6 +91,10 @@ public void updateEmployeeLeaveTest() throws IOException { UUID leaveId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeave employeeLeave = new EmployeeLeave(); + employeeLeave.setLeaveTypeID(UUID.fromString("b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4")); + employeeLeave.setDescription("Creating a Description"); + employeeLeave.setStartDate(LocalDate.of(2020, 04, 24)); + employeeLeave.setEndDate(LocalDate.of(2020, 04, 26)); EmployeeLeaveObject response = payrollNzApi.updateEmployeeLeave(accessToken, xeroTenantId, employeeId, leaveId, employeeLeave, null); assertThat(response.getLeave().getLeaveID(), is(equalTo(UUID.fromString("82a04ba6-a5cc-4e7d-86d4-b9f381a494e8")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java index ffd4b3e3..dc5cd87f 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeaveTypesTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java index 69622c11..4052aba1 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeOpeningBalancesTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java index 0bcaff83..0f3f2f8d 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeePayTemplatesTest { @@ -54,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java index 2cc685ef..b0f6c606 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeTaxTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); - } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java index 61c15c31..fd0ee789 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -94,6 +63,14 @@ public void createEmployeeTest() throws IOException { System.out.println("@Test UK Payroll - createEmployeeTest"); Employee employee = new Employee(); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("San Francisco"); + address.setPostCode("4351"); + employee.setAddress(address); + employee.setFirstName("Mike"); + employee.setLastName("Johntzxzpxhmkgson"); + employee.setDateOfBirth(LocalDate.now()); EmployeeObject response = payrollNzApi.createEmployee(accessToken, xeroTenantId, employee, null); assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("658be485-3feb-402e-9e77-ac17623aad42")))); @@ -141,6 +118,14 @@ public void updateEmployeeTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); Employee employee = new Employee(); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("San Francisco"); + address.setPostCode("4351"); + employee.setAddress(address); + employee.setFirstName("Mike"); + employee.setLastName("Johntzxzpxhmkgson"); + employee.setDateOfBirth(LocalDate.now()); EmployeeObject response = payrollNzApi.updateEmployee(accessToken, xeroTenantId, employeeId, employee, null); assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("68342973-c405-4b86-b5d3-d7b877c27995")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java index 25411d6b..c9277153 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmploymentTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -72,6 +41,9 @@ public void createEmploymentTest() throws IOException { Employment employment = new Employment(); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); + employment.setPayrollCalendarID(UUID.fromString("9aa56064-990f-4ad3-a189-d966d8f6a030")); + employment.setStartDate(LocalDate.now()); + employment.setEngagementType("FixedTerm"); EmploymentObject response = payrollNzApi.createEmployment(accessToken, xeroTenantId, employeeId, employment, null); assertThat(response.getEmployment().getPayrollCalendarID(), is(equalTo(UUID.fromString("9aa56064-990f-4ad3-a189-d966d8f6a030")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java index d12394fe..ae9c4243 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiLeaveTypesTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -105,6 +74,11 @@ public void createLeaveTypeTest() throws IOException { System.out.println("@Test NZ Payroll - createLeaveTypeTest"); LeaveType leaveType = new LeaveType(); + leaveType.setLeaveTypeID(UUID.randomUUID()); + leaveType.setName("My opebvwbfxf Leave"); + leaveType.setIsPaidLeave(true); + leaveType.isActive(true); + leaveType.setShowOnPayslip(true); LeaveTypeObject response = payrollNzApi.createLeaveType(accessToken, xeroTenantId, leaveType, null); assertThat(response.getLeaveType().getLeaveTypeID(),is(equalTo(UUID.fromString("80464f55-b5c9-4d05-84c7-219d98baa3e2")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java index 0dad9252..b3404e7c 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiPayRunCalendarsTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -110,6 +78,10 @@ public void createPayRunCalendarTest() throws IOException { System.out.println("@Test NZ Payroll - createPayRunCalendarTest"); PayRunCalendar payRunCalendar = new PayRunCalendar(); + payRunCalendar.setName("My Weekly Cal"); + payRunCalendar.setCalendarType(com.xero.models.payrollnz.CalendarType.WEEKLY); + payRunCalendar.setPeriodStartDate(LocalDate.of(2020, 05, 01)); + payRunCalendar.setPaymentDate(LocalDate.of(2020, 05, 15)); PayRunCalendarObject response = payrollNzApi.createPayRunCalendar(accessToken, xeroTenantId, payRunCalendar, null); assertThat(response.getPayRunCalendar().getPayrollCalendarID(),is(equalTo(UUID.fromString("54e9706a-c4e8-45ff-9c63-6fcac7ee7cde")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java index 428f8fae..9e8cdf0a 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiPayRunsTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java index 2bbfbcd6..ef886e4a 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiPaySlipsTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java index 7dd98fc2..a143ffaf 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java @@ -1,45 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiPaymentMethodsTest { @@ -55,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); - } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java index f6e68953..a665ea67 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiReimbursementsTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -122,6 +90,8 @@ public void createReimbursementTest() throws IOException { System.out.println("@Test NZ Payroll - createReimbursementTest"); Reimbursement reimbursement = new Reimbursement(); + reimbursement.setName("My new Reimburse"); + reimbursement.setAccountID(UUID.randomUUID()); ReimbursementObject response = payrollNzApi.createReimbursement(accessToken, xeroTenantId, reimbursement, null); // assertThat(response.getReimbursement().getReimbursementID(),is(equalTo(UUID.fromString("2b1b587a-39f6-43f8-9dd9-a858314333c8")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java index 54516398..af3d5927 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; +import com.xero.models.payrollnz.SalaryAndWage.PaymentTypeEnum; +import com.xero.models.payrollnz.SalaryAndWage.StatusEnum; import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiSalaryAndWagesTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -91,7 +62,14 @@ public void getSalaryAndWagesTest() throws IOException { public void createEmployeeSalaryAndWageTest() throws IOException { System.out.println("@Test NZ Payroll - createEmployeeSalaryAndWageTest"); - SalaryAndWage salaryAndWage = new SalaryAndWage(); + SalaryAndWage salaryAndWage = new SalaryAndWage(); + salaryAndWage.setEarningsRateID(UUID.randomUUID()); + salaryAndWage.setNumberOfUnitsPerWeek(1.00); + salaryAndWage.setNumberOfUnitsPerDay(1.00); + salaryAndWage.setEffectiveFrom(LocalDate.now()); + salaryAndWage.setAnnualSalary(2.00); + salaryAndWage.setStatus(StatusEnum.ACTIVE); + salaryAndWage .setPaymentType(PaymentTypeEnum.HOURLY); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); SalaryAndWageObject response = payrollNzApi.createEmployeeSalaryAndWage(accessToken, xeroTenantId, employeeId, salaryAndWage, null); @@ -134,7 +112,14 @@ public void getEmployeeSalaryAndWageTest() throws IOException { public void updateEmployeeSalaryAndWageTest() throws IOException { System.out.println("@Test NZ Payroll - updateEmployeeSalaryAndWageTest"); - SalaryAndWage salaryAndWage = new SalaryAndWage(); + SalaryAndWage salaryAndWage = new SalaryAndWage(); + salaryAndWage.setEarningsRateID(UUID.randomUUID()); + salaryAndWage.setNumberOfUnitsPerWeek(1.00); + salaryAndWage.setNumberOfUnitsPerDay(1.00); + salaryAndWage.setEffectiveFrom(LocalDate.now()); + salaryAndWage.setAnnualSalary(2.00); + salaryAndWage.setStatus(StatusEnum.ACTIVE); + salaryAndWage .setPaymentType(PaymentTypeEnum.HOURLY); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); UUID salaryAndWagesId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); SalaryAndWageObject response = payrollNzApi.updateEmployeeSalaryAndWage(accessToken, xeroTenantId, employeeId, salaryAndWagesId, salaryAndWage, null); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java index 03202250..452fdb5d 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java @@ -1,45 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiSettingsTest { @@ -55,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java index ebf5f3fb..6432b99b 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiStatutoryDeductionsTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java index a647eea8..80deadf8 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiSuperannuationsTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); - } public void tearDown() { @@ -107,6 +75,12 @@ public void createSuperannuationTest() throws IOException { System.out.println("@Test NZ Payroll - createSuperannuationTest"); Benefit benefit = new Benefit(); + benefit.setName("New Benefit"); + benefit.setCategory(com.xero.models.payrollnz.Benefit.CategoryEnum.OTHER); + benefit.setLiabilityAccountId(UUID.randomUUID()); + benefit.setExpenseAccountId(UUID.randomUUID()); + benefit.setCalculationTypeNZ(com.xero.models.payrollnz.Benefit.CalculationTypeNZEnum.FIXEDAMOUNT); + benefit.setPercentage(12.00); SuperannuationObject response = payrollNzApi.createSuperannuation(accessToken, xeroTenantId, benefit, null); assertThat(response.getBenefit().getId(), is(equalTo(UUID.fromString("8905a754-7ce8-40e2-9fa5-f819deb7adce")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java index ba7e20b1..433ae18f 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiTimesheetsTest { @@ -55,10 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -116,7 +85,18 @@ public void createTimesheetTest() throws IOException { int page = 1; UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); + List timesheetLines = new ArrayList<>(); + TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); + timesheetLines.add(timesheetLine); Timesheet timesheet = new Timesheet(); + timesheet.setTimesheetLines(timesheetLines); + timesheet.setPayrollCalendarID(UUID.randomUUID()); + timesheet.setEndDate(LocalDate.of(2020, 04, 19)); + timesheet.setStartDate(LocalDate.of(2020, 04, 13)); + timesheet.setEmployeeID(UUID.randomUUID()); TimesheetObject response = payrollNzApi.createTimesheet(accessToken, xeroTenantId, timesheet, null); assertThat(response.getTimesheet().getTimesheetID(),is(equalTo(UUID.fromString("d227445a-4188-453a-a196-48163a38188c")))); @@ -141,6 +121,9 @@ public void createTimesheetLineTest() throws IOException { UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); TimesheetLineObject response = payrollNzApi.createTimesheetLine(accessToken, xeroTenantId, timesheetID, timesheetLine, null); assertThat(response.getTimesheetLine().getTimesheetLineID(),is(equalTo(UUID.fromString("10c3c63e-6cd0-4630-861f-08a2baa657fa")))); @@ -158,6 +141,9 @@ public void updateTimesheetLineTest() throws IOException { UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); UUID timesheetLineID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); TimesheetLineObject response = payrollNzApi.updateTimesheetLine(accessToken, xeroTenantId, timesheetID, timesheetLineID, timesheetLine, null); assertThat(response.getTimesheetLine().getTimesheetLineID(),is(equalTo(UUID.fromString("3397aab1-6cac-4804-a72b-00f396b04a08")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java index 9931127b..bc9740ce 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java @@ -1,45 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiTrackingCategoriesTest { @@ -54,12 +24,9 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java index 49f59d2c..b701af4e 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java @@ -1,46 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollUkApiDeductionsTest { @@ -56,11 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -111,6 +76,10 @@ public void createDeductionTest() throws IOException { System.out.println("@Test UK Payroll - createDeductionTest"); Deduction deduction = new Deduction(); + deduction.setDeductionName("Test Name"); + deduction.setDeductionCategory(com.xero.models.payrolluk.Deduction.DeductionCategoryEnum.SALARYSACRIFICE); + deduction.setLiabilityAccountId(UUID.randomUUID()); + deduction.calculationType(com.xero.models.payrolluk.Deduction.CalculationTypeEnum.FIXEDAMOUNT); DeductionObject response = payrollUkApi.createDeduction(accessToken, xeroTenantId, deduction, null); assertThat(response.getDeduction().getDeductionId(), is(equalTo(UUID.fromString("b3695b29-750f-4957-98b4-678e4a529043")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java index bfd83284..69a795aa 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java @@ -1,46 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEarningRatesTest { @@ -56,11 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -117,6 +82,11 @@ public void createEarningsRateTest() throws IOException { System.out.println("@Test UK Payroll - createEarningsRateTest"); EarningsRate earningsRate = new EarningsRate(); + earningsRate.setName("My Earnings Rate"); + earningsRate.setEarningsType(com.xero.models.payrolluk.EarningsRate.EarningsTypeEnum.REGULAREARNINGS); + earningsRate.setRateType(com.xero.models.payrolluk.EarningsRate.RateTypeEnum.RATEPERUNIT); + earningsRate.setTypeOfUnits("hours"); + earningsRate.setExpenseAccountID(UUID.fromString("e4eb36f6-97e3-4427-a394-dd4e1b355c2e")); EarningsRateObject response = payrollUkApi.createEarningsRate(accessToken, xeroTenantId, earningsRate, null); assertThat(response.getEarningsRate().getEarningsRateID(),is(equalTo(UUID.fromString("fcf811a8-3843-4e87-8431-c62e83158aef")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java index caf1a4aa..6db7d140 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java @@ -1,46 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEarningsOrdersTest { @@ -56,11 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java index 6ded2c29..efa5d0e4 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeLeaveBalancesTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java index 1078fbe0..e1d7d529 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeLeavePeriodsTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java index e1fe1bbc..6d6ba389 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeLeaveTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -93,6 +61,10 @@ public void createEmployeeLeaveTest() throws IOException { System.out.println("@Test UK Payroll - createEmployeeLeaveTest"); EmployeeLeave employeeLeave = new EmployeeLeave(); + employeeLeave.setLeaveTypeID(UUID.fromString("b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4")); + employeeLeave.setDescription("Creating a Description"); + employeeLeave.setStartDate(LocalDate.of(2020, 04, 24)); + employeeLeave.setEndDate(LocalDate.of(2020, 04, 26)); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeaveObject response = payrollUkApi.createEmployeeLeave(accessToken, xeroTenantId, employeeId, employeeLeave, null); @@ -141,6 +113,10 @@ public void updateEmployeeLeaveTest() throws IOException { UUID leaveId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeave employeeLeave = new EmployeeLeave(); + employeeLeave.setLeaveTypeID(UUID.fromString("b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4")); + employeeLeave.setDescription("Creating a Description"); + employeeLeave.setStartDate(LocalDate.of(2020, 04, 24)); + employeeLeave.setEndDate(LocalDate.of(2020, 04, 26)); EmployeeLeaveObject response = payrollUkApi.updateEmployeeLeave(accessToken, xeroTenantId, employeeId, leaveId, employeeLeave, null); assertThat(response.getLeave().getLeaveID(), is(equalTo(UUID.fromString("8340b795-50c1-428e-9fda-90badf081ab4")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java index e8c202bb..7b59395d 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeLeaveTypesTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -91,6 +60,9 @@ public void createEmployeeLeaveTypesTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeaveType employeeLeaveType = new EmployeeLeaveType(); + employeeLeaveType.setLeaveTypeID(UUID.randomUUID()); + employeeLeaveType.setScheduleOfAccrual(com.xero.models.payrolluk.EmployeeLeaveType.ScheduleOfAccrualEnum.BEGINNINGOFCALENDARYEAR); + employeeLeaveType.setHoursAccruedAnnually(10.00); EmployeeLeaveTypeObject response = payrollUkApi.createEmployeeLeaveType(accessToken, xeroTenantId, employeeId, employeeLeaveType, null); assertThat(response.getLeaveType().getLeaveTypeID(), is(equalTo(UUID.fromString("4918f233-bd31-43f9-9633-bcc6de1178f2")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java index f01cd051..cb276d77 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeOpeningBalancesTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java index 9886e979..1903527d 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeePayTemplatesTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java index 6d05632f..2541adfd 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeStatutoryLeaveBalancesTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java index 9125fd09..ebf24043 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeStatutoryLeavesSummaryTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java index e2a05da4..8ebb7749 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeStatutorySickLeaveTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -72,6 +41,13 @@ public void createEmployeeStatutorySickLeaveTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeStatutorySickLeave employeeStatutorySickLeave = new EmployeeStatutorySickLeave(); + employeeStatutorySickLeave.setEmployeeID(UUID.randomUUID()); + employeeStatutorySickLeave.setEndDate(LocalDate.of(2020, 04, 21)); + employeeStatutorySickLeave.setStartDate(LocalDate.of(2020, 04, 21)); + employeeStatutorySickLeave.setWorkPattern(List.of("Monday", "Wednesday")); + employeeStatutorySickLeave.setLeaveTypeID(UUID.randomUUID()); + employeeStatutorySickLeave.isPregnancyRelated(false); + employeeStatutorySickLeave.setSufficientNotice(true); EmployeeStatutorySickLeaveObject response = payrollUkApi.createEmployeeStatutorySickLeave(accessToken, xeroTenantId, employeeStatutorySickLeave, null); assertThat(response.getStatutorySickLeave().getStatutoryLeaveID(), is(equalTo(UUID.fromString("a2b5a1fb-ae21-47b4-876d-0b61fa6b37ab")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java index 43578a88..aafdb7f5 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeTaxTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java index 66fef7f7..c8678ee1 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; +import com.xero.models.payrolluk.Employee.GenderEnum; import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeTest { @@ -54,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -94,6 +64,23 @@ public void createEmployeeTest() throws IOException { System.out.println("@Test UK Payroll - createEmployeeTest"); Employee employee = new Employee(); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("Rangiora"); + address.setPostCode("SW6 6EY"); + address.setCountryName("UNITED KINGDOM"); + employee.setAddress(address); + employee.setEmployeeID(UUID.randomUUID()); + employee.setFirstName("Adam"); + employee.setLastName("Adamson"); + employee.setDateOfBirth(LocalDate.of(2019, 7, 12)); + employee.setTitle("Mrs"); + employee.setGender(GenderEnum.M); + employee.email("test@test.com"); + employee.setPhoneNumber("415-555-1212"); + employee.setStartDate(LocalDate.of(2023, 7, 12)); + employee.setEndDate(LocalDate.of(2024, 7, 12)); + System.out.println(employee); EmployeeObject response = payrollUkApi.createEmployee(accessToken, xeroTenantId, employee, null); assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("316146c7-26a4-4065-b9bd-346d0557ea96")))); @@ -101,9 +88,9 @@ public void createEmployeeTest() throws IOException { assertThat(response.getEmployee().getFirstName(), is(equalTo("Mike"))); assertThat(response.getEmployee().getLastName(), is(equalTo("Fancy"))); assertThat(response.getEmployee().getDateOfBirth(), is(equalTo(LocalDate.of(1999, 01, 01)))); - assertThat(response.getEmployee().getAddress().getAddressLine1(), is(equalTo("101 Green St"))); - assertThat(response.getEmployee().getAddress().getCity(), is(equalTo("San Francisco"))); - assertThat(response.getEmployee().getAddress().getPostCode(), is(equalTo("6TGR4F"))); + assertThat(response.getEmployee().getAddress().getAddressLine1(), is(equalTo("171 Midsummer"))); + assertThat(response.getEmployee().getAddress().getCity(), is(equalTo("Milton Keyness"))); + assertThat(response.getEmployee().getAddress().getPostCode(), is(equalTo("MK9 1EB"))); assertThat(response.getEmployee().getEmail(), is(equalTo("mike@starkindustries.com"))); assertThat(response.getEmployee().getGender() , is(equalTo(com.xero.models.payrolluk.Employee.GenderEnum.M))); assertThat(response.getEmployee().getUpdatedDateUTC(), is(equalTo(LocalDateTime.of(2020, 03, 25, 03, 12, 10) ))); @@ -119,20 +106,19 @@ public void getEmployeeTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeObject response = payrollUkApi.getEmployee(accessToken, xeroTenantId, employeeId); - assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("aad6b292-7b94-408b-93f6-e489867e3fb0")))); + assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("d17e008e-3381-45c0-b50c-2fab7757e503")))); assertThat(response.getEmployee().getTitle(), is(equalTo("Mr."))); - assertThat(response.getEmployee().getFirstName(), is(equalTo("Jack"))); - assertThat(response.getEmployee().getLastName(), is(equalTo("Allan"))); - assertThat(response.getEmployee().getDateOfBirth(), is(equalTo(LocalDate.of(1987, 12, 23)))); - assertThat(response.getEmployee().getAddress().getAddressLine1(), is(equalTo("171 Midsummer Boulevard"))); - assertThat(response.getEmployee().getAddress().getCity(), is(equalTo("Milton Keynes"))); + assertThat(response.getEmployee().getFirstName(), is(equalTo("Edgar"))); + assertThat(response.getEmployee().getLastName(), is(equalTo("Allan Po"))); + assertThat(response.getEmployee().getDateOfBirth(), is(equalTo(LocalDate.of(1985, 03, 24)))); + assertThat(response.getEmployee().getAddress().getAddressLine1(), is(equalTo("171 Midsummer"))); + assertThat(response.getEmployee().getAddress().getCity(), is(equalTo("Milton Keyness"))); assertThat(response.getEmployee().getAddress().getPostCode(), is(equalTo("MK9 1EB"))); assertThat(response.getEmployee().getAddress().getCountryName(), is(equalTo("UNITED KINGDOM"))); assertThat(response.getEmployee().getGender() , is(equalTo(com.xero.models.payrolluk.Employee.GenderEnum.M))); - assertThat(response.getEmployee().getStartDate(), is(equalTo(LocalDate.of(2020, 02, 03)))); assertThat(response.getEmployee().getPayrollCalendarID(), is(equalTo(UUID.fromString("216d80e6-af55-47b1-b718-9457c3f5d2fe")))); - assertThat(response.getEmployee().getUpdatedDateUTC(), is(equalTo(LocalDateTime.of(2020, 02, 13, 16, 23 ,31) ))); - assertThat(response.getEmployee().getCreatedDateUTC(), is(equalTo(LocalDateTime.of(2020, 02, 10, 10, 00, 24) ))); + assertThat(response.getEmployee().getUpdatedDateUTC(), is(equalTo(LocalDateTime.of(2017, 05, 12, 10, 00 ,24) ))); + assertThat(response.getEmployee().getCreatedDateUTC(), is(equalTo(LocalDateTime.of(2017, 05, 12, 10, 00, 24) ))); assertThat(response.getEmployee().getNationalInsuranceNumber(), is(equalTo("AB123456C"))); //System.out.println(response.toString()); } @@ -143,9 +129,26 @@ public void updateEmployeeTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); Employee employee = new Employee(); + employee.setEmployeeID(UUID.randomUUID()); + employee.setFirstName("Adam"); + employee.setLastName("Adamson"); + employee.setDateOfBirth(LocalDate.of(2019, 7, 12)); + employee.setTitle("Mrs"); + employee.setGender(GenderEnum.M); + employee.email("test@test.com"); + employee.setPhoneNumber("415-555-1212"); + employee.setStartDate(LocalDate.of(2023, 7, 12)); + employee.setEndDate(LocalDate.of(2024, 7, 12)); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("Rangiora"); + address.setPostCode("SW6 6EY"); + address.setCountryName("UNITED KINGDOM"); + employee.setAddress(address); + EmployeeObject response = payrollUkApi.updateEmployee(accessToken, xeroTenantId, employeeId, employee, null); - assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("aad6b292-7b94-408b-93f6-e489867e3fb0")))); + assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("07f0f9fc-cc95-46ac-9a8a-aa03779f2bde")))); assertThat(response.getEmployee().getTitle(), is(equalTo("Mr"))); assertThat(response.getEmployee().getFirstName(), is(equalTo("Mike"))); assertThat(response.getEmployee().getLastName(), is(equalTo("Johnllsbkrhwopson"))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java index df3567a4..f6e5d066 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java @@ -1,46 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; import com.xero.models.payrolluk.Benefit.CategoryEnum; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployerPensionsTest { @@ -56,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); - } public void tearDown() { @@ -112,6 +80,12 @@ public void createBenefitTest() throws IOException { System.out.println("@Test UK Payroll - createBenefitTest"); Benefit benefit = new Benefit(); + benefit.setName("Test"); + benefit.setCategory(CategoryEnum.STAKEHOLDERPENSION); + benefit.setLiabilityAccountId(UUID.randomUUID()); + benefit.setExpenseAccountId(UUID.randomUUID()); + benefit.setCalculationType(CalculationTypeEnum.FIXEDAMOUNT); + benefit.setPercentage(100.00); BenefitObject response = payrollUkApi.createBenefit(accessToken, xeroTenantId, benefit, null); assertThat(response.getBenefit().getId(), is(equalTo(UUID.fromString("d295bf25-fb61-4f91-9b62-a9ae87633746")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java index b10a2757..bf8f001a 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; +import com.xero.models.payrolluk.Employment.NiCategoryEnum; import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmploymentTest { @@ -54,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -71,9 +41,12 @@ public void createEmploymentTest() throws IOException { System.out.println("@Test UK Payroll - createEmploymentTest"); Employment employment = new Employment(); + employment.setPayrollCalendarID(UUID.randomUUID()); + employment.setEmployeeNumber("007"); + employment.setStartDate(LocalDate.of(2024, 04, 01)); + employment.setNiCategory(NiCategoryEnum.A); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmploymentObject response = payrollUkApi.createEmployment(accessToken, xeroTenantId, employeeId, employment, null); - assertThat(response.getEmployment().getPayrollCalendarID(), is(equalTo(UUID.fromString("216d80e6-af55-47b1-b718-9457c3f5d2fe")))); assertThat(response.getEmployment().getStartDate(), is(equalTo(LocalDate.of(2020, 04, 01)))); assertThat(response.getEmployment().getEmployeeNumber(), is(equalTo("123ABC"))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java index 6d22aa7f..a29ac76f 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java @@ -1,46 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiLeaveTypesTest { @@ -56,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -109,6 +75,12 @@ public void createLeaveTypeTest() throws IOException { System.out.println("@Test UK Payroll - createLeaveTypeTest"); LeaveType leaveType = new LeaveType(); + leaveType.setLeaveID(UUID.randomUUID()); + leaveType.setName("My opebvwbfxf Leave"); + leaveType.setIsStatutoryLeave(true); + leaveType.setIsPaidLeave(true); + leaveType.isActive(true); + leaveType.setShowOnPayslip(true); LeaveTypeObject response = payrollUkApi.createLeaveType(accessToken, xeroTenantId, leaveType, null); assertThat(response.getLeaveType().getLeaveTypeID(),is(equalTo(UUID.fromString("4c027a23-6e7b-4547-808b-c34b2b140fef")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java index c1fcc47b..9b5dc97c 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java @@ -1,47 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiPayRunCalendarsTest { @@ -57,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -112,6 +77,10 @@ public void createPayRunCalendarTest() throws IOException { System.out.println("@Test UK Payroll - createPayRunCalendarTest"); PayRunCalendar payRunCalendar = new PayRunCalendar(); + payRunCalendar.setName("My Weekly Cal"); + payRunCalendar.setCalendarType(com.xero.models.payrolluk.PayRunCalendar.CalendarTypeEnum.ANNUAL); + payRunCalendar.setPeriodStartDate(LocalDate.of(2020, 05, 01)); + payRunCalendar.setPaymentDate(LocalDate.of(2020, 05, 15)); PayRunCalendarObject response = payrollUkApi.createPayRunCalendar(accessToken, xeroTenantId, payRunCalendar, null); assertThat(response.getPayRunCalendar().getPayrollCalendarID(),is(equalTo(UUID.fromString("5f29322d-9123-49be-bef0-9b14c35653d1")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java index f5a943f0..96540344 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java @@ -1,47 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiPayRunsTest { @@ -57,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java index 1ab37ae8..1430f260 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java @@ -1,47 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiPaymentMethodsTest { @@ -57,11 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); - } public void tearDown() { @@ -92,6 +56,7 @@ public void createEmployeePaymentMethodTest() throws IOException { int page = 1; UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); PaymentMethod paymentMethod = new PaymentMethod(); + paymentMethod.setPaymentMethod(com.xero.models.payrolluk.PaymentMethod.PaymentMethodEnum.ELECTRONICALLY); PaymentMethodObject response = payrollUkApi.createEmployeePaymentMethod(accessToken, xeroTenantId, employeeId, paymentMethod, null); assertThat(response.getPaymentMethod().getPaymentMethod(), is(equalTo(com.xero.models.payrolluk.PaymentMethod.PaymentMethodEnum.ELECTRONICALLY))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java index d2bd33a4..3b0dbaed 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java @@ -1,48 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; - +import java.util.*; public class PayrollUkApiPayslipsTest { ApiClient defaultClient; @@ -57,11 +23,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java index e903e9f5..b4daf10e 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java @@ -1,46 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiReimbursementsTest { @@ -56,10 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -103,6 +69,8 @@ public void createReimbursementTest() throws IOException { System.out.println("@Test UK Payroll - createReimbursementTest"); Reimbursement reimbursement = new Reimbursement(); + reimbursement.setName("My new Reimburse"); + reimbursement.setAccountID(UUID.randomUUID()); ReimbursementObject response = payrollUkApi.createReimbursement(accessToken, xeroTenantId, reimbursement, null); assertThat(response.getReimbursement().getReimbursementID(),is(equalTo(UUID.fromString("2b1b587a-39f6-43f8-9dd9-a858314333c8")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java index d58082d9..43d13f39 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java @@ -1,47 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiSettingsTest { @@ -57,10 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java index 6ab5c507..8141fc3a 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java @@ -1,47 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiTimesheetsTest { @@ -57,10 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -118,8 +84,19 @@ public void createTimesheetTest() throws IOException { System.out.println("@Test UK Payroll - createTimesheetTest"); int page = 1; - UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); + UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); + List timesheetLines = new ArrayList<>(); + TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); + timesheetLines.add(timesheetLine); Timesheet timesheet = new Timesheet(); + timesheet.setTimesheetLines(timesheetLines); + timesheet.setPayrollCalendarID(UUID.randomUUID()); + timesheet.setEndDate(LocalDate.of(2020, 04, 19)); + timesheet.setStartDate(LocalDate.of(2020, 04, 13)); + timesheet.setEmployeeID(UUID.randomUUID()); TimesheetObject response = payrollUkApi.createTimesheet(accessToken, xeroTenantId, timesheet, null); assertThat(response.getTimesheet().getTimesheetID(),is(equalTo(UUID.fromString("88d2038a-06f7-4b8a-bdab-809804c0aa1d")))); @@ -144,6 +121,9 @@ public void createTimesheetLineTest() throws IOException { UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); TimesheetLineObject response = payrollUkApi.createTimesheetLine(accessToken, xeroTenantId, timesheetID, timesheetLine, null); assertThat(response.getTimesheetLine().getTimesheetLineID(),is(equalTo(UUID.fromString("56fce87e-7f0d-4c19-8f74-7f5656651c81")))); @@ -161,6 +141,9 @@ public void updateTimesheetLineTest() throws IOException { UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); UUID timesheetLineID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); TimesheetLineObject response = payrollUkApi.updateTimesheetLine(accessToken, xeroTenantId, timesheetID, timesheetLineID, timesheetLine, null); assertThat(response.getTimesheetLine().getTimesheetLineID(),is(equalTo(UUID.fromString("c88edcad-af32-4536-a682-9a4772c21c8d")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java index 081ca282..9d09b9f6 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java @@ -1,47 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; +import java.io.InputStream; public class PayrollUkApiTrackingCategoriesTest { @@ -57,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java b/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java index 68ed245a..a6c3b542 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.project.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class ProjectsApiProjectTasksTest { @@ -55,10 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectsApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://3fe1c2ee-7113-4035-9e6d-53dad2fb2af3.mock.pstmn.io/projects.xro/2.0",null,null,null,null); - projectApi = ProjectApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("projects.api.url"),null,null,null,null); + projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { diff --git a/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java b/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java index d48ea6f6..7f8d5dad 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.project.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class ProjectsApiProjectUsersTest { @@ -55,10 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://3fe1c2ee-7113-4035-9e6d-53dad2fb2af3.mock.pstmn.io/projects.xro/2.0",null,null,null,null); - projectApi = ProjectApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("projects.api.url"),null,null,null,null); + projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -93,8 +62,8 @@ public void getProjectUsersTest() throws IOException { assertThat(response.getPagination().getPageCount(), is(equalTo(1))); assertThat(response.getPagination().getPageSize(), is(equalTo(50))); assertThat(response.getItems().get(0).getUserId(), is(equalTo(UUID.fromString("740add2a-a703-4b8a-a670-1093919c2040")))); - assertThat(response.getItems().get(0).getName(), is(equalTo("Sidney Maestre"))); - assertThat(response.getItems().get(0).getEmail(), is(equalTo("sid.maestre@xero.com"))); + assertThat(response.getItems().get(0).getName(), is(equalTo("Test User"))); + assertThat(response.getItems().get(0).getEmail(), is(equalTo("test@xero.com"))); // System.out.println(response.toString()); } diff --git a/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java b/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java index 6b364be6..47580c37 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.project.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class ProjectsApiProjectsTest { @@ -55,10 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://3fe1c2ee-7113-4035-9e6d-53dad2fb2af3.mock.pstmn.io/projects.xro/2.0",null,null,null,null); - projectApi = projectApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("projects.api.url"),null,null,null,null); + projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -134,6 +104,7 @@ public void createProjectsTest() throws IOException { System.out.println("@Test - createProjectsTest"); ProjectCreateOrUpdate projectCreateOrUpdate = new ProjectCreateOrUpdate(); + projectCreateOrUpdate.setName("New Kitchen"); Project response = projectApi.createProject(accessToken, xeroTenantId, projectCreateOrUpdate, null); assertThat(response.getContactId(), is(equalTo(UUID.fromString("216830cb-9a68-487e-928b-c1a7ccc4fc81")))); @@ -180,7 +151,7 @@ public void getProjectTest() throws IOException { assertThat(response.getContactId(), is(equalTo(UUID.fromString("216830cb-9a68-487e-928b-c1a7ccc4fc81")))); assertThat(response.getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); - assertThat(response.getName(), is(equalTo("FooProject28916"))); + assertThat(response.getName(), is(equalTo("Remodeling 2012"))); assertThat(response.getCurrencyCode(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); assertThat(response.getMinutesLogged(), is(equalTo(180))); assertThat(response.getTotalTaskAmount().getCurrency(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); diff --git a/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java b/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java index 7130b06d..0444f417 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java @@ -1,47 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.project.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; - -import jakarta.ws.rs.core.Response; - -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; +import java.io.InputStream; public class ProjectsApiTimeEntriesTest { @@ -57,11 +27,8 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init projectsApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://3fe1c2ee-7113-4035-9e6d-53dad2fb2af3.mock.pstmn.io/projects.xro/2.0",null,null,null,null); - projectApi = ProjectApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("projects.api.url"),null,null,null,null); + projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -109,7 +76,7 @@ public void getTimeEntriesTest() throws IOException { assertThat(response.getItems().get(0).getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); assertThat(response.getItems().get(0).getTaskId(), is(equalTo(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")))); assertThat(response.getItems().get(0).getDateUtc(), is(equalTo(OffsetDateTime.parse("2020-02-27T15:00Z")))); - assertThat(response.getItems().get(0).getDateEnteredUtc(), is(equalTo(OffsetDateTime.parse("2020-02-21T21:41:22.264272700Z")))); + assertThat(response.getItems().get(0).getDateEnteredUtc(), is(equalTo(OffsetDateTime.parse("2020-02-28T03:24:29.221564100Z")))); assertThat(response.getItems().get(0).getDuration(), is(equalTo(45))); assertThat(response.getItems().get(0).getStatus(),is(equalTo(com.xero.models.project.TimeEntry.StatusEnum.ACTIVE))); //System.out.println(response.toString()); @@ -120,11 +87,15 @@ public void createTimeEntryTest() throws IOException { System.out.println("@Test - createTimeEntryTest"); TimeEntryCreateOrUpdate timeEntryCreateOrUpdate = new TimeEntryCreateOrUpdate(); + timeEntryCreateOrUpdate.setUserId(UUID.fromString("c6539534-f1d2-43a6-80df-3bd1f8aca24d")); + timeEntryCreateOrUpdate.setTaskId(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")); + timeEntryCreateOrUpdate.setDateUtc(OffsetDateTime.parse("2020-02-26T15:00Z")); + timeEntryCreateOrUpdate.setDuration(1); UUID projectId = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); TimeEntry response = projectApi.createTimeEntry(accessToken, xeroTenantId, projectId, timeEntryCreateOrUpdate, null); assertThat(response.getTimeEntryId(),is(equalTo(UUID.fromString("c6539534-f1d2-43a6-80df-3bd1f8aca24d")))); - assertThat(response.getUserId(), is(equalTo(UUID.fromString("740add2a-a703-4b8a-a670-1093919c2040")))); + assertThat(response.getUserId(), is(equalTo(UUID.fromString("c6539534-f1d2-43a6-80df-3bd1f8aca24d")))); assertThat(response.getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); assertThat(response.getTaskId(), is(equalTo(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")))); assertThat(response.getDateUtc(), is(equalTo(OffsetDateTime.parse("2020-02-26T15:00Z"))));