Skip to content

Commit f6c1cbb

Browse files
vigneshk-twvigneshk-tw
authored
Merge pull request #383 from XeroAPI/fix/replace-postman-with-prism-payroll
Replaced Postman Mock Server with PRISM Server and fixed failing test cases - Payroll Related
2 parents 7dcdd2f + cfbe8c1 commit f6c1cbb

File tree

63 files changed

+445
-2259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+445
-2259
lines changed

‎src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,18 @@
11
package com.xero.api.client;
22

3-
import static org.junit.Assert.assertTrue;
4-
53
import org.junit.*;
64

75
import static org.hamcrest.MatcherAssert.*;
86
import static org.hamcrest.Matchers.*;
9-
import static org.hamcrest.Matchers.containsInAnyOrder;
10-
import static org.hamcrest.Matchers.greaterThan;
11-
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
12-
import static org.hamcrest.core.Every.everyItem;
13-
147
import com.xero.api.ApiClient;
15-
import com.xero.api.client.*;
8+
import com.xero.api.util.ConfigurationLoader;
169
import com.xero.models.payrollau.*;
1710

18-
import java.io.File;
19-
import java.net.URL;
20-
21-
import com.google.api.client.auth.oauth2.BearerToken;
22-
import com.google.api.client.auth.oauth2.Credential;
23-
import com.google.api.client.http.HttpRequestFactory;
24-
import com.google.api.client.http.HttpTransport;
25-
import com.google.api.client.http.javanet.NetHttpTransport;
26-
2711
import org.threeten.bp.*;
2812
import java.io.IOException;
29-
import com.fasterxml.jackson.core.type.TypeReference;
30-
31-
import java.io.File;
32-
import java.io.IOException;
33-
34-
import org.apache.commons.io.IOUtils;
35-
36-
import java.util.Calendar;
37-
import java.util.Map;
3813
import java.util.UUID;
3914
import java.util.List;
4015
import java.util.ArrayList;
41-
import java.math.BigDecimal;
4216

4317
public class PayrollAuApiEmployeeTest {
4418

@@ -54,11 +28,8 @@ public void setUp() {
5428
accessToken = "123";
5529
xeroTenantId = "xyz";
5630

57-
// Init projectApi client
58-
// NEW Sandbox for API Mocking
59-
defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null);
60-
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
61-
31+
defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null);
32+
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
6233
}
6334

6435
public void tearDown() {

‎src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java‎

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,18 @@
11
package com.xero.api.client;
22

3-
import static org.junit.Assert.assertTrue;
4-
53
import org.junit.*;
64

75
import static org.hamcrest.MatcherAssert.*;
86
import static org.hamcrest.Matchers.*;
9-
import static org.hamcrest.Matchers.containsInAnyOrder;
10-
import static org.hamcrest.Matchers.greaterThan;
11-
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
12-
import static org.hamcrest.core.Every.everyItem;
13-
147
import com.xero.api.ApiClient;
15-
import com.xero.api.client.*;
8+
import com.xero.api.util.ConfigurationLoader;
169
import com.xero.models.payrollau.*;
1710

18-
import java.io.File;
19-
import java.net.URL;
20-
21-
import com.google.api.client.auth.oauth2.BearerToken;
22-
import com.google.api.client.auth.oauth2.Credential;
23-
import com.google.api.client.http.HttpRequestFactory;
24-
import com.google.api.client.http.HttpTransport;
25-
import com.google.api.client.http.javanet.NetHttpTransport;
26-
2711
import org.threeten.bp.*;
2812
import java.io.IOException;
29-
import com.fasterxml.jackson.core.type.TypeReference;
30-
31-
import java.io.File;
32-
import java.io.IOException;
33-
34-
import org.apache.commons.io.IOUtils;
35-
36-
import java.util.Calendar;
37-
import java.util.Map;
3813
import java.util.UUID;
3914
import java.util.List;
4015
import java.util.ArrayList;
41-
import java.math.BigDecimal;
4216

4317
public class PayrollAuApiLeaveApplicationTest {
4418

@@ -54,11 +28,8 @@ public void setUp() {
5428
accessToken = "123";
5529
xeroTenantId = "xyz";
5630

57-
// Init projectApi client
58-
// NEW Sandbox for API Mocking
59-
defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null);
60-
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
61-
31+
defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null);
32+
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
6233
}
6334

6435
public void tearDown() {
@@ -102,7 +73,7 @@ public void getLeaveApplicationTest() throws IOException {
10273
assertThat(response.getLeaveApplications().get(0).getEndDateAsDate(), is(equalTo(LocalDate.of(2019,11,12))));
10374
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,8))));
10475
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,14))));
105-
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.0)));
76+
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6)));
10677
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED)));
10778
assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T05:30:08Z"))));
10879
//System.out.println(response.toString());
@@ -123,7 +94,7 @@ public void createLeaveApplicationTest() throws IOException {
12394
assertThat(response.getLeaveApplications().get(0).getEndDateAsDate(), is(equalTo(LocalDate.of(2019,11,01))));
12495
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,1))));
12596
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,07))));
126-
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.6)));
97+
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6)));
12798
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED)));
12899
assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T21:16:31.897Z"))));
129100
//System.out.println(response.toString());
@@ -146,7 +117,7 @@ public void updateLeaveApplicationTest() throws IOException {
146117
assertThat(response.getLeaveApplications().get(0).getDescription(), is(equalTo("My updated Description")));
147118
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,01))));
148119
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,07))));
149-
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.6)));
120+
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6)));
150121
assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED)));
151122
assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T21:16:32.293Z"))));
152123
//System.out.println(response.toString());

‎src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java‎

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,16 @@
11
package com.xero.api.client;
22

3-
import static org.junit.Assert.assertTrue;
4-
53
import org.junit.*;
64

75
import static org.hamcrest.MatcherAssert.*;
86
import static org.hamcrest.Matchers.*;
9-
import static org.hamcrest.Matchers.containsInAnyOrder;
10-
import static org.hamcrest.Matchers.greaterThan;
11-
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
12-
import static org.hamcrest.core.Every.everyItem;
13-
147
import com.xero.api.ApiClient;
15-
import com.xero.api.client.*;
8+
import com.xero.api.util.ConfigurationLoader;
169
import com.xero.models.payrollau.*;
1710

18-
import java.io.File;
19-
import java.net.URL;
20-
21-
import com.google.api.client.auth.oauth2.BearerToken;
22-
import com.google.api.client.auth.oauth2.Credential;
23-
import com.google.api.client.http.HttpRequestFactory;
24-
import com.google.api.client.http.HttpTransport;
25-
import com.google.api.client.http.javanet.NetHttpTransport;
26-
2711
import org.threeten.bp.*;
2812
import java.io.IOException;
29-
import com.fasterxml.jackson.core.type.TypeReference;
30-
31-
import java.io.File;
32-
import java.io.IOException;
33-
34-
import org.apache.commons.io.IOUtils;
35-
36-
import java.util.Calendar;
37-
import java.util.Map;
3813
import java.util.UUID;
39-
import java.util.List;
40-
import java.util.ArrayList;
41-
import java.math.BigDecimal;
4214

4315
public class PayrollAuApiPayItemTest {
4416

@@ -54,11 +26,8 @@ public void setUp() {
5426
accessToken = "123";
5527
xeroTenantId = "xyz";
5628

57-
// Init projectApi client
58-
// NEW Sandbox for API Mocking
59-
defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null);
60-
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
61-
29+
defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null);
30+
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
6231
}
6332

6433
public void tearDown() {

‎src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,18 @@
11
package com.xero.api.client;
22

3-
import static org.junit.Assert.assertTrue;
4-
53
import org.junit.*;
64

75
import static org.hamcrest.MatcherAssert.*;
86
import static org.hamcrest.Matchers.*;
9-
import static org.hamcrest.Matchers.containsInAnyOrder;
10-
import static org.hamcrest.Matchers.greaterThan;
11-
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
12-
import static org.hamcrest.core.Every.everyItem;
13-
147
import com.xero.api.ApiClient;
15-
import com.xero.api.client.*;
8+
import com.xero.api.util.ConfigurationLoader;
169
import com.xero.models.payrollau.*;
1710

18-
import java.io.File;
19-
import java.net.URL;
20-
21-
import com.google.api.client.auth.oauth2.BearerToken;
22-
import com.google.api.client.auth.oauth2.Credential;
23-
import com.google.api.client.http.HttpRequestFactory;
24-
import com.google.api.client.http.HttpTransport;
25-
import com.google.api.client.http.javanet.NetHttpTransport;
26-
2711
import org.threeten.bp.*;
2812
import java.io.IOException;
29-
import com.fasterxml.jackson.core.type.TypeReference;
30-
31-
import java.io.File;
32-
import java.io.IOException;
33-
34-
import org.apache.commons.io.IOUtils;
35-
36-
import java.util.Calendar;
37-
import java.util.Map;
3813
import java.util.UUID;
3914
import java.util.List;
4015
import java.util.ArrayList;
41-
import java.math.BigDecimal;
4216

4317
public class PayrollAuApiPayRunTest {
4418

@@ -54,10 +28,8 @@ public void setUp() {
5428
accessToken = "123";
5529
xeroTenantId = "xyz";
5630

57-
// Init projectApi client
58-
// NEW Sandbox for API Mocking
59-
defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null);
60-
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
31+
defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null);
32+
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
6133

6234
}
6335

‎src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,18 @@
11
package com.xero.api.client;
22

3-
import static org.junit.Assert.assertTrue;
4-
53
import org.junit.*;
64

75
import static org.hamcrest.MatcherAssert.*;
86
import static org.hamcrest.Matchers.*;
9-
import static org.hamcrest.Matchers.containsInAnyOrder;
10-
import static org.hamcrest.Matchers.greaterThan;
11-
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
12-
import static org.hamcrest.core.Every.everyItem;
13-
147
import com.xero.api.ApiClient;
15-
import com.xero.api.client.*;
8+
import com.xero.api.util.ConfigurationLoader;
169
import com.xero.models.payrollau.*;
1710

18-
import java.io.File;
19-
import java.net.URL;
20-
21-
import com.google.api.client.auth.oauth2.BearerToken;
22-
import com.google.api.client.auth.oauth2.Credential;
23-
import com.google.api.client.http.HttpRequestFactory;
24-
import com.google.api.client.http.HttpTransport;
25-
import com.google.api.client.http.javanet.NetHttpTransport;
26-
2711
import org.threeten.bp.*;
2812
import java.io.IOException;
29-
import com.fasterxml.jackson.core.type.TypeReference;
30-
31-
import java.io.File;
32-
import java.io.IOException;
33-
34-
import org.apache.commons.io.IOUtils;
35-
36-
import java.util.Calendar;
37-
import java.util.Map;
3813
import java.util.UUID;
3914
import java.util.List;
4015
import java.util.ArrayList;
41-
import java.math.BigDecimal;
4216

4317
public class PayrollAuApiPayrollCalendarTest {
4418

@@ -54,11 +28,8 @@ public void setUp() {
5428
accessToken = "123";
5529
xeroTenantId = "xyz";
5630

57-
// Init projectApi client
58-
// NEW Sandbox for API Mocking
59-
defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null);
31+
defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null);
6032
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
61-
6233
}
6334

6435
public void tearDown() {

‎src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,18 @@
11
package com.xero.api.client;
22

3-
import static org.junit.Assert.assertTrue;
4-
53
import org.junit.*;
64

75
import static org.hamcrest.MatcherAssert.*;
86
import static org.hamcrest.Matchers.*;
9-
import static org.hamcrest.Matchers.containsInAnyOrder;
10-
import static org.hamcrest.Matchers.greaterThan;
11-
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
12-
import static org.hamcrest.core.Every.everyItem;
13-
147
import com.xero.api.ApiClient;
15-
import com.xero.api.client.*;
8+
import com.xero.api.util.ConfigurationLoader;
169
import com.xero.models.payrollau.*;
1710

18-
import java.io.File;
19-
import java.net.URL;
20-
21-
import com.google.api.client.auth.oauth2.BearerToken;
22-
import com.google.api.client.auth.oauth2.Credential;
23-
import com.google.api.client.http.HttpRequestFactory;
24-
import com.google.api.client.http.HttpTransport;
25-
import com.google.api.client.http.javanet.NetHttpTransport;
26-
2711
import org.threeten.bp.*;
2812
import java.io.IOException;
29-
import com.fasterxml.jackson.core.type.TypeReference;
30-
31-
import java.io.File;
32-
import java.io.IOException;
33-
34-
import org.apache.commons.io.IOUtils;
35-
36-
import java.util.Calendar;
37-
import java.util.Map;
3813
import java.util.UUID;
3914
import java.util.List;
4015
import java.util.ArrayList;
41-
import java.math.BigDecimal;
4216

4317
public class PayrollAuApiPayslipTest {
4418

@@ -54,10 +28,8 @@ public void setUp() {
5428
accessToken = "123";
5529
xeroTenantId = "xyz";
5630

57-
// Init projectApi client
58-
// NEW Sandbox for API Mocking
59-
defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null);
60-
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
31+
defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null);
32+
payrollAuApi = PayrollAuApi.getInstance(defaultClient);
6133

6234
}
6335

0 commit comments

Comments
 (0)