Repository: tomee Updated Branches: refs/heads/master 68aef6ffe -> 4a09afb5b
TOMEE-2055 ensure @AroundConstruct doesnt prevent to have an instance Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d592cc63 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d592cc63 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d592cc63 Branch: refs/heads/master Commit: d592cc63b86528d6aeb5666319281fe50a09895e Parents: 68aef6f Author: rmannibucau <[email protected]> Authored: Thu Jun 8 15:31:45 2017 +0200 Committer: rmannibucau <[email protected]> Committed: Thu Jun 8 15:31:45 2017 +0200 ---------------------------------------------------------------------- .../openejb/cdi/AroundConstructCdiTest.java | 4 + .../tomee/embedded/UTTransactionalTest.java | 83 ++++++++++++++++++++ 2 files changed, 87 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d592cc63/container/openejb-core/src/test/java/org/apache/openejb/cdi/AroundConstructCdiTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/cdi/AroundConstructCdiTest.java b/container/openejb-core/src/test/java/org/apache/openejb/cdi/AroundConstructCdiTest.java new file mode 100644 index 0000000..e44cf01 --- /dev/null +++ b/container/openejb-core/src/test/java/org/apache/openejb/cdi/AroundConstructCdiTest.java @@ -0,0 +1,4 @@ +package org.apache.openejb.cdi; + +public class AroundConstructCdiTest { +} http://git-wip-us.apache.org/repos/asf/tomee/blob/d592cc63/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/UTTransactionalTest.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/UTTransactionalTest.java b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/UTTransactionalTest.java new file mode 100644 index 0000000..886407b --- /dev/null +++ b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/UTTransactionalTest.java @@ -0,0 +1,83 @@ +/* + * 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. + */ +package org.apache.tomee.embedded; + +import org.apache.openejb.loader.IO; +import org.apache.openejb.util.NetworkUtil; +import org.junit.Test; + +import javax.annotation.Resource; +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.transaction.NotSupportedException; +import javax.transaction.SystemException; +import javax.transaction.Transactional; +import javax.transaction.UserTransaction; +import java.io.IOException; +import java.net.URL; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +public class UTTransactionalTest { + @Test + public void run() throws IOException { + try (final Container c = new Container(new Configuration() + .http(NetworkUtil.getNextAvailablePort()) + //.property("openejb.container.additional.exclude", "org.apache.tomee.embedded.") + .property("openejb.additional.include", "tomee-")) + .deployClasspathAsWebApp()) { + assertEquals("IllegalStateException", IO.slurp(new URL("http://localhost:"; + c.getConfiguration().getHttpPort() + "/UTTransactionalTest"))); + } + } + + @ApplicationScoped + @Transactional + public static class Bean { + @Resource + private UserTransaction ut; + + public void noUt() { + try { + ut.begin(); + } catch (final NotSupportedException | SystemException e) { + fail(); + } + } + } + + @WebServlet(urlPatterns = "/UTTransactionalTest", loadOnStartup = 1) + public static class Endpoint extends HttpServlet { + @Inject + private Bean bean; + + @Override + protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException { + try { + bean.noUt(); + resp.getWriter().write("ok"); + } catch (final IllegalStateException ise) { + resp.getWriter().write("IllegalStateException"); + } + } + } +}
