This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 54d7b119eff3ebe447daa06718edf78402d8812b Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Thu Apr 14 17:31:56 2022 +0200 Fix REST CLient issues with OpenTracing Tracer not being available --- .../MicroProfileRestClientTCKArchiveProcessor.java | 4 ++++ .../rest-client/src/test/resources/arquillian.xml | 1 + tck/microprofile-tck/rest-client/tck-dev.xml | 27 ++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java index 049bcb99e2..8deb9e34e2 100644 --- a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java +++ b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java @@ -18,11 +18,13 @@ package org.apache.tomee.microprofile.tck.restclient; +import org.apache.openejb.loader.JarLocation; import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; import org.jboss.arquillian.test.spi.TestClass; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePath; import org.jboss.shrinkwrap.api.Node; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.impl.base.path.BasicPath; @@ -34,6 +36,8 @@ public class MicroProfileRestClientTCKArchiveProcessor implements ApplicationArc if (archive instanceof WebArchive) { WebArchive webArchive = (WebArchive) archive; + webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.server.Handler.class)); + webArchive.addAsWebInfResource(new StringAsset(""), "beans.xml"); final Map<ArchivePath, Node> content = webArchive.getContent(); final Node node = content.get(new BasicPath("META-INF/certificates-dir.txt")); diff --git a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml index 7a0077f872..af2fe9b868 100644 --- a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml @@ -27,6 +27,7 @@ <property name="ajpPort">-1</property> <property name="stopPort">-1</property> <property name="classifier">microprofile</property> + <property name="debug">false</property> <property name="conf">src/test/conf</property> <property name="dir">target/tomee</property> <property name="appWorkingDir">target/workdir</property> diff --git a/tck/microprofile-tck/rest-client/tck-dev.xml b/tck/microprofile-tck/rest-client/tck-dev.xml new file mode 100644 index 0000000000..8c702dfd90 --- /dev/null +++ b/tck/microprofile-tck/rest-client/tck-dev.xml @@ -0,0 +1,27 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > + +<suite name="microprofile-rest-client-TCK" verbose="2" configfailurepolicy="continue" > + + <test name="microprofile-rest-client TCK"> + <classes> + <class name="org.eclipse.microprofile.rest.client.tck.ClientHeaderParamTest"></class> + </classes> + </test> + +</suite> \ No newline at end of file
