You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/15 11:40:16 UTC
[tomee] 02/03: TOMEE-3895 Smallrye OpenTracing TCK fixes
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 7cd1cf0740c75d3528e66e8b0dfb9851c0d2ada0
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Fri Apr 15 13:38:47 2022 +0200
TOMEE-3895 Smallrye OpenTracing TCK fixes
---
...croProfileOpenTracingTCKDeploymentPackager.java | 1 +
.../MicroProfileOpenTracingTCKTracer.java | 5 ++++-
.../META-INF/services/jakarta.ws.rs.ext.Providers | 1 +
tck/microprofile-tck/opentracing/tck-dev.xml | 26 ++++++++++++++++++++++
4 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java
index 64a83abe41..5ebc0486e3 100644
--- a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java
+++ b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java
@@ -52,6 +52,7 @@ public class MicroProfileOpenTracingTCKDeploymentPackager extends ServletProtoco
webArchive.addAsWebInfResource("META-INF/beans.xml");
webArchive.addClass(MicroProfileOpenTracingTCKTracer.class);
webArchive.addClass(MicroProfileOpenTrackingContextResolver.class);
+ webArchive.addClass(MicroProfileOpenTracingExceptionMapper.class);
webArchive.addAsServiceProvider(Providers.class, MicroProfileOpenTrackingContextResolver.class);
System.out.println(webArchive.toString(true));
diff --git a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKTracer.java b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKTracer.java
index 3877e6cb0b..e9ef4d0a75 100644
--- a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKTracer.java
+++ b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKTracer.java
@@ -21,8 +21,11 @@ import io.opentracing.mock.MockTracer;
import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Singleton;
-@ApplicationScoped
+@Singleton
+@Default
@Alternative
public class MicroProfileOpenTracingTCKTracer extends MockTracer {
}
diff --git a/tck/microprofile-tck/opentracing/src/test/resources/META-INF/services/jakarta.ws.rs.ext.Providers b/tck/microprofile-tck/opentracing/src/test/resources/META-INF/services/jakarta.ws.rs.ext.Providers
index 7b6e94ad4f..6bbb3bed2c 100644
--- a/tck/microprofile-tck/opentracing/src/test/resources/META-INF/services/jakarta.ws.rs.ext.Providers
+++ b/tck/microprofile-tck/opentracing/src/test/resources/META-INF/services/jakarta.ws.rs.ext.Providers
@@ -1 +1,2 @@
org.apache.tomee.microprofile.tck.opentracing.MicroProfileOpenTrackingContextResolver
+org.apache.tomee.microprofile.tck.opentracing.MicroProfileOpenTracingExceptionMapper
diff --git a/tck/microprofile-tck/opentracing/tck-dev.xml b/tck/microprofile-tck/opentracing/tck-dev.xml
new file mode 100644
index 0000000000..31a6d631f6
--- /dev/null
+++ b/tck/microprofile-tck/opentracing/tck-dev.xml
@@ -0,0 +1,26 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<!--
+ 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.
+ -->
+<suite name="microprofile-opentracing-TCK" verbose="2" configfailurepolicy="continue" >
+
+ <test name="microprofile-opentracing 1.0 TCK">
+ <classes>
+ <class name="org.eclipse.microprofile.opentracing.tck.OpenTracingHTTPPathNameTests"></class>
+ </classes>
+ </test>
+
+</suite>
\ No newline at end of file