diff --git a/src/test/java/com/xero/api/client/AccountingApiAccountsTest.java b/src/test/java/com/xero/api/client/AccountingApiAccountsTest.java index 52a3b079..531ded66 100644 --- a/src/test/java/com/xero/api/client/AccountingApiAccountsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiAccountsTest.java @@ -1,44 +1,19 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; +import java.io.File; +import java.util.UUID; -import org.junit.After; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; import org.junit.Before; import org.junit.Test; -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 org.threeten.bp.OffsetDateTime; import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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.util.Calendar; -import java.util.Map; -import java.util.UUID; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; +import com.xero.models.accounting.Account; +import com.xero.models.accounting.Accounts; +import com.xero.models.accounting.Attachments; public class AccountingApiAccountsTest { @@ -58,7 +33,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); diff --git a/src/test/java/com/xero/api/client/AccountingApiBankTransactionTest.java b/src/test/java/com/xero/api/client/AccountingApiBankTransactionTest.java index 22006ab4..582e7023 100644 --- a/src/test/java/com/xero/api/client/AccountingApiBankTransactionTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiBankTransactionTest.java @@ -1,42 +1,19 @@ 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.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - -import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Attachments; +import com.xero.models.accounting.BankTransactions; public class AccountingApiBankTransactionTest { @@ -55,7 +32,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); diff --git a/src/test/java/com/xero/api/client/AccountingApiBankTransferTest.java b/src/test/java/com/xero/api/client/AccountingApiBankTransferTest.java index b36ffb21..5b1c7e72 100644 --- a/src/test/java/com/xero/api/client/AccountingApiBankTransferTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiBankTransferTest.java @@ -57,7 +57,7 @@ public void setUp() { xeroTenantId = "xyz"; // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); diff --git a/src/test/java/com/xero/api/client/AccountingApiBatchPaymentTest.java b/src/test/java/com/xero/api/client/AccountingApiBatchPaymentTest.java index 4d574b2d..48217fea 100644 --- a/src/test/java/com/xero/api/client/AccountingApiBatchPaymentTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiBatchPaymentTest.java @@ -1,41 +1,20 @@ 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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; +import com.xero.api.ApiClient; +import com.xero.models.accounting.BatchPayment; +import com.xero.models.accounting.BatchPayments; +import com.xero.models.accounting.HistoryRecord; +import com.xero.models.accounting.HistoryRecords; public class AccountingApiBatchPaymentTest { ApiClient defaultClient; @@ -55,7 +34,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); diff --git a/src/test/java/com/xero/api/client/AccountingApiBrandingThemeTest.java b/src/test/java/com/xero/api/client/AccountingApiBrandingThemeTest.java index 2119a969..8fd21e91 100644 --- a/src/test/java/com/xero/api/client/AccountingApiBrandingThemeTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiBrandingThemeTest.java @@ -1,41 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.*; +import java.util.UUID; -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 static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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 com.xero.models.accounting.BrandingThemes; +import com.xero.models.accounting.PaymentService; +import com.xero.models.accounting.PaymentServices; public class AccountingApiBrandingThemeTest { @@ -55,7 +31,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); diff --git a/src/test/java/com/xero/api/client/AccountingApiContactGroupTest.java b/src/test/java/com/xero/api/client/AccountingApiContactGroupTest.java index 218ed4eb..947965ea 100644 --- a/src/test/java/com/xero/api/client/AccountingApiContactGroupTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiContactGroupTest.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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.ContactGroups; +import com.xero.models.accounting.Contacts; public class AccountingApiContactGroupTest { @@ -58,7 +31,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); diff --git a/src/test/java/com/xero/api/client/AccountingApiContactsTest.java b/src/test/java/com/xero/api/client/AccountingApiContactsTest.java index da18515c..f4095c68 100644 --- a/src/test/java/com/xero/api/client/AccountingApiContactsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiContactsTest.java @@ -1,42 +1,21 @@ 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.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - -import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Attachments; +import com.xero.models.accounting.Contacts; public class AccountingApiContactsTest { @@ -57,7 +36,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); diff --git a/src/test/java/com/xero/api/client/AccountingApiCreditNotesTest.java b/src/test/java/com/xero/api/client/AccountingApiCreditNotesTest.java index b70e1ba8..7914dec1 100644 --- a/src/test/java/com/xero/api/client/AccountingApiCreditNotesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiCreditNotesTest.java @@ -1,42 +1,21 @@ 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.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - -import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Allocations; +import com.xero.models.accounting.Attachments; +import com.xero.models.accounting.CreditNotes; public class AccountingApiCreditNotesTest { @@ -56,7 +35,7 @@ public void setUp() { xeroTenantId = "xyz"; // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiEmployeesTest.java b/src/test/java/com/xero/api/client/AccountingApiEmployeesTest.java index b9b9feff..fb36cd26 100644 --- a/src/test/java/com/xero/api/client/AccountingApiEmployeesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiEmployeesTest.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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Employees; public class AccountingApiEmployeesTest { @@ -58,7 +31,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiExpenseClaimsTest.java b/src/test/java/com/xero/api/client/AccountingApiExpenseClaimsTest.java index 49fc446f..dab19843 100644 --- a/src/test/java/com/xero/api/client/AccountingApiExpenseClaimsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiExpenseClaimsTest.java @@ -1,43 +1,19 @@ 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.models.accounting.*; - 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.util.UUID; -import java.io.File; -import java.io.IOException; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.ExpenseClaims; public class AccountingApiExpenseClaimsTest { @@ -58,7 +34,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiInvoicesTest.java b/src/test/java/com/xero/api/client/AccountingApiInvoicesTest.java index 0ec2420d..29eac972 100644 --- a/src/test/java/com/xero/api/client/AccountingApiInvoicesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiInvoicesTest.java @@ -56,7 +56,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiItemsTest.java b/src/test/java/com/xero/api/client/AccountingApiItemsTest.java index bf90e61c..07920250 100644 --- a/src/test/java/com/xero/api/client/AccountingApiItemsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiItemsTest.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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Items; public class AccountingApiItemsTest { @@ -58,7 +31,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -95,7 +68,7 @@ public void createItemTest() throws IOException { assertThat(response.getItems().get(0).getIsTrackedAsInventory(), is(equalTo(false))); assertThat(response.getItems().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-03-11T19:17:51.707Z")))); assertThat(response.getItems().get(0).getItemID(), is(equalTo(UUID.fromString("a4544d51-48f6-441f-a623-99ecbced6ab7")))); - assertThat(response.getItems().get(0).getValidationErrors().get(0).getMessage(), is(equalTo("Price List Item with Code 'abc' already exists"))); + assertThat(response.getItems().get(0).getValidationErrors().get(0).getMessage(), is(equalTo("Price List Item with Code ''abc'' already exists"))); //System.out.println(response.getItems().get(0).toString()); } diff --git a/src/test/java/com/xero/api/client/AccountingApiJournalsTest.java b/src/test/java/com/xero/api/client/AccountingApiJournalsTest.java index 678651f1..592e014a 100644 --- a/src/test/java/com/xero/api/client/AccountingApiJournalsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiJournalsTest.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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Journals; public class AccountingApiJournalsTest { @@ -57,7 +31,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -83,8 +57,7 @@ public void tearDown() { @Test public void getJournalTest() throws IOException { System.out.println("@Test - getJournal"); - UUID journalID = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); - Journals response = accountingApi.getJournal(accessToken,xeroTenantId,journalID); + Journals response = accountingApi.getJournalByNumber(accessToken,xeroTenantId,1); assertThat(response.getJournals().get(0).getJournalID(), is(equalTo(UUID.fromString("1b31feeb-aa23-404c-8c19-24c827c53661")))); assertThat(response.getJournals().get(0).getJournalDateAsDate(), is(equalTo(LocalDate.of(2018,10,20)))); diff --git a/src/test/java/com/xero/api/client/AccountingApiLinkedTransactionsTest.java b/src/test/java/com/xero/api/client/AccountingApiLinkedTransactionsTest.java index 4e412d57..697b4840 100644 --- a/src/test/java/com/xero/api/client/AccountingApiLinkedTransactionsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiLinkedTransactionsTest.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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.LinkedTransaction; +import com.xero.models.accounting.LinkedTransactions; public class AccountingApiLinkedTransactionsTest { @@ -58,7 +32,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiManualJournalsTest.java b/src/test/java/com/xero/api/client/AccountingApiManualJournalsTest.java index 70a7fc8f..333b2907 100644 --- a/src/test/java/com/xero/api/client/AccountingApiManualJournalsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiManualJournalsTest.java @@ -1,42 +1,20 @@ 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.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - -import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Attachments; +import com.xero.models.accounting.ManualJournals; public class AccountingApiManualJournalsTest { @@ -57,7 +35,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); @@ -112,7 +90,7 @@ public void createManualJournalsTest() throws IOException { assertThat(response.getManualJournals().get(0).getShowOnCashBasisReports(), is(equalTo(true))); assertThat(response.getManualJournals().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-03-14T20:39:32.920Z")))); assertThat(response.getManualJournals().get(0).getManualJournalID(), is(equalTo(UUID.fromString("d312dd5e-a53e-46d1-9d51-c569ef4570b7")))); - assertThat(response.getManualJournals().get(0).getWarnings().get(0).getMessage(), is(equalTo("Account code '476' has been removed as it does not match a recognised account."))); + assertThat(response.getManualJournals().get(0).getWarnings().get(0).getMessage(), is(equalTo("Account code ''476'' has been removed as it does not match a recognised account."))); assertThat(response.getManualJournals().get(0).getValidationErrors().get(0).getMessage(), is(equalTo("The total debits (100.00) must equal total credits (-10.00)"))); //System.out.println(response.getManualJournals().get(0).toString()); } @@ -140,11 +118,11 @@ public void getManualJournalTest() throws IOException { UUID manualJournalID = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); ManualJournals response = accountingApi.getManualJournal(accessToken,xeroTenantId,manualJournalID); - assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("These aren't the droids you are looking for"))); + assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("These aren''t the droids you are looking for"))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getLineAmount(), is(equalTo(100.0))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getLineAmount().toString(), is(equalTo("100.0"))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getAccountCode(), is(equalTo("429"))); - assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getDescription(), is(equalTo("These aren't the droids you are looking for"))); + assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getDescription(), is(equalTo("These aren''t the droids you are looking for"))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getTaxType(), is(equalTo("NONE"))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getIsBlank(), is(equalTo(false))); assertThat(response.getManualJournals().get(0).getJournalLines().get(1).getLineAmount(), is(equalTo(-100.0))); @@ -193,7 +171,7 @@ public void getManualJournalsTest() throws IOException { Integer pageSize = null; ManualJournals response = accountingApi.getManualJournals(accessToken,xeroTenantId,ifModifiedSince, where, order, page, pageSize); - assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("Reversal: These aren't the droids you are looking for"))); + assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("Reversal: These aren''t the droids you are looking for"))); assertThat(response.getManualJournals().get(0).getDateAsDate(), is(equalTo(LocalDate.of(2019,03,21)))); assertThat(response.getManualJournals().get(0).getLineAmountTypes(), is(equalTo(com.xero.models.accounting.LineAmountTypes.NOTAX))); assertThat(response.getManualJournals().get(0).getStatus(), is(equalTo(com.xero.models.accounting.ManualJournal.StatusEnum.POSTED))); diff --git a/src/test/java/com/xero/api/client/AccountingApiOrganisationsTest.java b/src/test/java/com/xero/api/client/AccountingApiOrganisationsTest.java index 3d25d954..be8301e3 100644 --- a/src/test/java/com/xero/api/client/AccountingApiOrganisationsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiOrganisationsTest.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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Organisations; public class AccountingApiOrganisationsTest { @@ -58,7 +32,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiOverpaymentsTest.java b/src/test/java/com/xero/api/client/AccountingApiOverpaymentsTest.java index 962d993c..25dd2723 100644 --- a/src/test/java/com/xero/api/client/AccountingApiOverpaymentsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiOverpaymentsTest.java @@ -57,7 +57,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiPaymentServicesTest.java b/src/test/java/com/xero/api/client/AccountingApiPaymentServicesTest.java index 4f5383cb..32e6c215 100644 --- a/src/test/java/com/xero/api/client/AccountingApiPaymentServicesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiPaymentServicesTest.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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.PaymentServices; public class AccountingApiPaymentServicesTest { @@ -58,7 +30,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiPaymentsTest.java b/src/test/java/com/xero/api/client/AccountingApiPaymentsTest.java index 1569d284..d8cb9692 100644 --- a/src/test/java/com/xero/api/client/AccountingApiPaymentsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiPaymentsTest.java @@ -1,42 +1,19 @@ 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.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - -import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.PaymentDelete; +import com.xero.models.accounting.Payments; public class AccountingApiPaymentsTest { @@ -53,7 +30,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/AccountingApiPrepaymentsTest.java b/src/test/java/com/xero/api/client/AccountingApiPrepaymentsTest.java index 9f664c91..8812f3d1 100644 --- a/src/test/java/com/xero/api/client/AccountingApiPrepaymentsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiPrepaymentsTest.java @@ -1,42 +1,19 @@ 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.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - -import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Allocations; +import com.xero.models.accounting.Prepayments; public class AccountingApiPrepaymentsTest { @@ -56,7 +33,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiPurchaseOrdersTest.java b/src/test/java/com/xero/api/client/AccountingApiPurchaseOrdersTest.java index d6fdc271..5919897a 100644 --- a/src/test/java/com/xero/api/client/AccountingApiPurchaseOrdersTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiPurchaseOrdersTest.java @@ -1,42 +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.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - -import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.PurchaseOrders; public class AccountingApiPurchaseOrdersTest { @@ -55,7 +31,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiQuotesTest.java b/src/test/java/com/xero/api/client/AccountingApiQuotesTest.java index aea93347..1051a474 100644 --- a/src/test/java/com/xero/api/client/AccountingApiQuotesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiQuotesTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; +import java.util.UUID; -import org.junit.After; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; import org.junit.Before; import org.junit.Test; -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 org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.accounting.*; - -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.util.Calendar; -import java.util.Map; -import java.util.UUID; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; +import com.xero.models.accounting.Quotes; public class AccountingApiQuotesTest { @@ -58,7 +31,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); diff --git a/src/test/java/com/xero/api/client/AccountingApiReceiptsTest.java b/src/test/java/com/xero/api/client/AccountingApiReceiptsTest.java index ac2c7008..7087d188 100644 --- a/src/test/java/com/xero/api/client/AccountingApiReceiptsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiReceiptsTest.java @@ -1,44 +1,20 @@ 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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Attachments; +import com.xero.models.accounting.Receipts; public class AccountingApiReceiptsTest { @@ -58,7 +34,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiRepeatingInvoicesTest.java b/src/test/java/com/xero/api/client/AccountingApiRepeatingInvoicesTest.java index 6fa289a6..d44ac8d2 100644 --- a/src/test/java/com/xero/api/client/AccountingApiRepeatingInvoicesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiRepeatingInvoicesTest.java @@ -1,44 +1,19 @@ 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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Attachments; +import com.xero.models.accounting.RepeatingInvoices; public class AccountingApiRepeatingInvoicesTest { @@ -58,7 +33,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiReportsTest.java b/src/test/java/com/xero/api/client/AccountingApiReportsTest.java index 43a5a33f..4182d67a 100644 --- a/src/test/java/com/xero/api/client/AccountingApiReportsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiReportsTest.java @@ -1,44 +1,19 @@ 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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.ReportWithRows; +import com.xero.models.accounting.Reports; public class AccountingApiReportsTest { @@ -56,7 +31,7 @@ public void setUp() { xeroTenantId = "xyz"; // Init AccountingApi client - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -121,7 +96,7 @@ public void getReportAgedPayablesByContactTest() throws IOException { public void getReportAgedReceivablesByContactTest() throws IOException { System.out.println("@Test - getReportAgedReceivablesByContact"); UUID contactId = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); - LocalDate date = null; + LocalDate date = LocalDate.of(2019, 10, 31); LocalDate fromDate = null; LocalDate toDate = null; ReportWithRows response = accountingApi.getReportAgedReceivablesByContact(accessToken,xeroTenantId,contactId, date, fromDate, toDate); @@ -254,9 +229,9 @@ public void getReportTenNinetyNineTest() throws IOException { Reports response = accountingApi.getReportTenNinetyNine(accessToken,xeroTenantId,reportYear); - assertThat(response.getReports().get(0).getReportName(), is(equalTo("1099 report"))); - assertThat(response.getReports().get(0).getReportDate(), is(equalTo("1 Jan 2016 to 31 Dec 2016"))); - assertThat(response.getReports().get(0).getContacts().get(0).getBox3(), is(equalTo(1000.00))); + assertThat(response.getReports().get(0).getReportName(), is(equalTo("1099-NEC report"))); + assertThat(response.getReports().get(0).getReportDate(), is(equalTo("1 Jan 2023 to 31 Dec 2023"))); + assertThat(response.getReports().get(0).getContacts().get(0).getBox4(), is(equalTo(1150.00))); assertThat(response.getReports().get(0).getContacts().get(0).getName(), is(equalTo("Bank West"))); assertThat(response.getReports().get(0).getContacts().get(0).getFederalTaxIDType(), is(equalTo("SSN"))); assertThat(response.getReports().get(0).getContacts().get(0).getCity(), is(equalTo("Pinehaven"))); @@ -265,7 +240,7 @@ public void getReportTenNinetyNineTest() throws IOException { assertThat(response.getReports().get(0).getContacts().get(0).getEmail(), is(equalTo("jack@bowest.com"))); assertThat(response.getReports().get(0).getContacts().get(0).getTaxID(), is(equalTo("234-22-2223"))); assertThat(response.getReports().get(0).getContacts().get(0).getContactId(), is(equalTo(UUID.fromString("81d5706a-8057-4338-8511-747cd85f4c68")))); - assertThat(response.getReports().get(0).getContacts().get(2).getBox1(), is(equalTo(5543.75))); + assertThat(response.getReports().get(0).getContacts().get(0).getBox1(), is(equalTo(0.00))); //System.out.println(response.getReports().toString()); } diff --git a/src/test/java/com/xero/api/client/AccountingApiTaxRatesTest.java b/src/test/java/com/xero/api/client/AccountingApiTaxRatesTest.java index a9c749e1..bc4340e0 100644 --- a/src/test/java/com/xero/api/client/AccountingApiTaxRatesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiTaxRatesTest.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.models.accounting.*; - -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 static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.TaxRates; public class AccountingApiTaxRatesTest { @@ -57,7 +28,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiTrackingCategoriesTest.java b/src/test/java/com/xero/api/client/AccountingApiTrackingCategoriesTest.java index 030cbf12..99646b1b 100644 --- a/src/test/java/com/xero/api/client/AccountingApiTrackingCategoriesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiTrackingCategoriesTest.java @@ -1,44 +1,19 @@ 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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.TrackingCategories; +import com.xero.models.accounting.TrackingCategory; +import com.xero.models.accounting.TrackingOption; +import com.xero.models.accounting.TrackingOptions; public class AccountingApiTrackingCategoriesTest { @@ -57,7 +32,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiUsersTest.java b/src/test/java/com/xero/api/client/AccountingApiUsersTest.java index c7376701..e3713374 100644 --- a/src/test/java/com/xero/api/client/AccountingApiUsersTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiUsersTest.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.models.accounting.*; - -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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.accounting.Users; public class AccountingApiUsersTest { @@ -57,7 +30,7 @@ public void setUp() { // Init AccountingApi client // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4010",null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AppStoreApiTest.java b/src/test/java/com/xero/api/client/AppStoreApiTest.java index b0dfd445..e803acfe 100644 --- a/src/test/java/com/xero/api/client/AppStoreApiTest.java +++ b/src/test/java/com/xero/api/client/AppStoreApiTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; +import java.util.UUID; -import org.junit.After; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import org.junit.Before; import org.junit.Test; -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.XeroApiException; -import com.xero.api.client.*; -import com.xero.models.appstore.*; - -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.util.Calendar; -import java.util.Map; -import java.util.UUID; - -import java.util.List; - -import org.apache.commons.io.IOUtils; +import com.xero.models.appstore.Subscription; public class AppStoreApiTest { @@ -55,7 +26,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - defaultClient = new ApiClient("https://ec5d3540-e90b-47b9-9a5d-95180950a89b.mock.pstmn.io/appstore/2.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4011",null,null,null,null); appStoreApi = AppStoreApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AssetsApiTest.java b/src/test/java/com/xero/api/client/AssetsApiTest.java index a997b20f..d8de26f1 100644 --- a/src/test/java/com/xero/api/client/AssetsApiTest.java +++ b/src/test/java/com/xero/api/client/AssetsApiTest.java @@ -1,44 +1,23 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; +import java.util.List; +import java.util.UUID; -import org.junit.After; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; import org.junit.Before; import org.junit.Test; -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 org.threeten.bp.LocalDate; import com.xero.api.ApiClient; import com.xero.api.XeroApiException; -import com.xero.api.client.*; -import com.xero.models.assets.*; - -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.util.Calendar; -import java.util.Map; -import java.util.UUID; - -import java.util.List; - -import org.apache.commons.io.IOUtils; +import com.xero.models.assets.Asset; +import com.xero.models.assets.AssetType; +import com.xero.models.assets.Assets; +import com.xero.models.assets.BookDepreciationSetting; +import com.xero.models.assets.BookDepreciationSetting.DepreciationMethodEnum; +import com.xero.models.assets.Setting; public class AssetsApiTest { @@ -56,8 +35,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init clienthttps://3e140044-4914-47dd-b4e1-df0cc040a44f.mock.pstmn.io/bankfeeds.xro/1.0 - defaultClient = new ApiClient("https://0a44a319-84a5-4918-91ce-338acd97a84d.mock.pstmn.io/assets.xro/1.0",null,null,null,null); + // Init clienthttp://127.0.0.1:4013 + defaultClient = new ApiClient("http://127.0.0.1:4012",null,null,null,null); assetApi = AssetApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -86,6 +65,7 @@ public void testCreateAsset() throws Exception { System.out.println("@Test - createAsset"); Asset newAsset = new Asset(); + newAsset.setAssetName("Computer7486"); try { Asset response = assetApi.createAsset(accessToken,xeroTenantId,newAsset,null); assertThat(response.getAssetId().toString(), (equalTo("2257c64a-77ca-444c-a5ea-fa9a588c7039"))); @@ -200,6 +180,10 @@ public void testCreateAssetType() throws Exception { System.out.println("@Test - createAssetType"); AssetType newAssetType = new AssetType(); + newAssetType.setAssetTypeName("Machinery11004"); + BookDepreciationSetting bookDepreciationSetting = new BookDepreciationSetting(); + bookDepreciationSetting.setDepreciationMethod(DepreciationMethodEnum.DIMINISHINGVALUE100); + newAssetType.setBookDepreciationSetting(bookDepreciationSetting); try { AssetType response = assetApi.createAssetType(accessToken,xeroTenantId,newAssetType,null); diff --git a/src/test/java/com/xero/api/client/BankfeedApiFeedConnectionTest.java b/src/test/java/com/xero/api/client/BankfeedApiFeedConnectionTest.java index 3a1033f2..86c714f4 100644 --- a/src/test/java/com/xero/api/client/BankfeedApiFeedConnectionTest.java +++ b/src/test/java/com/xero/api/client/BankfeedApiFeedConnectionTest.java @@ -1,18 +1,17 @@ package com.xero.api.client; +import java.util.UUID; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; - -import java.util.UUID; +import org.junit.Before; +import org.junit.Test; import com.xero.api.ApiClient; import com.xero.models.bankfeeds.FeedConnection; import com.xero.models.bankfeeds.FeedConnections; -import org.junit.Before; -import org.junit.Test; - public class BankfeedApiFeedConnectionTest { ApiClient defaultClient; @@ -31,7 +30,7 @@ public void setUp() { // Init AccountingApi client //defaultClient = new ApiClient("https://virtserver.swaggerhub.com/Xero/bankfeeds/1.0.0",null,null,null,null); - defaultClient = new ApiClient("https://3e140044-4914-47dd-b4e1-df0cc040a44f.mock.pstmn.io/bankfeeds.xro/1.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4013",null,null,null,null); bankfeedsApi = BankFeedsApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/BankfeedApiStatementTest.java b/src/test/java/com/xero/api/client/BankfeedApiStatementTest.java index afcb542d..0add30df 100644 --- a/src/test/java/com/xero/api/client/BankfeedApiStatementTest.java +++ b/src/test/java/com/xero/api/client/BankfeedApiStatementTest.java @@ -1,44 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.After; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; import org.junit.Before; import org.junit.Test; -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 org.threeten.bp.LocalDate; import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.bankfeeds.*; - -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.util.Calendar; -import java.util.Map; -import java.util.UUID; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; +import com.xero.models.bankfeeds.Statements; public class BankfeedApiStatementTest { @@ -58,7 +28,7 @@ public void setUp() { // Init AccountingApi client //defaultClient = new ApiClient("https://virtserver.swaggerhub.com/Xero/bankfeeds/1.0.0",null,null,null,null); - defaultClient = new ApiClient("https://3e140044-4914-47dd-b4e1-df0cc040a44f.mock.pstmn.io/bankfeeds.xro/1.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4013",null,null,null,null); bankfeedsApi = BankFeedsApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/FinanceApiTest.java b/src/test/java/com/xero/api/client/FinanceApiTest.java index e00468ff..178040cc 100644 --- a/src/test/java/com/xero/api/client/FinanceApiTest.java +++ b/src/test/java/com/xero/api/client/FinanceApiTest.java @@ -55,7 +55,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - defaultClient = new ApiClient("https://73cb2c15-a3e8-4230-86d6-8af203c03b5f.mock.pstmn.io/finance.xro/1.0",null,null,null,null); + defaultClient = new ApiClient("http://127.0.0.1:4014",null,null,null,null); financeApi = FinanceApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -116,7 +116,7 @@ public void testGetAccountingActivityLockHistory() throws Exception { try { LockHistoryResponse response = financeApi.getAccountingActivityLockHistory(accessToken, "73151de8-3676-4887-a021-edec960dd537", null); assertThat(response.getOrganisationId().toString(), (equalTo("73151de8-3676-4887-a021-edec960dd537"))); - assertThat(response.getLockDates().get(1).getUpdatedDateUtc().toString(), (equalTo("2019-01-20T10:50:03Z"))); + assertThat(response.getLockDates().get(1).getUpdatedDateUtc().toString(), (equalTo("2019-01-21T10:59:33Z"))); } catch (XeroApiException xe) { System.out.println(xe.toString()); @@ -212,7 +212,6 @@ public void testGetFinancialStatementContactsRevenue() throws Exception { System.out.println("@Test - getFinancialStatementContactsRevenue"); List contacts = new ArrayList(); contacts.add(UUID.fromString("1f580fe2-0659-31ee-eeb4-5c49d15d8bfa")); - contacts.add(UUID.fromString("20e94281-4751-fb7e-ee5e-96b43ae93c8a")); try { IncomeByContactResponse response = financeApi.getFinancialStatementContactsRevenue(accessToken, "73151de8-3676-4887-a021-edec960dd537",contacts,true,null,null); assertThat(response.getContacts().get(0).getName(), (equalTo("FirstContact"))); @@ -226,7 +225,6 @@ public void testGetFinancialStatementContactsExpense() throws Exception { System.out.println("@Test - getFinancialStatementContactsExpense"); List contacts = new ArrayList(); contacts.add(UUID.fromString("1f580fe2-0659-31ee-eeb4-5c49d15d8bfa")); - contacts.add(UUID.fromString("20e94281-4751-fb7e-ee5e-96b43ae93c8a")); try { IncomeByContactResponse response = financeApi.getFinancialStatementContactsExpense(accessToken, "73151de8-3676-4887-a021-edec960dd537",contacts,true,null,null); assertThat(response.getContacts().get(0).getName(), (equalTo("FirstContact"))); diff --git a/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java index 4a26781e..6ef01f36 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java @@ -1,44 +1,21 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.Employee; +import com.xero.models.payrollau.Employees; public class PayrollAuApiEmployeeTest { @@ -56,7 +33,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",null,null,null,null); payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java b/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java index a73ea525..d26e2e0b 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java @@ -1,44 +1,21 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.LeaveApplication; +import com.xero.models.payrollau.LeaveApplications; public class PayrollAuApiLeaveApplicationTest { @@ -56,7 +33,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",null,null,null,null); payrollAuApi = PayrollAuApi.getInstance(defaultClient); } @@ -102,7 +79,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 +100,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 +123,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..32e5815a 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.PayItem; +import com.xero.models.payrollau.PayItems; public class PayrollAuApiPayItemTest { @@ -56,7 +30,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",null,null,null,null); payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java index 59ce8624..c67bc64d 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java @@ -1,44 +1,21 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.PayRun; +import com.xero.models.payrollau.PayRuns; public class PayrollAuApiPayRunTest { @@ -56,7 +33,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",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..335e940f 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java @@ -1,44 +1,21 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.PayrollCalendar; +import com.xero.models.payrollau.PayrollCalendars; public class PayrollAuApiPayrollCalendarTest { @@ -56,7 +33,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",null,null,null,null); payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java index aa7019bf..24307da3 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java @@ -1,44 +1,20 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.PayslipObject; public class PayrollAuApiPayslipTest { @@ -56,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",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..aeeb30eb 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.SettingsObject; public class PayrollAuApiSettingsTest { @@ -56,7 +28,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",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..232b805e 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java @@ -1,44 +1,20 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.SuperFund; +import com.xero.models.payrollau.SuperFunds; public class PayrollAuApiSuperFundTest { @@ -56,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",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..569b2cb6 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.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.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 static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.SuperFundProducts; public class PayrollAuApiSuperfundProductTest { @@ -56,7 +27,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",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..78f0ce65 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java @@ -1,44 +1,22 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollau.Timesheet; +import com.xero.models.payrollau.TimesheetObject; +import com.xero.models.payrollau.Timesheets; public class PayrollAuApiTimesheetTest { @@ -56,7 +34,7 @@ public void setUp() { // 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("http://127.0.0.1:4015",null,null,null,null); payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java index 058e9b40..47a3d425 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java @@ -1,44 +1,19 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.Deduction; +import com.xero.models.payrollnz.Deduction.DeductionCategoryEnum; +import com.xero.models.payrollnz.DeductionObject; +import com.xero.models.payrollnz.Deductions; public class PayrollNzApiDeductionsTest { @@ -56,7 +31,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -104,6 +79,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..ace5241e 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java @@ -1,43 +1,20 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.EarningsRate; +import com.xero.models.payrollnz.EarningsRate.EarningsTypeEnum; +import com.xero.models.payrollnz.EarningsRate.RateTypeEnum; +import com.xero.models.payrollnz.EarningsRateObject; +import com.xero.models.payrollnz.EarningsRates; public class PayrollNzApiEarningRatesTest { @@ -55,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -112,6 +89,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..ca7805a1 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java index dcdddcbc..9bb6500e 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.Month; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.LeavePeriods; public class PayrollNzApiEmployeeLeavePeriodsTest { @@ -56,7 +30,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -77,7 +51,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..c5da0d8e 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.EmployeeLeaveSetup; +import com.xero.models.payrollnz.EmployeeLeaveSetupObject; public class PayrollNzApiEmployeeLeaveSetupTest { @@ -56,7 +29,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java index bf06c15f..40bb4288 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java @@ -1,45 +1,20 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.EmployeeLeave; +import com.xero.models.payrollnz.EmployeeLeaveObject; +import com.xero.models.payrollnz.EmployeeLeaves; public class PayrollNzApiEmployeeLeaveTest { @@ -57,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -93,6 +68,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 +98,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..d1974a79 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java @@ -1,44 +1,20 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.Month; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.EmployeeLeaveType; +import com.xero.models.payrollnz.EmployeeLeaveTypeObject; +import com.xero.models.payrollnz.EmployeeLeaveTypes; public class PayrollNzApiEmployeeLeaveTypesTest { @@ -56,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java index 69622c11..f590fac8 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java @@ -1,44 +1,20 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.EmployeeOpeningBalance; +import com.xero.models.payrollnz.EmployeeOpeningBalancesObject; public class PayrollNzApiEmployeeOpeningBalancesTest { @@ -56,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java index 0bcaff83..aba3b1f0 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java @@ -1,44 +1,21 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.EarningsTemplate; +import com.xero.models.payrollnz.EarningsTemplateObject; +import com.xero.models.payrollnz.EmployeeEarningsTemplates; +import com.xero.models.payrollnz.EmployeePayTemplates; public class PayrollNzApiEmployeePayTemplatesTest { @@ -56,7 +33,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java index 2cc685ef..de702d97 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.EmployeeTax; +import com.xero.models.payrollnz.EmployeeTaxObject; public class PayrollNzApiEmployeeTaxTest { @@ -56,7 +29,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java index 61c15c31..ae4b36da 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -94,6 +94,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 +149,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..8d1b7825 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.Employment; +import com.xero.models.payrollnz.EmploymentObject; public class PayrollNzApiEmploymentTest { @@ -56,7 +30,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -71,6 +45,9 @@ public void createEmploymentTest() throws IOException { System.out.println("@Test UK Payroll - createEmploymentTest"); Employment employment = new Employment(); + employment.setPayrollCalendarID(UUID.fromString("9aa56064-990f-4ad3-a189-d966d8f6a030")); + employment.setStartDate(LocalDate.now()); + employment.setEngagementType("FixedTerm"); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmploymentObject response = payrollNzApi.createEmployment(accessToken, xeroTenantId, employeeId, employment, null); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java index d12394fe..f02a3c56 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java @@ -1,44 +1,19 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.LeaveType; +import com.xero.models.payrollnz.LeaveTypeObject; +import com.xero.models.payrollnz.LeaveTypes; public class PayrollNzApiLeaveTypesTest { @@ -56,7 +31,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -105,6 +80,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")))); @@ -112,7 +92,7 @@ public void createLeaveTypeTest() throws IOException { assertThat(response.getLeaveType().getIsPaidLeave(), is(equalTo(false))); assertThat(response.getLeaveType().getShowOnPayslip(), is(equalTo(true))); assertThat(response.getLeaveType().getIsActive(), is(equalTo(true))); - assertThat(response.getLeaveType().getUpdatedDateUTC(), is(equalTo(LocalDateTime.parse("2020-08-27T20:49:59.831561900")))); + assertThat(response.getLeaveType().getUpdatedDateUTC(), is(equalTo(LocalDateTime.parse("2020-08-27T20:49:59.8315619")))); //System.out.println(response.toString()); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java index 0dad9252..ab1d06eb 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java @@ -1,45 +1,20 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.PayRunCalendar; +import com.xero.models.payrollnz.PayRunCalendarObject; +import com.xero.models.payrollnz.PayRunCalendars; public class PayrollNzApiPayRunCalendarsTest { @@ -57,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -110,6 +85,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..edd74cb3 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java @@ -1,45 +1,20 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.PayRun; +import com.xero.models.payrollnz.PayRunObject; +import com.xero.models.payrollnz.PayRuns; public class PayrollNzApiPayRunsTest { @@ -57,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java index 2bbfbcd6..66916c7c 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java @@ -57,7 +57,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java index 7dd98fc2..bf505021 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java @@ -1,45 +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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.PaymentMethod; +import com.xero.models.payrollnz.PaymentMethodObject; public class PayrollNzApiPaymentMethodsTest { @@ -57,7 +29,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java index f6e68953..901dd942 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.Reimbursement; +import com.xero.models.payrollnz.ReimbursementObject; +import com.xero.models.payrollnz.Reimbursements; public class PayrollNzApiReimbursementsTest { @@ -56,7 +30,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -122,6 +96,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..44b05601 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java @@ -1,44 +1,21 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.SalaryAndWage; +import com.xero.models.payrollnz.SalaryAndWage.PaymentTypeEnum; +import com.xero.models.payrollnz.SalaryAndWage.StatusEnum; +import com.xero.models.payrollnz.SalaryAndWageObject; +import com.xero.models.payrollnz.SalaryAndWages; public class PayrollNzApiSalaryAndWagesTest { @@ -56,7 +33,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -91,7 +68,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 +118,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..79814545 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.Settings; public class PayrollNzApiSettingsTest { @@ -57,7 +28,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java index ebf5f3fb..84307193 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.StatutoryDeductionObject; +import com.xero.models.payrollnz.StatutoryDeductions; public class PayrollNzApiStatutoryDeductionsTest { @@ -56,7 +29,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -73,7 +46,7 @@ public void getStatutoryDeductionsTest() throws IOException { int page = 1; StatutoryDeductions response = payrollNzApi.getStatutoryDeductions(accessToken, xeroTenantId, page); - assertThat(response.getStatutoryDeductions().get(0).getId(), is(equalTo(UUID.fromString("e3731829-9801-4809-a1a1-bbe40cd18b7e")))); + assertThat(response.getStatutoryDeductions().get(0).getId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getStatutoryDeductions().get(0).getLiabilityAccountId(), is(equalTo(UUID.fromString("fa5cdc43-643b-4ad8-b4ac-3ffe0d0f4488")))); assertThat(response.getStatutoryDeductions().get(0).getName(), is(equalTo("Child Support"))); assertThat(response.getStatutoryDeductions().get(0).getStatutoryDeductionCategory(), is(equalTo(com.xero.models.payrollnz.StatutoryDeductionCategory.CHILDSUPPORT))); @@ -89,7 +62,7 @@ public void getStatutoryDeductionTest() throws IOException { UUID deductionId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); StatutoryDeductionObject response = payrollNzApi.getStatutoryDeduction(accessToken, xeroTenantId, deductionId); - assertThat(response.getStatutoryDeduction().getId(), is(equalTo(UUID.fromString("e3731829-9801-4809-a1a1-bbe40cd18b7e")))); + assertThat(response.getStatutoryDeduction().getId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getStatutoryDeduction().getLiabilityAccountId(), is(equalTo(UUID.fromString("fa5cdc43-643b-4ad8-b4ac-3ffe0d0f4488")))); assertThat(response.getStatutoryDeduction().getName(), is(equalTo("Child Support"))); assertThat(response.getStatutoryDeduction().getStatutoryDeductionCategory(), is(equalTo(com.xero.models.payrollnz.StatutoryDeductionCategory.CHILDSUPPORT))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java index a647eea8..fc96464b 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.Benefit; +import com.xero.models.payrollnz.SuperannuationObject; +import com.xero.models.payrollnz.Superannuations; public class PayrollNzApiSuperannuationsTest { @@ -56,7 +30,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -73,7 +47,7 @@ public void getSuperannuationsTest() throws IOException { int page = 1; Superannuations response = payrollNzApi.getSuperannuations(accessToken, xeroTenantId, page); - assertThat(response.getBenefits().get(0).getId(), is(equalTo(UUID.fromString("563273ea-0dae-4f82-86a4-e0db77c008ea")))); + assertThat(response.getBenefits().get(0).getId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getBenefits().get(0).getLiabilityAccountId(), is(equalTo(UUID.fromString("fa5cdc43-643b-4ad8-b4ac-3ffe0d0f4488")))); assertThat(response.getBenefits().get(0).getExpenseAccountId(), is(equalTo(UUID.fromString("b343c3b0-5941-4166-82b4-dd926622e0e2")))); assertThat(response.getBenefits().get(0).getName(), is(equalTo("KiwiSaver"))); @@ -91,7 +65,7 @@ public void getSuperannuationTest() throws IOException { UUID superannuationId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); SuperannuationObject response = payrollNzApi.getSuperannuation(accessToken, xeroTenantId, superannuationId); - assertThat(response.getBenefit().getId(), is(equalTo(UUID.fromString("563273ea-0dae-4f82-86a4-e0db77c008ea")))); + assertThat(response.getBenefit().getId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getBenefit().getLiabilityAccountId(), is(equalTo(UUID.fromString("fa5cdc43-643b-4ad8-b4ac-3ffe0d0f4488")))); assertThat(response.getBenefit().getExpenseAccountId(), is(equalTo(UUID.fromString("b343c3b0-5941-4166-82b4-dd926622e0e2")))); assertThat(response.getBenefit().getName(), is(equalTo("KiwiSaver"))); @@ -107,9 +81,15 @@ 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")))); + assertThat(response.getBenefit().getId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getBenefit().getLiabilityAccountId(), is(equalTo(UUID.fromString("568f2e9a-0870-46cc-8678-f83f132ed4e3")))); assertThat(response.getBenefit().getExpenseAccountId(), is(equalTo(UUID.fromString("e4eb36f6-97e3-4427-a394-dd4e1b355c2e")))); assertThat(response.getBenefit().getName(), is(equalTo("SidSaver"))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java index ba7e20b1..f679c199 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java @@ -1,45 +1,24 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.Timesheet; +import com.xero.models.payrollnz.TimesheetLine; +import com.xero.models.payrollnz.TimesheetLineObject; +import com.xero.models.payrollnz.TimesheetObject; +import com.xero.models.payrollnz.Timesheets; public class PayrollNzApiTimesheetsTest { @@ -57,7 +36,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -116,7 +95,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 +131,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 +151,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..c5b35a7a 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrollnz.TrackingCategories; public class PayrollNzApiTrackingCategoriesTest { @@ -57,7 +28,7 @@ public void setUp() { // 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("http://127.0.0.1:4016",null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java index 49f59d2c..73e37ffc 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java @@ -1,46 +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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.Deduction; +import com.xero.models.payrolluk.DeductionObject; +import com.xero.models.payrolluk.Deductions; public class PayrollUkApiDeductionsTest { @@ -58,7 +30,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -111,6 +83,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..61d2dcc9 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java @@ -1,46 +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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.EarningsRate; +import com.xero.models.payrolluk.EarningsRateObject; +import com.xero.models.payrolluk.EarningsRates; public class PayrollUkApiEarningRatesTest { @@ -58,7 +30,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -117,6 +89,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..55502a81 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java @@ -58,7 +58,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java index 6ded2c29..f5ec070d 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java index 1078fbe0..68e49bd2 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java index e1fe1bbc..1000f42d 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java @@ -1,45 +1,20 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.EmployeeLeave; +import com.xero.models.payrolluk.EmployeeLeaveObject; +import com.xero.models.payrolluk.EmployeeLeaves; public class PayrollUkApiEmployeeLeaveTest { @@ -57,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -93,6 +68,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 +120,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..897387d8 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java @@ -1,44 +1,20 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.Month; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.EmployeeLeaveType; +import com.xero.models.payrolluk.EmployeeLeaveTypeObject; +import com.xero.models.payrolluk.EmployeeLeaveTypes; public class PayrollUkApiEmployeeLeaveTypesTest { @@ -56,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -91,6 +67,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..08499226 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java index 9886e979..7e72aab8 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java index 6d05632f..1f983b1a 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java index 9125fd09..1a45c1dd 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java index e2a05da4..008c73e3 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java @@ -1,44 +1,19 @@ 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.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 java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.EmployeeStatutorySickLeave; +import com.xero.models.payrolluk.EmployeeStatutorySickLeaveObject; public class PayrollUkApiEmployeeStatutorySickLeaveTest { @@ -56,7 +31,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -72,6 +47,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..6c461199 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java @@ -56,7 +56,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java index 66fef7f7..8b9864b9 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java @@ -1,44 +1,22 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.Address; +import com.xero.models.payrolluk.Employee; +import com.xero.models.payrolluk.Employee.GenderEnum; +import com.xero.models.payrolluk.EmployeeObject; +import com.xero.models.payrolluk.Employees; public class PayrollUkApiEmployeeTest { @@ -56,7 +34,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -93,8 +71,18 @@ public void getEmployeesTest() throws IOException { public void createEmployeeTest() throws IOException { System.out.println("@Test UK Payroll - createEmployeeTest"); - Employee employee = new Employee(); - EmployeeObject response = payrollUkApi.createEmployee(accessToken, xeroTenantId, employee, null); + Employee employee1 = new Employee(); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("San Francisco"); + address.setPostCode("4351"); + employee1.setAddress(address); + employee1.setFirstName("Mike"); + employee1.setLastName("Fancy"); + employee1.setDateOfBirth(LocalDate.now()); + employee1.setTitle("Mr"); + employee1.setGender(GenderEnum.M); + EmployeeObject response = payrollUkApi.createEmployee(accessToken, xeroTenantId, employee1, null); assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("316146c7-26a4-4065-b9bd-346d0557ea96")))); assertThat(response.getEmployee().getTitle(), is(equalTo("Mr"))); @@ -119,21 +107,21 @@ 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().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().getNationalInsuranceNumber(), is(equalTo("AB123456C"))); + // 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().getNationalInsuranceNumber(), is(equalTo("AB123456C"))); //System.out.println(response.toString()); } @@ -143,6 +131,16 @@ 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("Fancy"); + employee.setDateOfBirth(LocalDate.now()); + employee.setTitle("Mr"); + employee.setGender(GenderEnum.M); EmployeeObject response = payrollUkApi.updateEmployee(accessToken, xeroTenantId, employeeId, employee, null); assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("aad6b292-7b94-408b-93f6-e489867e3fb0")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java index df3567a4..738302db 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java @@ -1,46 +1,20 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.*; +import java.io.IOException; +import java.util.UUID; -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 static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; import com.xero.api.ApiClient; -import com.xero.api.client.*; -import com.xero.models.payrolluk.*; +import com.xero.models.payrolluk.Benefit; 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 com.xero.models.payrolluk.BenefitObject; +import com.xero.models.payrolluk.Benefits; public class PayrollUkApiEmployerPensionsTest { @@ -58,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -112,6 +86,12 @@ public void createBenefitTest() throws IOException { System.out.println("@Test UK Payroll - createBenefitTest"); Benefit benefit = new Benefit(); + benefit.setName("New Benefit"); + benefit.setCategory(CategoryEnum.OTHER); + benefit.setLiabilityAccountId(UUID.randomUUID()); + benefit.setExpenseAccountId(UUID.randomUUID()); + benefit.setCalculationType(CalculationTypeEnum.FIXEDAMOUNT); + benefit.setPercentage(12.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..7b1e7a5c 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java @@ -1,44 +1,19 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.Employment; +import com.xero.models.payrolluk.Employment.NiCategoryEnum; +import com.xero.models.payrolluk.EmploymentObject; public class PayrollUkApiEmploymentTest { @@ -56,7 +31,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -71,6 +46,10 @@ public void createEmploymentTest() throws IOException { System.out.println("@Test UK Payroll - createEmploymentTest"); Employment employment = new Employment(); + employment.setEmployeeNumber("123ABC"); + employment.setPayrollCalendarID(UUID.randomUUID()); + employment.setStartDate(LocalDate.of(2020, 04, 01)); + employment.setNiCategory(NiCategoryEnum.A); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmploymentObject response = payrollUkApi.createEmployment(accessToken, xeroTenantId, employeeId, employment, null); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java index 6d22aa7f..c2d6fc4f 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java @@ -1,46 +1,19 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.LeaveType; +import com.xero.models.payrolluk.LeaveTypeObject; +import com.xero.models.payrolluk.LeaveTypes; public class PayrollUkApiLeaveTypesTest { @@ -58,7 +31,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -109,6 +82,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..5d662204 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java @@ -1,47 +1,20 @@ 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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.PayRunCalendar; +import com.xero.models.payrolluk.PayRunCalendarObject; +import com.xero.models.payrolluk.PayRunCalendars; public class PayrollUkApiPayRunCalendarsTest { @@ -59,7 +32,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -112,6 +85,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..17a4345c 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java @@ -59,7 +59,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java index 1ab37ae8..9bba7967 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.PaymentMethod; +import com.xero.models.payrolluk.PaymentMethodObject; public class PayrollUkApiPaymentMethodsTest { @@ -59,7 +29,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -92,6 +62,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..b7bb1e8c 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java @@ -59,7 +59,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java index e903e9f5..57a4e573 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java @@ -1,46 +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.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 java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.Reimbursement; +import com.xero.models.payrolluk.ReimbursementObject; +import com.xero.models.payrolluk.Reimbursements; public class PayrollUkApiReimbursementsTest { @@ -58,7 +30,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -103,6 +75,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..138cb1f1 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java @@ -59,7 +59,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",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..4f600db6 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java @@ -1,47 +1,24 @@ 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.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 java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.LocalDate; +import org.threeten.bp.LocalDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.payrolluk.Timesheet; +import com.xero.models.payrolluk.TimesheetLine; +import com.xero.models.payrolluk.TimesheetLineObject; +import com.xero.models.payrolluk.TimesheetObject; +import com.xero.models.payrolluk.Timesheets; public class PayrollUkApiTimesheetsTest { @@ -59,7 +36,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -118,8 +95,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 +132,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 +152,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..244ae7a6 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java @@ -59,7 +59,7 @@ public void setUp() { // 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("http://127.0.0.1:4017",null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java b/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java index 68ed245a..56c6268c 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java @@ -57,7 +57,7 @@ public void setUp() { // 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); + defaultClient = new ApiClient("http://127.0.0.1:4018",null,null,null,null); projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -93,13 +93,13 @@ public void getTasksTest() throws IOException { assertThat(response.getPagination().getItemCount(), is(equalTo(1))); assertThat(response.getPagination().getPageCount(), is(equalTo(1))); assertThat(response.getPagination().getPageSize(), is(equalTo(50))); - assertThat(response.getItems().get(0).getTaskId(), is(equalTo(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")))); + assertThat(response.getItems().get(0).getTaskId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getItems().get(0).getName(), is(equalTo("Demolition"))); assertThat(response.getItems().get(0).getRate().getCurrency(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); assertThat(response.getItems().get(0).getRate().getValue(), is(equalTo(20.0))); assertThat(response.getItems().get(0).getChargeType(), is(equalTo(com.xero.models.project.ChargeType.TIME))); assertThat(response.getItems().get(0).getEstimateMinutes(), is(equalTo(12000))); - assertThat(response.getItems().get(0).getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); + assertThat(response.getItems().get(0).getProjectId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getItems().get(0).getTotalMinutes(), is(equalTo(180))); assertThat(response.getItems().get(0).getTotalAmount().getCurrency(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); assertThat(response.getItems().get(0).getTotalAmount().getValue(), is(equalTo(60.0))); @@ -124,13 +124,13 @@ public void getTaskTest() throws IOException { Task response = projectApi.getTask(accessToken, xeroTenantId, projectId, taskId); - assertThat(response.getTaskId(), is(equalTo(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")))); + assertThat(response.getTaskId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getName(), is(equalTo("Demolition"))); assertThat(response.getRate().getCurrency(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); assertThat(response.getRate().getValue(), is(equalTo(20.0))); assertThat(response.getChargeType(), is(equalTo(com.xero.models.project.ChargeType.TIME))); assertThat(response.getEstimateMinutes(), is(equalTo(12000))); - assertThat(response.getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); + assertThat(response.getProjectId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getTotalMinutes(), is(equalTo(300))); assertThat(response.getTotalAmount().getCurrency(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); assertThat(response.getTotalAmount().getValue(), is(equalTo(100.0))); diff --git a/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java b/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java index d48ea6f6..b50481c2 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java @@ -57,7 +57,7 @@ public void setUp() { // 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); + defaultClient = new ApiClient("http://127.0.0.1:4018",null,null,null,null); projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -92,9 +92,9 @@ public void getProjectUsersTest() throws IOException { assertThat(response.getPagination().getItemCount(), is(equalTo(2))); 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).getUserId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + 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..91eb0349 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java @@ -1,44 +1,20 @@ 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.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 java.util.List; +import java.util.UUID; -import org.apache.commons.io.IOUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -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 com.xero.api.ApiClient; +import com.xero.models.project.Project; +import com.xero.models.project.ProjectCreateOrUpdate; +import com.xero.models.project.Projects; public class ProjectsApiProjectsTest { @@ -57,7 +33,7 @@ public void setUp() { // 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); + defaultClient = new ApiClient("http://127.0.0.1:4018",null,null,null,null); projectApi = projectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -94,8 +70,8 @@ public void getProjectsTest() throws IOException { assertThat(response.getPagination().getItemCount(), is(equalTo(9))); assertThat(response.getPagination().getPageCount(), is(equalTo(1))); assertThat(response.getPagination().getPageSize(), is(equalTo(50))); - assertThat(response.getItems().get(0).getContactId(), is(equalTo(UUID.fromString("216830cb-9a68-487e-928b-c1a7ccc4fc81")))); - assertThat(response.getItems().get(0).getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); + assertThat(response.getItems().get(0).getContactId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getItems().get(0).getProjectId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getItems().get(0).getName(), is(equalTo("FooProject28916"))); assertThat(response.getItems().get(0).getCurrencyCode(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); assertThat(response.getItems().get(0).getMinutesLogged(), is(equalTo(180))); @@ -134,10 +110,11 @@ 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")))); - assertThat(response.getProjectId(), is(equalTo(UUID.fromString("ed957eee-bc6f-4f52-a663-aa42e6af9620")))); + assertThat(response.getContactId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getProjectId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getName(), is(equalTo("New Kitchen"))); assertThat(response.getCurrencyCode(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); assertThat(response.getMinutesLogged(), is(equalTo(0))); @@ -178,9 +155,9 @@ public void getProjectTest() throws IOException { UUID projectId = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); Project response = projectApi.getProject(accessToken, xeroTenantId, projectId); - 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.getContactId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getProjectId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + 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..87b57d89 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java @@ -1,47 +1,20 @@ 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.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.List; import java.util.UUID; -import jakarta.ws.rs.core.Response; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; +import org.threeten.bp.OffsetDateTime; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import com.xero.api.ApiClient; +import com.xero.models.project.TimeEntries; +import com.xero.models.project.TimeEntry; +import com.xero.models.project.TimeEntryCreateOrUpdate; public class ProjectsApiTimeEntriesTest { @@ -60,7 +33,7 @@ public void setUp() { // 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); + defaultClient = new ApiClient("http://127.0.0.1:4018",null,null,null,null); projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -104,12 +77,12 @@ public void getTimeEntriesTest() throws IOException { assertThat(response.getPagination().getItemCount(), is(equalTo(9))); assertThat(response.getPagination().getPageCount(), is(equalTo(1))); assertThat(response.getPagination().getPageSize(), is(equalTo(50))); - assertThat(response.getItems().get(0).getTimeEntryId(),is(equalTo(UUID.fromString("3cd35eca-704f-4bca-b258-236028ae8ed1")))); - assertThat(response.getItems().get(0).getUserId(), is(equalTo(UUID.fromString("740add2a-a703-4b8a-a670-1093919c2040")))); - 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).getTimeEntryId(),is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getItems().get(0).getUserId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getItems().get(0).getProjectId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getItems().get(0).getTaskId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); 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,13 +93,17 @@ 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.getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); - assertThat(response.getTaskId(), is(equalTo(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")))); + assertThat(response.getTimeEntryId(),is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getUserId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getProjectId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getTaskId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getDateUtc(), is(equalTo(OffsetDateTime.parse("2020-02-26T15:00Z")))); assertThat(response.getDateEnteredUtc(), is(equalTo(OffsetDateTime.parse("2020-02-28T20:37:42.865283200Z")))); assertThat(response.getDuration(), is(equalTo(30))); @@ -142,10 +119,10 @@ public void getTimeEntryTest() throws IOException { UUID timeEntryId = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); TimeEntry response = projectApi.getTimeEntry(accessToken, xeroTenantId, projectId, timeEntryId); - assertThat(response.getTimeEntryId(),is(equalTo(UUID.fromString("3cd35eca-704f-4bca-b258-236028ae8ed1")))); - assertThat(response.getUserId(), is(equalTo(UUID.fromString("740add2a-a703-4b8a-a670-1093919c2040")))); - 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.getTimeEntryId(),is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getUserId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getProjectId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); + assertThat(response.getTaskId(), is(equalTo(UUID.fromString("00000000-0000-0000-0000-000000000000")))); assertThat(response.getDateUtc(), is(equalTo(OffsetDateTime.parse("2020-02-27T15:00Z")))); assertThat(response.getDateEnteredUtc(), is(equalTo(OffsetDateTime.parse("2020-02-21T21:41:22.264272700Z")))); assertThat(response.getDuration(), is(equalTo(45)));