diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/client/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/client/JAXRSClientIT.java index fc465fe63..f4d61fba9 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/client/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/client/JAXRSClientIT.java @@ -54,15 +54,6 @@ public JAXRSClientIT() { setClientAndWebTarget(); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } protected transient WebTarget target; diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientbuilder/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientbuilder/JAXRSClientIT.java index 31b6324d5..052422ffe 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientbuilder/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientbuilder/JAXRSClientIT.java @@ -38,15 +38,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 7395392827433641768L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: newClientNoParamTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientrequestcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientrequestcontext/JAXRSClientIT.java index 0cf291da7..4c2052640 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientrequestcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientrequestcontext/JAXRSClientIT.java @@ -66,15 +66,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 8883841555516513076L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: abortWithTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientresponsecontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientresponsecontext/JAXRSClientIT.java index 4b4d5d4af..260084d0c 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientresponsecontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/clientresponsecontext/JAXRSClientIT.java @@ -70,15 +70,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = -9134505693194656037L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: getAllowedMethodsTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/entity/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/entity/JAXRSClientIT.java index a2027de57..1a1893b14 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/entity/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/entity/JAXRSClientIT.java @@ -55,15 +55,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 3872631127958907381L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: entityMediaTypeTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/invocation/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/invocation/JAXRSClientIT.java index 587bb784b..49d5889f1 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/invocation/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/invocation/JAXRSClientIT.java @@ -57,15 +57,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = -7647322937577043460L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: invokePlainTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/invocationcallback/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/invocationcallback/JAXRSClientIT.java index 06a8990f7..48fad85cb 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/invocationcallback/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/invocationcallback/JAXRSClientIT.java @@ -53,15 +53,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final int WAIT_SECONDS = 5; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: completedTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/responseprocessingexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/responseprocessingexception/JAXRSClientIT.java index 7a968e9a7..6cacf3c14 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/responseprocessingexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/responseprocessingexception/JAXRSClientIT.java @@ -46,15 +46,6 @@ public JAXRSClientIT() { setContextRoot("/jaxrs_api_rs_processingexception_web"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorWithRuntimeExceptionTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/webtarget/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/webtarget/JAXRSClientIT.java index a830d7521..63d013705 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/webtarget/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/client/webtarget/JAXRSClientIT.java @@ -55,15 +55,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final String SLASHED = "%42%5A%61%7a/%%21"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: getUriTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/badrequestexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/badrequestexception/JAXRSClientIT.java index c46a47814..97e57ab21 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/badrequestexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/badrequestexception/JAXRSClientIT.java @@ -46,15 +46,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/bindingpriority/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/bindingpriority/JAXRSClientIT.java index d0911cdc3..ae73b6f18 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/bindingpriority/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/bindingpriority/JAXRSClientIT.java @@ -43,15 +43,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 1501029701397272718L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: checkBindingPriorityHigherRegisteredFirstTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/clienterrorexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/clienterrorexception/JAXRSClientIT.java index 623cbf75d..e113dbfb9 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/clienterrorexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/clienterrorexception/JAXRSClientIT.java @@ -44,15 +44,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorStatusTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/newcookie/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/newcookie/JAXRSClientIT.java index c22cf13d5..5a17931a4 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/newcookie/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/newcookie/JAXRSClientIT.java @@ -40,15 +40,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 295711558453778471L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorTest1 diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responsebuilder/BuilderClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responsebuilder/BuilderClientIT.java index c0a9b5c84..0fe61c528 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responsebuilder/BuilderClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responsebuilder/BuilderClientIT.java @@ -58,15 +58,6 @@ public class BuilderClientIT extends JAXRSClientIT { - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: statusTest1 diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responseclient/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responseclient/JAXRSClientIT.java index c21741f4f..79a73d1b7 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responseclient/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responseclient/JAXRSClientIT.java @@ -146,15 +146,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { "Network Authentication Required" }; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @class.setup_props: webServerHost; webServerPort; diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responsestatustype/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responsestatustype/JAXRSClientIT.java index acfaec20a..cd29ed332 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responsestatustype/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/responsestatustype/JAXRSClientIT.java @@ -40,15 +40,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = -4533695636737308500L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } // name it to ensure sorting static final int[] status_codes = { 200, 201, 202, 204, 205, 206, 301, 302, diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java index d23920fdd..3e93fa9c7 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java @@ -64,15 +64,6 @@ public JAXRSClientIT() { sb = new StringBuilder(); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: buildTest1 diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/interceptor/reader/interceptorcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/interceptor/reader/interceptorcontext/JAXRSClientIT.java index 2d8308421..e2da7c668 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/interceptor/reader/interceptorcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/interceptor/reader/interceptorcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -50,18 +50,14 @@ public class JAXRSClientIT extends ReaderClient { private static final long serialVersionUID = -8828149277776372718L; - public JAXRSClientIT() { - setup(); - } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void setup() { + // Only the values are verified, using verifySettings() in JaxrWebTestCase.java + // but the URL with these values is not required to work. + // TODO: remove validation of these values for the tests in this file. + _hostname = "localhost"; + _port = 8080; } /* diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/interceptor/reader/readerinterceptorcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/interceptor/reader/readerinterceptorcontext/JAXRSClientIT.java index abc638081..6a468134b 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/interceptor/reader/readerinterceptorcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/interceptor/reader/readerinterceptorcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -38,20 +38,21 @@ public class JAXRSClientIT extends ReaderClient { private static final long serialVersionUID = -6962070973647934636L; - public JAXRSClientIT() { - setup(); - } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } + public void setup() { - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + // Only the values are verified, using verifySettings() in JaxrWebTestCase.java + // but the URL with these values is not required to work. + // TODO: remove validation of these values for the tests in this file. + _hostname = "localhost"; + _port = 8080; + + String property = System.getProperty("cts.tmp", "/tmp"); + if (property != null) + System.setProperty("java.io.tmpdir", property); } + /* * @testName: getHeadersOperationSetTest * diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/runtimedelegate/create/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/runtimedelegate/create/JAXRSClientIT.java index 198083c2a..b1670e0d1 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/runtimedelegate/create/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/runtimedelegate/create/JAXRSClientIT.java @@ -56,15 +56,6 @@ public JAXRSClientIT() { delegate = RuntimeDelegate.getInstance(); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: createEndpointTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/runtimedelegate/setinstance/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/runtimedelegate/setinstance/JAXRSClientIT.java index da7a8af78..62e21e64f 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/runtimedelegate/setinstance/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/ext/runtimedelegate/setinstance/JAXRSClientIT.java @@ -35,15 +35,6 @@ public class JAXRSClientIT extends JAXRSDelegateClient { private static final long serialVersionUID = -5586431064207012301L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: askForTckRuntimeDelegateGivenBySetInstanceTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/forbiddenexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/forbiddenexception/JAXRSClientIT.java index 9bd1d74a9..4044c9adf 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/forbiddenexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/forbiddenexception/JAXRSClientIT.java @@ -46,15 +46,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/internalservererrorexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/internalservererrorexception/JAXRSClientIT.java index 611bbdf6b..bbc7511af 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/internalservererrorexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/internalservererrorexception/JAXRSClientIT.java @@ -46,15 +46,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notacceptableexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notacceptableexception/JAXRSClientIT.java index c049d6e43..ed9cf6eec 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notacceptableexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notacceptableexception/JAXRSClientIT.java @@ -46,15 +46,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notallowedexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notallowedexception/JAXRSClientIT.java index 2584beaea..b90070fed 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notallowedexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notallowedexception/JAXRSClientIT.java @@ -46,15 +46,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorStringTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notauthorizedexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notauthorizedexception/JAXRSClientIT.java index abea27d91..df5f06e3c 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notauthorizedexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notauthorizedexception/JAXRSClientIT.java @@ -51,15 +51,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorObjectsTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notfoundexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notfoundexception/JAXRSClientIT.java index 622b8a6d5..f70640870 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notfoundexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notfoundexception/JAXRSClientIT.java @@ -46,15 +46,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notsupportedexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notsupportedexception/JAXRSClientIT.java index a79ecfa60..08511f2cc 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notsupportedexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/notsupportedexception/JAXRSClientIT.java @@ -46,15 +46,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/processingexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/processingexception/JAXRSClientIT.java index 6ce941ea0..5dcbf34e6 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/processingexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/processingexception/JAXRSClientIT.java @@ -42,15 +42,6 @@ public JAXRSClientIT() { setContextRoot("/jaxrs_api_rs_processingexception_web"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorWithRuntimeExceptionTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/redirectexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/redirectexception/JAXRSClientIT.java index ee8e05ca3..1a76f6a14 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/redirectexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/redirectexception/JAXRSClientIT.java @@ -48,15 +48,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorStatusUriTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/runtimetype/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/runtimetype/JAXRSClientIT.java index 6174080f2..957aa94a2 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/runtimetype/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/runtimetype/JAXRSClientIT.java @@ -35,15 +35,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { final static String[] names = { "CLIENT", "SERVER" }; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: valueOfTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/servererrorexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/servererrorexception/JAXRSClientIT.java index 7b330f2e5..7687f5aca 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/servererrorexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/servererrorexception/JAXRSClientIT.java @@ -48,15 +48,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String HOST = "www.jcp.org"; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorStatusTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/serviceunavailableexception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/serviceunavailableexception/JAXRSClientIT.java index ef496a02a..3015a1b18 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/serviceunavailableexception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/serviceunavailableexception/JAXRSClientIT.java @@ -52,15 +52,6 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected Date date = Calendar.getInstance().getTime(); - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: constructorTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/webapplicationexceptiontest/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/webapplicationexceptiontest/JAXRSClientIT.java index 723dcbd12..9e82005ae 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/webapplicationexceptiontest/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/webapplicationexceptiontest/JAXRSClientIT.java @@ -47,15 +47,6 @@ public JAXRSClientIT() { setContextRoot("/jaxrs_api_rs_webapplicationexceptiontest_web"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @class.setup_props: webServerHost; webServerPort; ts_home; diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/common/JAXRSCommonClient.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/common/JAXRSCommonClient.java index d5c06b142..033de754a 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/common/JAXRSCommonClient.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/common/JAXRSCommonClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -18,6 +18,7 @@ import java.io.*; import java.net.InetAddress; +import java.net.URL; import java.net.UnknownHostException; import java.util.Enumeration; import java.util.Hashtable; @@ -35,6 +36,11 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpState; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.TestInfo; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -239,36 +245,39 @@ public String getContextRoot() { return _contextRoot; } + @BeforeEach + void logStartTest(TestInfo testInfo) { + TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + } + + @AfterEach + void logFinishTest(TestInfo testInfo) { + TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + } + + + @ArquillianResource + private URL url; + /** - * setup is by the test harness to initialize the tests. + * setup is run by the test files to initialize the tests. * - * @param args - * a String[] value - * @param p - * a Properties value - * @exception Fault - * if an error occurs */ - //public void setup(String[] args, Properties p) { - public void setup() { - TestUtil.logTrace("setup method JAXRSCommonClient"); + public void setup() { - String hostname = System.getProperty(SERVLETHOSTPROP); - String portnum = System.getProperty(SERVLETPORTPROP); - //String tshome = p.getProperty(TSHOME); + TestUtil.logTrace("setup method JAXRSCommonClient"); - assertTrue(!isNullOrEmpty(hostname), - "[JAXRSCommonClient] 'webServerHost' was not set."); + assertFalse((url==null), "[JAXRSCommonClient] 'url' was not injected."); + + String hostname = url.getHost(); + int portnum = url.getPort(); + + assertFalse(isNullOrEmpty(hostname), "[JAXRSCommonClient] 'webServerHost' was not set."); _hostname = hostname.trim(); - assertTrue(!isNullOrEmpty(portnum), - "[JAXRSCommonClient] 'webServerPort' was not set."); - _port = Integer.parseInt(portnum.trim()); - - //assertTrue(!isNullOrEmpty(tshome), - // "[JAXRSCommonClient] 'tshome' was not set in the build.properties."); - //_tsHome = tshome.trim(); - + assertFalse(isPortInvalid(portnum), "[JAXRSCommonClient] 'webServerPort' was not set."); + _port = portnum; TestUtil.logMsg("[JAXRSCommonClient] Test setup OK"); + } /** @@ -926,6 +935,11 @@ protected boolean isNullOrEmpty(String val) { return val == null || val.trim().equals(""); } + protected boolean isPortInvalid(int val) { + return val <= 0 || val > 65535 ; + } + + private InetAddress[] _addrs = null; protected String _servlet = null; diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/java2entity/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/java2entity/JAXRSClientIT.java index 5d90c040a..8174be17a 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/java2entity/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/java2entity/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -46,10 +46,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_resource_java2entity_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { @@ -65,15 +69,6 @@ public static WebArchive createDeployment() throws IOException { return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: directClassTypeTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/webappexception/mapper/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/webappexception/mapper/JAXRSClientIT.java index e4b14ee20..0b6a7a8de 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/webappexception/mapper/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/webappexception/mapper/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -44,10 +44,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_resource_webappexception_mapper_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { @@ -70,15 +74,6 @@ public static WebArchive createDeployment() throws IOException { return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: noResponseTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/webappexception/nomapper/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/webappexception/nomapper/JAXRSClientIT.java index f984281c6..fb4c97bb8 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/webappexception/nomapper/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/resource/webappexception/nomapper/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -44,10 +44,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_resource_webappexception_nomapper_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { @@ -63,15 +67,6 @@ public static WebArchive createDeployment() throws IOException { return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: emptyConstructorTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/BeanParamCommonClient.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/BeanParamCommonClient.java index a8016a662..55c2a2eb4 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/BeanParamCommonClient.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/BeanParamCommonClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -158,7 +158,7 @@ protected void checkCookie(String cookie) throws Fault { found = true; } assertTrue(found, "Could not find cookie" + cookie+ "in response headers:" + - JaxrsUtil.iterableToString(";", headers)); + JaxrsUtil.iterableToString(";", (Object)headers)); logMsg("Found cookie", cookie, "as expected"); } diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/cookie/plain/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/cookie/plain/JAXRSClientIT.java index 3c2231a15..7b59f0ffa 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/cookie/plain/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/cookie/plain/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -62,19 +62,14 @@ public class JAXRSClientIT extends BeanParamCommonClient { private static final long serialVersionUID = 201L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_beanparam_cookie_plain_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/form/plain/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/form/plain/JAXRSClientIT.java index 8a488e54f..7b14a83db 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/form/plain/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/form/plain/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -62,19 +62,14 @@ public class JAXRSClientIT extends BeanParamCommonClient { private static final long serialVersionUID = 201L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_beanparam_form_plain_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/header/plain/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/header/plain/JAXRSClientIT.java index 173ce1482..09c2704a1 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/header/plain/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/header/plain/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -62,19 +62,14 @@ public class JAXRSClientIT extends BeanParamCommonClient { private static final long serialVersionUID = 201L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_beanparam_header_plain_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/matrix/plain/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/matrix/plain/JAXRSClientIT.java index f2798523f..10ebe3952 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/matrix/plain/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/matrix/plain/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -63,19 +63,14 @@ public class JAXRSClientIT extends BeanParamCommonClient { private static final long serialVersionUID = 201L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_beanparam_matrix_plain_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/path/plain/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/path/plain/JAXRSClientIT.java index 540c55903..9d97da25f 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/path/plain/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/path/plain/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -61,19 +61,14 @@ public class JAXRSClientIT extends BeanParamCommonClient { private static final long serialVersionUID = 201L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_beanparam_path_plain_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/plain/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/plain/JAXRSClientIT.java index 0c26e721e..719ac97ca 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/plain/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/plain/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -81,19 +81,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final String TWELVENTH = "Twelveth"; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_beanparam_plain_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/query/plain/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/query/plain/JAXRSClientIT.java index cb7aea107..c4bc84fae 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/query/plain/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/beanparam/query/plain/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -63,19 +63,14 @@ public class JAXRSClientIT extends BeanParamCommonClient { private static final long serialVersionUID = 201L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_beanparam_query_plain_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/asyncinvoker/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/asyncinvoker/JAXRSClientIT.java index 341c1daf5..2b190c518 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/asyncinvoker/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/asyncinvoker/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -71,10 +71,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private final static String NONEXISTING_SITE = "somenonexisting.domain-site"; public JAXRSClientIT() { - setup(); setContextRoot("jaxrs_ee_rs_client_asyncinvoker_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + static final String[] METHODS = { "DELETE", "GET", "OPTIONS" }; static final String[] ENTITY_METHODS = { "PUT", "POST" }; @@ -95,15 +99,6 @@ public static WebArchive createDeployment() throws IOException{ } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ // -------------------------------------------------------------------- diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/clientrequestcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/clientrequestcontext/JAXRSClientIT.java index 923dcd498..68e6b5c3c 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/clientrequestcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/clientrequestcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -55,19 +55,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = -3234850442044177095L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_client_clientrequestcontext_web/resource"); } - + @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/invocationbuilder/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/invocationbuilder/JAXRSClientIT.java index 8f1f5d2d9..0134903ad 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/invocationbuilder/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/invocationbuilder/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -61,19 +61,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = -8097693127928445210L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_client_invocationbuilder_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/syncinvoker/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/syncinvoker/JAXRSClientIT.java index 96047e776..799f374e5 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/syncinvoker/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/client/syncinvoker/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -62,19 +62,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { protected long millis; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_client_syncinvoker_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/constrainedto/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/constrainedto/JAXRSClientIT.java index a302a6c3e..7888033ed 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/constrainedto/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/constrainedto/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -60,19 +60,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 3343257931794865470L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_constrainedto_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/JAXRSClientIT.java index dc3d48a9d..2ce7acab5 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -56,20 +56,15 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 111355567568365703L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_container_requestcontext_web/resource"); setPrintEntity(true); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/illegalstate/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/illegalstate/JAXRSClientIT.java index 3170084fa..d9e4fc64c 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/illegalstate/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/illegalstate/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -49,20 +49,15 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = -8112756483664393579L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_container_requestcontext_illegalstate_web/resource"); setPrintEntity(true); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/security/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/security/JAXRSClientIT.java index 14a637430..80ddb9815 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/security/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/requestcontext/security/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -56,20 +56,25 @@ public class JAXRSClientIT extends JaxrsCommonClient { protected String password; public JAXRSClientIT() { - usersetup(); setContextRoot("/jaxrs_ee_rs_container_requestcontext_security_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); + usersetup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void usersetup() { + user = System.getProperty("user"); + password = System.getProperty("password"); + assertTrue(!isNullOrEmpty(user), "user not set"); + assertTrue(!isNullOrEmpty(password), + "password not set"); } + + @Deployment(testable = true) public static WebArchive createDeployment() throws IOException { @@ -91,15 +96,6 @@ public static WebArchive createDeployment() throws IOException { return archive; } - public void usersetup() { - user = System.getProperty("user"); - password = System.getProperty("password"); - assertTrue(!isNullOrEmpty(user), "user not set"); - assertTrue(!isNullOrEmpty(password), - "password not set"); - super.setup(); - } - /* * @testName: getSecurityContextTest * diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/resourceinfo/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/resourceinfo/JAXRSClientIT.java index eb393c867..5224f07e3 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/resourceinfo/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/resourceinfo/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -47,20 +47,15 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = -2900337741491627385L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_container_resourceinfo_web/resource"); setPrintEntity(true); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java index c40db3fbc..55a4b2d9f 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -66,20 +66,15 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 7090474648496503290L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_container_responsecontext_web/resource"); setPrintEntity(true); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/ResponseFilter.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/ResponseFilter.java index 7c7c3c929..6df661237 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/ResponseFilter.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/ResponseFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/JAXRSClientIT.java index 704311c44..a4d83e324 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -43,7 +43,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.TestInfo; @@ -60,21 +59,16 @@ public class JAXRSClientIT extends JaxrsParamClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_cookieparam_web/CookieParamTest"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } - @Deployment(testable = false, name = "cookieparam") + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/ws/rs/ee/rs/cookieparam/web.xml.template"); @@ -403,7 +397,7 @@ private void checkCookie(String cookie) throws Fault { found = true; } assertTrue(found, "Could not find cookie"+ cookie+ "in response headers:"+ - JaxrsUtil.iterableToString(";", headers)); + JaxrsUtil.iterableToString(";", (Object) headers)); logMsg("Found cookie", cookie, "as expected"); } diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/locator/JAXRSLocatorClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/locator/JAXRSLocatorClientIT.java index 96e87d83a..13af74980 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/locator/JAXRSLocatorClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/locator/JAXRSLocatorClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.cookieparam.locator; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.JaxrsParamClient; @@ -34,11 +35,14 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -59,21 +63,16 @@ public class JAXRSLocatorClientIT private static final long serialVersionUID = 1L; public JAXRSLocatorClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_cookieparam_locator_web/resource/locator"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } - @Deployment(testable = false, name = "cookieparamlocator") + @Deployment(testable = false, name="jaxrs_ee_rs_cookieparam_locator_web") public static WebArchive createDeployment() throws IOException{ InputStream inStream = JAXRSLocatorClientIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/ws/rs/ee/rs/cookieparam/locator/web.xml.template"); diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/sub/JAXRSSubClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/sub/JAXRSSubClientIT.java index f8305b2d1..4c90d42fd 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/sub/JAXRSSubClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/cookieparam/sub/JAXRSSubClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.cookieparam.sub; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.JaxrsParamClient; @@ -33,11 +34,14 @@ import ee.jakarta.tck.ws.rs.ee.rs.cookieparam.JAXRSClientIT; import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -58,21 +62,15 @@ public class JAXRSSubClientIT private static final long serialVersionUID = 1L; public JAXRSSubClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_cookieparam_sub_web/Resource/subresource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } - - @Deployment(testable = false, name = "cookieparamsub") + @Deployment(testable = false, name = "jaxrs_ee_rs_cookieparam_sub_web") public static WebArchive createDeployment() throws IOException{ InputStream inStream = JAXRSSubClientIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/ws/rs/ee/rs/cookieparam/sub/web.xml.template"); diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/application/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/application/JAXRSClientIT.java index e5d033845..0792bde89 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/application/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/application/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -50,25 +50,20 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_core_application_web/ApplicationTest"); } + @BeforeEach + public void setup() { + super.setup(); + } + private static final long serialVersionUID = 1L; protected int expectedSingletons = 1; protected int expectedClasses = 1; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/configurable/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/configurable/JAXRSClientIT.java index 75a92defe..bf0afcb2a 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/configurable/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/configurable/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -73,20 +73,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private int registeredInstancesCnt = -1; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_core_configurable_web/resource"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/configuration/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/configuration/JAXRSClientIT.java index dd2ef32bf..819e620d0 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/configuration/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/configuration/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -80,20 +80,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 7215781408688132392L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_core_configuration_web/resource/echo"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/headers/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/headers/JAXRSClientIT.java index bf016ef94..dbc4a6d42 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/headers/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/headers/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -56,20 +56,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = -5727774504018187299L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_core_headers_web/HeadersTest"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/request/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/request/JAXRSClientIT.java index bdda2fe49..f940fdca5 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/request/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/request/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -52,10 +52,13 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final String IF_NONE_MATCH = "If-None-Match: \"AAA\""; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_core_request_web/RequestTest"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -72,15 +75,6 @@ public static WebArchive createDeployment() throws IOException{ } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/response/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/response/JAXRSClientIT.java index 771dce649..4039a1832 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/response/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/response/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -85,21 +85,15 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 4182256439207983256L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_core_response_web/resource"); setPrintEntity(true); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/responsebuilder/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/responsebuilder/JAXRSClientIT.java index d35dfabf0..688b2b22b 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/responsebuilder/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/responsebuilder/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -54,20 +54,15 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_core_responsebuilder_web/resource"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/securitycontext/basic/JAXRSBasicClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/securitycontext/basic/JAXRSBasicClientIT.java index 5efacca34..deec93144 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/securitycontext/basic/JAXRSBasicClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/securitycontext/basic/JAXRSBasicClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -56,19 +56,14 @@ public class JAXRSBasicClientIT private static final long serialVersionUID = 340277879725875946L; public JAXRSBasicClientIT() { - setup(); setContextRoot("/jaxrs_ee_core_securitycontext_basic_web/Servlet"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = true) public static WebArchive createDeployment() throws IOException { diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java index 52a001c55..9aaaf05cf 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -50,20 +50,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { protected static final String RESOURCE = "resource"; public JAXRSClientIT() { - setup(); setContextRoot("/" + ROOT + "/" + RESOURCE); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/delete/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/delete/JAXRSClientIT.java index 4560c49a1..b4ee5c109 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/delete/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/delete/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -46,19 +46,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 204493956987397506L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_delete_web"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/clientwriter/interceptorcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/clientwriter/interceptorcontext/JAXRSClientIT.java index 9e608b34c..1e669fb60 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/clientwriter/interceptorcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/clientwriter/interceptorcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -59,21 +59,16 @@ public class JAXRSClientIT extends WriterClient { private static final long serialVersionUID = -5479399808367387477L; public JAXRSClientIT() { - setup(); setContextRoot( "/jaxrs_ee_rs_ext_interceptor_clientwriter_interceptorcontext_web/resource"); addProviders(); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/clientwriter/writerinterceptorcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/clientwriter/writerinterceptorcontext/JAXRSClientIT.java index 7f784d89f..4ed1b20fa 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/clientwriter/writerinterceptorcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/clientwriter/writerinterceptorcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -54,21 +54,16 @@ public class JAXRSClientIT extends WriterClient { private static final long serialVersionUID = 2500912584762173255L; public JAXRSClientIT() { - setup(); setContextRoot( "/jaxrs_ee_rs_ext_interceptor_clientwriter_writerinterceptorcontext_web/resource"); addProviders(); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerreader/interceptorcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerreader/interceptorcontext/JAXRSClientIT.java index d9dc19230..a82c86a0a 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerreader/interceptorcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerreader/interceptorcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -65,20 +65,15 @@ public class JAXRSClientIT extends ReaderClient { private static final long serialVersionUID = 6573164759617152350L; public JAXRSClientIT() { - setup(); setContextRoot( "/jaxrs_ee_rs_ext_interceptor_containerreader_interceptorcontext_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerreader/readerinterceptorcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerreader/readerinterceptorcontext/JAXRSClientIT.java index 9751f813b..a8660be52 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerreader/readerinterceptorcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerreader/readerinterceptorcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -61,20 +61,15 @@ public class JAXRSClientIT extends ee.jakarta.tck.ws.rs.ee.rs.ext.interceptor.co private static final long serialVersionUID = 3006391868445878375L; public JAXRSClientIT() { - setup(); setContextRoot( "/jaxrs_ee_rs_ext_interceptor_containerreader_readerinterceptorcontext_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerwriter/interceptorcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerwriter/interceptorcontext/JAXRSClientIT.java index 9af3e5444..21a1b6a9c 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerwriter/interceptorcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerwriter/interceptorcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -55,20 +55,15 @@ public class JAXRSClientIT extends WriterClient { private static final long serialVersionUID = -3980167967224950515L; public JAXRSClientIT() { - setup(); setContextRoot( "/jaxrs_ee_rs_ext_interceptor_containerwriter_interceptorcontext_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerwriter/writerinterceptorcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerwriter/writerinterceptorcontext/JAXRSClientIT.java index 11c67067c..c39783efc 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerwriter/writerinterceptorcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/interceptor/containerwriter/writerinterceptorcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -53,20 +53,15 @@ public class JAXRSClientIT extends WriterClient { private static final long serialVersionUID = -8158424518609416304L; public JAXRSClientIT() { - setup(); setContextRoot( "/jaxrs_ee_rs_ext_interceptor_containerwriter_writerinterceptorcontext_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/paramconverter/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/paramconverter/JAXRSClientIT.java index 47fff8da7..41d4e92f8 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/paramconverter/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/paramconverter/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -51,19 +51,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 863071027768369551L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_ext_paramconverter_web"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/providers/JAXRSProvidersClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/providers/JAXRSProvidersClientIT.java index 868740ac8..cd65b1efb 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/providers/JAXRSProvidersClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/ext/providers/JAXRSProvidersClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -68,7 +68,6 @@ public class JAXRSProvidersClientIT protected int expectedClasses = 1; public JAXRSProvidersClientIT() { - setup(); TSAppConfig cfg = new TSAppConfig(); setContextRoot("/jaxrs_ee_ext_providers_web/ProvidersServlet"); expectedClasses = cfg.getClasses().size(); @@ -76,14 +75,10 @@ public JAXRSProvidersClientIT() { } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/JAXRSClientIT.java index 2951e369c..5de2edb6b 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -58,21 +58,16 @@ public class JAXRSClientIT extends JaxrsParamClient { private static final String DECODED = "_`'$X Y@\"a a\""; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_formparam_web/FormParamTest"); } - private static final long serialVersionUID = 1L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } + private static final long serialVersionUID = 1L; + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/locator/JAXRSLocatorClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/locator/JAXRSLocatorClientIT.java index 1d6fe019c..519d44091 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/locator/JAXRSLocatorClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/locator/JAXRSLocatorClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -29,15 +29,19 @@ import ee.jakarta.tck.ws.rs.ee.rs.formparam.JAXRSClientIT; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -56,21 +60,16 @@ public class JAXRSLocatorClientIT extends JAXRSClientIT { public JAXRSLocatorClientIT() { - setup(); setContextRoot("/jaxrs_ee_formparam_locator_web/resource/locator"); } - private static final long serialVersionUID = 1L; - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } + private static final long serialVersionUID = 1L; + @Deployment(testable = false, name = "jaxrs_ee_formparam_locator_deployment") public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/sub/JAXRSSubClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/sub/JAXRSSubClientIT.java index c5352a431..90b0cfc5c 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/sub/JAXRSSubClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/formparam/sub/JAXRSSubClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -27,15 +27,19 @@ import ee.jakarta.tck.ws.rs.ee.rs.formparam.FormParamTest; import ee.jakarta.tck.ws.rs.ee.rs.formparam.JAXRSClientIT; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -52,21 +56,16 @@ public class JAXRSSubClientIT extends JAXRSClientIT { public JAXRSSubClientIT() { - setup(); setContextRoot("/jaxrs_ee_formparam_sub_web/resource/sub"); } - private static final long serialVersionUID = 1L; @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } + private static final long serialVersionUID = 1L; @Deployment(testable = false, name = "jaxrs_ee_formparam_sub_deployment") public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/get/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/get/JAXRSClientIT.java index 07459fa1f..2f7712ba6 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/get/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/get/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -48,19 +48,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_get_web/GetTest"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/head/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/head/JAXRSClientIT.java index acb8c9cc3..54c2e541e 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/head/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/head/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -47,19 +47,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_head_web/HeadTest"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/JAXRSClientIT.java index 2b79013b9..fbe09508a 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -58,19 +58,14 @@ public class JAXRSClientIT extends JaxrsParamClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_headerparam_web/HeaderParamTest"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/locator/JAXRSLocatorClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/locator/JAXRSLocatorClientIT.java index 47eeabcb9..aa900f94d 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/locator/JAXRSLocatorClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/locator/JAXRSLocatorClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.headerparam.locator; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.JaxrsParamClient; @@ -34,11 +35,14 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -57,18 +61,12 @@ public class JAXRSLocatorClientIT private static final long serialVersionUID = 1L; public JAXRSLocatorClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_headerparam_locator_web/resource/locator"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } @Deployment(testable = false, name = "jaxrs_ee_rs_headerparam_locator_deployment") diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/sub/JAXRSSubClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/sub/JAXRSSubClientIT.java index fca073623..e389c727c 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/sub/JAXRSSubClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/headerparam/sub/JAXRSSubClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -20,6 +20,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.headerparam.sub; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.JaxrsParamClient; @@ -37,11 +38,14 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -62,19 +66,15 @@ public class JAXRSSubClientIT private static final long serialVersionUID = -7534318281215084279L; public JAXRSSubClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_headerparam_sub_web/resource/subresource"); } + @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false, name = "jaxrs_ee_rs_headerparam_sub_deployment") public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/JAXRSClientIT.java index 0c7dc652f..7a11371ae 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -61,21 +61,16 @@ public class JAXRSClientIT extends JaxrsParamClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_matrixparam_web/MatrixParamTest"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } - @Deployment(testable = false, name = "jaxrs_ee_rs_matrixparam_deployment") + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/ws/rs/ee/rs/matrixparam/web.xml.template"); diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/locator/JAXRSLocatorClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/locator/JAXRSLocatorClientIT.java index 529cacc70..d7c4aaf66 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/locator/JAXRSLocatorClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/locator/JAXRSLocatorClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.matrixparam.locator; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.JaxrsParamClient; @@ -34,11 +35,14 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -59,18 +63,13 @@ public class JAXRSLocatorClientIT private static final long serialVersionUID = 1L; public JAXRSLocatorClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_matrixparam_locator_web/resource/locator"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + @BeforeEach + public void setup() { + super.setup(); } @Deployment(testable = false, name = "jaxrs_ee_rs_matrixparam_locator_deployment") diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/sub/JAXRSSubClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/sub/JAXRSSubClientIT.java index 2050d3706..f214b5498 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/sub/JAXRSSubClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/matrixparam/sub/JAXRSSubClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.matrixparam.sub; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.JaxrsParamClient; @@ -34,11 +35,14 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -59,21 +63,16 @@ public class JAXRSSubClientIT private static final long serialVersionUID = 1L; public JAXRSSubClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_matrixparam_sub_web/resource/subresource"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + @BeforeEach + public void setup() { + super.setup(); } - @Deployment(testable = false) + @Deployment(testable = false, name="jaxrs_ee_rs_matrixparam_sub_web") public static WebArchive createDeployment() throws IOException{ InputStream inStream = JAXRSSubClientIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/ws/rs/ee/rs/matrixparam/sub/web.xml.template"); diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/options/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/options/JAXRSClientIT.java index d56d9456f..8c05c4980 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/options/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/options/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -48,19 +48,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_options_web/Options"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/JAXRSClientIT.java index 473417d27..ecfe44dfe 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -59,20 +59,15 @@ public class JAXRSClientIT extends JaxrsParamClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_pathparam_web/PathParamTest"); useDefaultValue = false; } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/locator/JAXRSLocatorClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/locator/JAXRSLocatorClientIT.java index d39fca7a8..4c4d079d4 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/locator/JAXRSLocatorClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/locator/JAXRSLocatorClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.pathparam.locator; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.ParamEntityPrototype; @@ -33,11 +34,14 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -58,22 +62,17 @@ public class JAXRSLocatorClientIT private static final long serialVersionUID = 1L; public JAXRSLocatorClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_pathparam_locator_web/resource/locator"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + @BeforeEach + public void setup() { + super.setup(); } @Deployment(testable = false, name = "jaxrs_ee_rs_pathparam_locator_deployment") - public static WebArchive createDeployment() throws IOException{ + public static WebArchive createDeployment() throws IOException { InputStream inStream = JAXRSLocatorClientIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/ws/rs/ee/rs/pathparam/locator/web.xml.template"); String webXml = editWebXmlString(inStream); diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/sub/JAXRSSubClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/sub/JAXRSSubClientIT.java index ca5b91ec3..9dc67d060 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/sub/JAXRSSubClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/pathparam/sub/JAXRSSubClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.pathparam.sub; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.ParamEntityPrototype; @@ -33,11 +34,14 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -58,18 +62,13 @@ public class JAXRSSubClientIT private static final long serialVersionUID = 1L; public JAXRSSubClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_pathparam_sub_web/resource/subresource"); } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + @BeforeEach + public void setup() { + super.setup(); } @Deployment(testable = false, name = "jaxrs_ee_rs_pathparam_sub_deployment") diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/produceconsume/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/produceconsume/JAXRSClientIT.java index 3007d4844..6b1b49503 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/produceconsume/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/produceconsume/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -50,19 +50,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 3927081991341346347L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_produceconsume_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/put/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/put/JAXRSClientIT.java index 011b2efb4..9b71614e5 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/put/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/put/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -42,19 +42,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = -71817508809693264L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_put_web"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/queryparam/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/queryparam/JAXRSClientIT.java index 6d70920d0..e566f0a0b 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/queryparam/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/queryparam/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -61,19 +61,14 @@ public class JAXRSClientIT extends JaxrsParamClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_queryparam_web/QueryParamTest"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/queryparam/sub/JAXRSSubClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/queryparam/sub/JAXRSSubClientIT.java index 8dad73f00..acbd27046 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/queryparam/sub/JAXRSSubClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/queryparam/sub/JAXRSSubClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -20,6 +20,7 @@ package ee.jakarta.tck.ws.rs.ee.rs.queryparam.sub; import java.io.InputStream; +import java.net.URL; import java.io.IOException; import ee.jakarta.tck.ws.rs.ee.rs.JaxrsParamClient; @@ -37,11 +38,14 @@ import ee.jakarta.tck.ws.rs.lib.util.TestUtil; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -61,20 +65,15 @@ public class JAXRSSubClientIT private static final long serialVersionUID = 1L; public JAXRSSubClientIT() { - setup(); setContextRoot("/jaxrs_ee_rs_queryparam_sub_web/resource/subresource"); } + @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } - + @Deployment(testable = false, name = "jaxrs_ee_rs_queryparam_sub_deployment") public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/api/client/invocationbuilder/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/api/client/invocationbuilder/JAXRSClientIT.java index 8874ec713..b672efc5c 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/api/client/invocationbuilder/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/api/client/invocationbuilder/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -50,19 +50,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 21L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs21_api_client_invocationbuilder_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java index b01f6bcef..34f809634 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.jaxrs21.ee.client.executor.async; import java.io.IOException; +import java.net.URL; import ee.jakarta.tck.ws.rs.common.impl.TRACE; import ee.jakarta.tck.ws.rs.ee.rs.client.asyncinvoker.Resource; @@ -30,10 +31,13 @@ import jakarta.ws.rs.client.WebTarget; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -55,18 +59,13 @@ public class JAXRSClientIT private static final long serialVersionUID = 21L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs21_ee_client_executor_async_web/resource"); } + @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } @Deployment(testable = false, name = "jaxrs21_ee_client_executor_async_deployment") diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/rx/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/rx/JAXRSClientIT.java index 96f709169..cf7865055 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/rx/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/rx/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.jaxrs21.ee.client.executor.rx; import java.io.IOException; +import java.net.URL; import ee.jakarta.tck.ws.rs.common.impl.TRACE; import ee.jakarta.tck.ws.rs.jaxrs21.ee.client.rxinvoker.Resource; @@ -30,10 +31,13 @@ import jakarta.ws.rs.client.WebTarget; import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; @@ -58,18 +62,13 @@ public class JAXRSClientIT private static final long serialVersionUID = 21L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs21_ee_client_executor_rx_web/resource"); } + @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } @Deployment(testable = false, name = "jaxrs21_ee_client_executor_rx_deployment") diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java index f0483e5f5..1a4cf02e6 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -76,19 +76,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private final static String NONEXISTING_SITE = "somenonexisting.domain-site"; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs21_ee_client_rxinvoker_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/patch/server/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/patch/server/JAXRSClientIT.java index 4ac242b94..9851d42ce 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/patch/server/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/patch/server/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -53,19 +53,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 21L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs21_ee_patch_server_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/priority/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/priority/JAXRSClientIT.java index 0f57caf0d..e4a6af6cc 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/priority/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/priority/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,19 +45,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 21L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs21_ee_priority_web"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java index 677e89514..802794568 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -70,10 +70,9 @@ public class JAXRSClientIT extends SSEJAXRSClient { public JAXRSClientIT() { setContextRoot("/jaxrs_jaxrs21_ee_sse_ssebroadcaster_web"); - setup(); } - @Override + @BeforeEach public void setup() { super.setup(); target = ClientBuilder.newClient() @@ -82,15 +81,6 @@ public void setup() { } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsink/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsink/JAXRSClientIT.java index 56022d091..e6b60df44 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsink/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsink/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -74,19 +74,14 @@ public class JAXRSClientIT extends SSEJAXRSClient { protected int sleep = -1; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs21_ee_sse_sseeventsink_web"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsource/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsource/JAXRSClientIT.java index 3a665372a..b5713c5e4 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsource/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsource/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -85,20 +85,15 @@ public class JAXRSClientIT extends SSEJAXRSClient { private int mediaTestLevel = 0; public JAXRSClientIT() { - setup(); mediaTestLevel = 0; setContextRoot("/jaxrs_jaxrs21_ee_sse_sseeventsource_web"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/spec/classsubresourcelocator/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/spec/classsubresourcelocator/JAXRSClientIT.java index fa0b919f6..8e17853b4 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/spec/classsubresourcelocator/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/spec/classsubresourcelocator/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -49,19 +49,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 21L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs21_spec_classsubresourcelocator_web/resource"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/spec/completionstage/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/spec/completionstage/JAXRSClientIT.java index 7910a39a5..adf774b60 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/spec/completionstage/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/spec/completionstage/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -51,19 +51,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 21L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs21_spec_completionstage_web"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs31/spec/extensions/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs31/spec/extensions/JAXRSClientIT.java index d7abd7cd8..30d7d6676 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs31/spec/extensions/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs31/spec/extensions/JAXRSClientIT.java @@ -47,19 +47,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 31L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_jaxrs31_spec_jdkservices_web"); } @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); + public void setup() { + super.setup(); } - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } @Deployment(testable = false) diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/applicationpath/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/applicationpath/JAXRSClientIT.java index 1211d8531..a59de10a4 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/applicationpath/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/applicationpath/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { private static final long serialVersionUID = 1L; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_ee_applicationpath"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_ee_applicationpath.war"); @@ -57,15 +61,6 @@ public static WebArchive createDeployment() throws IOException { return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: applicationPathAnnotationEncodedTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/core/streamingoutput/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/core/streamingoutput/JAXRSClientIT.java index 1814a1a98..b62e65212 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/core/streamingoutput/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/core/streamingoutput/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -46,10 +46,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public static final String _root = "/jaxrs_ee_core_streamoutput/StreamOutputTest"; public JAXRSClientIT() { - setup(); setContextRoot(_root); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { @@ -65,15 +69,6 @@ public static WebArchive createDeployment() throws IOException { return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: writeTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/ext/paramconverter/autodiscovery/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/ext/paramconverter/autodiscovery/JAXRSClientIT.java index 0745447e2..2e356f144 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/ext/paramconverter/autodiscovery/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/servlet3/rs/ext/paramconverter/autodiscovery/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -51,11 +51,15 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = 8764917394183731977L; public JAXRSClientIT() { - setup(); setContextRoot( "/jaxrs_servlet3_rs_ext_paramconverter_autodiscovery/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException { @@ -78,15 +82,6 @@ public static WebArchive createDeployment() throws IOException { return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @testName: isParamCoverterFoundByAutodiscoveryUsedTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/instance/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/instance/JAXRSClientIT.java index 6c10069e1..dc0d70123 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/instance/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/instance/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -49,19 +49,9 @@ public class JAXRSClientIT extends JAXRSCommonClient { - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } public JAXRSClientIT() { - setup(); Client client = ClientBuilder.newClient(); Configuration config = client.getConfiguration(); registeredPropertyCnt = config.getProperties().size(); @@ -71,7 +61,6 @@ public JAXRSClientIT() { } - /* Run test */ /* * @testName: defaultClientConfigurationPresetTest diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/invocations/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/invocations/JAXRSClientIT.java index eb38a1b58..45e7462cf 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/invocations/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/invocations/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -51,10 +51,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_client_invocations_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -66,15 +70,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/resource/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/resource/JAXRSClientIT.java index 0c7956f3a..fd4054d42 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/resource/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/resource/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -41,10 +41,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_client_resource_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -56,15 +60,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/typedentities/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/typedentities/JAXRSClientIT.java index f0c499612..13e392a85 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/typedentities/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/typedentities/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -66,10 +66,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final String entity = Resource.class.getName(); public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_client_typedentities_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -81,15 +85,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/typedentitieswithxmlbinding/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/typedentitieswithxmlbinding/JAXRSClientIT.java index b876fd55c..f02076bab 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/typedentitieswithxmlbinding/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/typedentitieswithxmlbinding/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -50,10 +50,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final String entity = Resource.class.getName(); public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_client_typedentitieswithxmlbinding_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -65,15 +68,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/webtarget/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/webtarget/JAXRSClientIT.java index ff0348041..ce1557629 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/webtarget/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/client/webtarget/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -44,20 +44,9 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_client_webtarget_web/resource"); } - - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/context/client/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/context/client/JAXRSClientIT.java index e43cc1f9b..5248db3f4 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/context/client/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/context/client/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_context_client_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/context/server/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/context/server/JAXRSClientIT.java index 6ea53f293..a82939734 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/context/server/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/context/server/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -43,10 +43,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_context_server_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -58,15 +62,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/dynamicfeature/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/dynamicfeature/JAXRSClientIT.java index fa58ed97c..60618da20 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/dynamicfeature/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/dynamicfeature/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_filter_dynamicfeature_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/exception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/exception/JAXRSClientIT.java index 779703d50..e97096b22 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/exception/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/exception/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -46,10 +46,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_filter_exception_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -61,15 +64,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/globalbinding/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/globalbinding/JAXRSClientIT.java index 23d7214ef..34f4bdcf0 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/globalbinding/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/globalbinding/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_filter_globalbinding_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/interceptor/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/interceptor/JAXRSClientIT.java index a258a9c8c..fffb807f3 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/interceptor/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/interceptor/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -82,10 +82,13 @@ private static String getJaxbToken() { } public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_filter_interceptor_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -104,15 +107,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/lastvalue/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/lastvalue/JAXRSClientIT.java index 4f74abbde..317a1f88d 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/lastvalue/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/lastvalue/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -52,10 +52,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { public static final String plaincontent = JAXRSClientIT.class.getName(); public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_filter_lastvalue_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -67,15 +70,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/namebinding/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/namebinding/JAXRSClientIT.java index a0612bc0c..31a31733e 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/namebinding/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/filter/namebinding/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_filter_namebinding_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/inheritance/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/inheritance/JAXRSClientIT.java index 4f6074470..2f69945c7 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/inheritance/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/inheritance/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -40,11 +40,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_inheritance_web"); } - + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/ws/rs/spec/inheritance/web.xml.template"); @@ -55,15 +58,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/exceptionmapper/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/exceptionmapper/JAXRSClientIT.java index 95bf55079..309e38375 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/exceptionmapper/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/exceptionmapper/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,13 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_exceptionmapper_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/jaxbcontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/jaxbcontext/JAXRSClientIT.java index 8f1d04f8a..ce93981a7 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/jaxbcontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/jaxbcontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -46,10 +46,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_jaxbcontext_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + private void setPropertyAndInvoke(String resourceMethod) throws Fault { setProperty(Property.REQUEST, buildRequest(Request.POST, resourceMethod)); setProperty(Property.REQUEST_HEADERS, @@ -71,15 +75,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/overridestandard/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/overridestandard/JAXRSClientIT.java index 1dbd47b25..66a227b1e 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/overridestandard/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/overridestandard/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -48,10 +48,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_overridestandard_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + private void setPropertyAndInvoke(String resourceMethod, MediaType md) throws Fault { String ct = buildContentType(md); @@ -103,15 +107,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/reader/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/reader/JAXRSClientIT.java index b0888ea77..f50d476cb 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/reader/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/reader/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -46,10 +46,13 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_reader_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -61,15 +64,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/sort/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/sort/JAXRSClientIT.java index db4310c45..f8b08d335 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/sort/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/sort/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -47,10 +47,13 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_sort_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -62,15 +65,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standard/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standard/JAXRSClientIT.java index df778ab79..ded851c47 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standard/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standard/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -51,10 +51,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_standard_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + private void setPropertyAndInvoke(String resourceMethod, MediaType md) throws Fault { String ct = buildContentType(md); @@ -140,15 +144,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } String[] methodsAll = { "bytearray", "string", "inputstream", "file", diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardhaspriority/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardhaspriority/JAXRSClientIT.java index 66a521423..3ee0315df 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardhaspriority/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardhaspriority/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -49,10 +49,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_standardhaspriority_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + private void setPropertyAndInvoke(String resourceMethod, MediaType md) throws Fault { String ct = buildContentType(md); @@ -78,15 +82,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardnotnull/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardnotnull/JAXRSClientIT.java index 767652c49..eaa709edc 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardnotnull/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardnotnull/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -62,10 +62,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_standardnotnull_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -77,15 +80,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardwithjaxrsclient/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardwithjaxrsclient/JAXRSClientIT.java index beecbaf2c..38f227604 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardwithjaxrsclient/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardwithjaxrsclient/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -47,10 +47,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_standardwithjaxrsclient_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + private void setPropertyAndInvoke(String resourceMethod, MediaType md) throws Fault { String ct = buildContentType(md); @@ -81,15 +85,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardwithxmlbinding/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardwithxmlbinding/JAXRSClientIT.java index bf372eed4..23998ba4f 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardwithxmlbinding/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/standardwithxmlbinding/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_standardwithxmlbinding_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + private void setPropertyAndInvoke(String resourceMethod, MediaType md) throws Fault { String ct = buildContentType(md); @@ -93,15 +97,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/visibility/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/visibility/JAXRSClientIT.java index 72ed4fca2..e5052c3ef 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/visibility/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/visibility/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -44,10 +44,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_visibility_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -59,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/writer/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/writer/JAXRSClientIT.java index 052e85df3..efa7d1b42 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/writer/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/provider/writer/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_provider_writer_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +64,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/annotationprecedence/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/annotationprecedence/JAXRSClientIT.java index 8144e1318..62b73a70b 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/annotationprecedence/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/annotationprecedence/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -44,10 +44,13 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_resource_annotationprecedence_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -59,15 +62,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/annotationprecedence/subclass/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/annotationprecedence/subclass/JAXRSClientIT.java index 6b982e435..0afc917c0 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/annotationprecedence/subclass/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/annotationprecedence/subclass/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -46,11 +46,15 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot( "/jaxrs_spec_resource_annotationprecedence_subclass_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -62,15 +66,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/locator/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/locator/JAXRSClientIT.java index 2177dda62..5b74a76a1 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/locator/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/locator/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -41,10 +41,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_resource_locator_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -56,15 +60,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/requestmatching/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/requestmatching/JAXRSClientIT.java index 83f37deb0..613bbffd3 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/requestmatching/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/requestmatching/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,13 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_resource_requestmatching_web"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/responsemediatype/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/responsemediatype/JAXRSClientIT.java index a6048033d..a3a80bc65 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/responsemediatype/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/responsemediatype/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,13 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_resource_responsemediatype_web"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/valueofandfromstring/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/valueofandfromstring/JAXRSClientIT.java index 9ea80e9e6..9da13c503 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/valueofandfromstring/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resource/valueofandfromstring/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final String DATA = "ASDFGHJKLQWERTYUIOPPPPPPP"; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_resource_valueofandfromstring_web"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -60,15 +63,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resourceconstructor/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resourceconstructor/JAXRSClientIT.java index 58abbc9f7..315b0b001 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resourceconstructor/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/resourceconstructor/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -45,10 +45,14 @@ public class JAXRSClientIT extends JaxrsCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_resourceconstructor_web/resource"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -63,15 +67,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/returntype/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/returntype/JAXRSClientIT.java index 90ac63c06..799ac60a2 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/returntype/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/returntype/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -51,10 +51,13 @@ public class JAXRSClientIT extends JaxrsCommonClient { private static final long serialVersionUID = ReturnTypeTest.serialVersionUID; public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_returntype_web/ReturnTypeTest"); } + @BeforeEach + public void setup() { + super.setup(); + } @Deployment(testable = false) @@ -67,15 +70,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* Run test */ diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/template/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/template/JAXRSClientIT.java index cd4ee4867..7b9c0746d 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/template/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/spec/template/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -38,10 +38,14 @@ public class JAXRSClientIT extends JAXRSCommonClient { public JAXRSClientIT() { - setup(); setContextRoot("/jaxrs_spec_templateTest_web"); } + @BeforeEach + public void setup() { + super.setup(); + } + @Deployment(testable = false) public static WebArchive createDeployment() throws IOException{ @@ -53,15 +57,6 @@ public static WebArchive createDeployment() throws IOException{ return archive; } - @BeforeEach - void logStartTest(TestInfo testInfo) { - TestUtil.logMsg("STARTING TEST : "+testInfo.getDisplayName()); - } - - @AfterEach - void logFinishTest(TestInfo testInfo) { - TestUtil.logMsg("FINISHED TEST : "+testInfo.getDisplayName()); - } /* * @class.setup_props: webServerHost; webServerPort; ts_home; diff --git a/jersey-tck/pom.xml b/jersey-tck/pom.xml index ef76456cb..d809f8859 100644 --- a/jersey-tck/pom.xml +++ b/jersey-tck/pom.xml @@ -1,7 +1,7 @@ @@ -101,7 +109,7 @@ jakarta.ws.rs jakarta.ws.rs-api - ${project.parent.version} + ${project.version} test @@ -149,10 +157,17 @@ ${jersey.version} test + - org.netbeans.tools + org.glassfish.jersey.media + jersey-media-multipart + 4.0-M1-GF1 + + + + jakarta.tck sigtest-maven-plugin - 1.4 + 2.2 org.glassfish.jersey.media @@ -160,6 +175,7 @@ ${jersey.version} test + org.glassfish.jersey.media jersey-media-jaxb @@ -201,7 +217,8 @@ - + + + + + + maven-antrun-plugin + 3.0.0 + + + + run + + pre-integration-test + + + + + + + + exec-maven-plugin org.codehaus.mojo @@ -306,7 +343,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin stop-domain @@ -319,7 +356,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin start-domain @@ -332,7 +369,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true @@ -346,7 +383,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin --passwordfile ${project.basedir}/j2ee.pass @@ -366,7 +403,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin --passwordfile ${project.basedir}/j2ee.pass @@ -384,7 +421,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin --passwordfile ${project.basedir}/javajoe.pass @@ -404,7 +441,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin --passwordfile ${project.basedir}/javajoe.pass @@ -422,7 +459,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin list-file-users @@ -435,7 +472,7 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${glassfish.home}/glassfish/bin/asadmin stop-domain @@ -462,8 +499,6 @@ ${glassfish.home} org.glassfish.jersey.servlet.ServletContainer - localhost - 8080 true j2ee j2ee