Skip to content

Commit 1f3c669

Browse files
rmcdougarmcdouga
committed
✨ Updated integration tests to use JerseyClient.
1 parent 7525303 commit 1f3c669

14 files changed

Lines changed: 41 additions & 19 deletions

File tree

‎rest-services/it.tests/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</properties>
4040

4141
<dependencies>
42-
<dependency>
42+
<!-- <dependency>
4343
<groupId>org.glassfish.jersey.core</groupId>
4444
<artifactId>jersey-client</artifactId>
4545
</dependency>
@@ -51,6 +51,7 @@
5151
<groupId>org.glassfish.jersey.inject</groupId>
5252
<artifactId>jersey-hk2</artifactId>
5353
</dependency>
54+
-->
5455
<dependency>
5556
<groupId>commons-io</groupId>
5657
<artifactId>commons-io</artifactId>
@@ -64,6 +65,11 @@
6465
<groupId>com._4point.aem.docservices</groupId>
6566
<artifactId>rest-services.client</artifactId>
6667
</dependency>
68+
<dependency>
69+
<groupId>com._4point.aem.docservices.rest-services</groupId>
70+
<artifactId>rest-services.jersey-client</artifactId>
71+
</dependency>
72+
<!-- Testing -->
6773
<dependency> <!-- PDF Library for examining PDFs we generate -->
6874
<groupId>org.apache.pdfbox</groupId>
6975
<artifactId>pdfbox</artifactId>

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/af/RenderAdaptiveFormTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.junit.jupiter.api.Test;
1818

1919
import com._4point.aem.docservices.rest_services.client.af.AdaptiveFormsService;
20+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
2021
import com._4point.aem.docservices.rest_services.it_tests.TestUtils;
2122
import com._4point.aem.fluentforms.api.Document;
2223
import com._4point.aem.fluentforms.api.PathOrUrl;
@@ -33,7 +34,7 @@ class RenderAdaptiveFormTest {
3334

3435
@BeforeEach
3536
void setUp() throws Exception {
36-
underTest = AdaptiveFormsService.builder()
37+
underTest = AdaptiveFormsService.builder(JerseyRestClient.factory())
3738
.machineName(TestUtils.TEST_MACHINE_NAME)
3839
.port(TestUtils.TEST_MACHINE_PORT)
3940
.basicAuthentication(TestUtils.TEST_USER, TestUtils.TEST_USER_PASSWORD)

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/assembler/AssembleDocumentsTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com._4point.aem.docservices.rest_services.client.assembler.RestServicesDocAssemblerServiceAdapter;
2020
import com._4point.aem.docservices.rest_services.client.helpers.XmlDocument;
21+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
2122
import com._4point.aem.docservices.rest_services.it_tests.Pdf;
2223
import com._4point.aem.fluentforms.api.Document;
2324
import com._4point.aem.fluentforms.api.DocumentFactory;
@@ -44,7 +45,7 @@ public class AssembleDocumentsTest {
4445
private AssemblerService underTest;
4546
@BeforeEach
4647
void setUp() throws Exception {
47-
RestServicesDocAssemblerServiceAdapter adapter = RestServicesDocAssemblerServiceAdapter.builder()
48+
RestServicesDocAssemblerServiceAdapter adapter = RestServicesDocAssemblerServiceAdapter.builder(JerseyRestClient.factory())
4849
.machineName(TEST_MACHINE_NAME)
4950
.port(TEST_MACHINE_PORT)
5051
.basicAuthentication(TEST_USER, TEST_USER_PASSWORD)

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/docassurance/SecureDocumentTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.junit.jupiter.api.Test;
1010

1111
import com._4point.aem.docservices.rest_services.client.docassurance.RestServicesDocAssuranceServiceAdapter;
12+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
1213
import com._4point.aem.docservices.rest_services.it_tests.TestUtils;
1314
import com._4point.aem.fluentforms.api.Document;
1415
import com._4point.aem.fluentforms.api.docassurance.DocAssuranceService;
@@ -22,7 +23,7 @@ public class SecureDocumentTest {
2223

2324
@BeforeEach
2425
void setUp() throws Exception {
25-
RestServicesDocAssuranceServiceAdapter adapter = RestServicesDocAssuranceServiceAdapter.builder()
26+
RestServicesDocAssuranceServiceAdapter adapter = RestServicesDocAssuranceServiceAdapter.builder(JerseyRestClient.factory())
2627
.machineName(TEST_MACHINE_NAME)
2728
.port(TEST_MACHINE_PORT)
2829
.basicAuthentication(TEST_USER, TEST_USER_PASSWORD)

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/forms/ExportDataTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.w3c.dom.Node;
2323

2424
import com._4point.aem.docservices.rest_services.client.forms.RestServicesFormsServiceAdapter;
25+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
2526
import com._4point.aem.fluentforms.api.Document;
2627
import com._4point.aem.fluentforms.api.forms.FormsService;
2728
import com._4point.aem.fluentforms.api.forms.FormsService.FormsServiceException;
@@ -41,7 +42,7 @@ class ExportDataTest {
4142

4243
@BeforeEach
4344
void setUp() throws Exception {
44-
RestServicesFormsServiceAdapter adapter = RestServicesFormsServiceAdapter.builder()
45+
RestServicesFormsServiceAdapter adapter = RestServicesFormsServiceAdapter.builder(JerseyRestClient.factory())
4546
.machineName(TEST_MACHINE_NAME)
4647
.port(TEST_MACHINE_PORT)
4748
.basicAuthentication(TEST_USER, TEST_USER_PASSWORD)

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/forms/ImportDataTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.junit.jupiter.api.Test;
1414

1515
import com._4point.aem.docservices.rest_services.client.forms.RestServicesFormsServiceAdapter;
16+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
1617
import com._4point.aem.docservices.rest_services.it_tests.ByteArrayString;
1718
import com._4point.aem.fluentforms.api.Document;
1819
import com._4point.aem.fluentforms.api.forms.FormsService;
@@ -28,7 +29,7 @@ class ImportDataTest {
2829

2930
@BeforeEach
3031
void setUp() throws Exception {
31-
RestServicesFormsServiceAdapter adapter = RestServicesFormsServiceAdapter.builder()
32+
RestServicesFormsServiceAdapter adapter = RestServicesFormsServiceAdapter.builder(JerseyRestClient.factory())
3233
.machineName(TEST_MACHINE_NAME)
3334
.port(TEST_MACHINE_PORT)
3435
.basicAuthentication(TEST_USER, TEST_USER_PASSWORD)

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/forms/RenderPdfFormTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.junit.jupiter.api.Test;
1111

1212
import com._4point.aem.docservices.rest_services.client.forms.RestServicesFormsServiceAdapter;
13+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
1314
import com._4point.aem.docservices.rest_services.it_tests.TestUtils;
1415
import com._4point.aem.fluentforms.api.Document;
1516
import com._4point.aem.fluentforms.api.PathOrUrl;
@@ -28,7 +29,7 @@ class RenderPdfFormTest {
2829

2930
@BeforeEach
3031
void setUp() throws Exception {
31-
RestServicesFormsServiceAdapter adapter = RestServicesFormsServiceAdapter.builder()
32+
RestServicesFormsServiceAdapter adapter = RestServicesFormsServiceAdapter.builder(JerseyRestClient.factory())
3233
.machineName(TEST_MACHINE_NAME)
3334
.port(TEST_MACHINE_PORT)
3435
.basicAuthentication(TEST_USER, TEST_USER_PASSWORD)

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/generatePDF/GeneratePDFTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.junit.jupiter.api.Test;
1111

1212
import com._4point.aem.docservices.rest_services.client.generatePDF.RestServicesGeneratePDFServiceAdapter;
13+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
1314
import com._4point.aem.fluentforms.api.generatePDF.CreatePDFResult;
1415
import com._4point.aem.fluentforms.api.generatePDF.GeneratePDFService;
1516
import com._4point.aem.fluentforms.api.generatePDF.GeneratePDFService.GeneratePDFServiceException;
@@ -24,7 +25,7 @@ public class GeneratePDFTest {
2425

2526
@BeforeEach
2627
void setUp() throws Exception {
27-
RestServicesGeneratePDFServiceAdapter adapter = RestServicesGeneratePDFServiceAdapter.builder()
28+
RestServicesGeneratePDFServiceAdapter adapter = RestServicesGeneratePDFServiceAdapter.builder(JerseyRestClient.factory())
2829
.machineName(TEST_MACHINE_NAME)
2930
.port(TEST_MACHINE_PORT)
3031
.basicAuthentication(TEST_USER, TEST_USER_PASSWORD)

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/html5/RenderHtml5FormTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.junit.jupiter.api.Test;
1313

1414
import com._4point.aem.docservices.rest_services.client.html5.Html5FormsService;
15+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
1516
import com._4point.aem.docservices.rest_services.it_tests.HtmlFormDocument;
1617
import com._4point.aem.docservices.rest_services.it_tests.TestUtils;
1718
import com._4point.aem.fluentforms.api.Document;
@@ -26,7 +27,7 @@ class RenderHtml5FormTest {
2627

2728
@BeforeEach
2829
void setUp() throws Exception {
29-
underTest = Html5FormsService.builder()
30+
underTest = Html5FormsService.builder(JerseyRestClient.factory())
3031
.machineName(TestUtils.TEST_MACHINE_NAME)
3132
.port(TestUtils.TEST_MACHINE_PORT)
3233
.basicAuthentication(TestUtils.TEST_USER, TestUtils.TEST_USER_PASSWORD)

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/output/GeneratePdfOutputTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.junit.jupiter.api.DisplayName;
1212
import org.junit.jupiter.api.Test;
1313

14+
import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
1415
import com._4point.aem.docservices.rest_services.client.output.RestServicesOutputServiceAdapter;
1516
import com._4point.aem.docservices.rest_services.it_tests.Pdf;
1617
import com._4point.aem.docservices.rest_services.it_tests.TestUtils;
@@ -30,7 +31,7 @@ class GeneratePdfOutputTest {
3031

3132
@BeforeEach
3233
void setUp() throws Exception {
33-
RestServicesOutputServiceAdapter adapter = RestServicesOutputServiceAdapter.builder()
34+
RestServicesOutputServiceAdapter adapter = RestServicesOutputServiceAdapter.builder(JerseyRestClient.factory())
3435
.machineName("172.18.110.22")
3536
.port(4502)
3637
.basicAuthentication(TEST_USER, TEST_USER_PASSWORD)

0 commit comments

Comments
 (0)