fixing few tests - surely linked to tomcat upgrade
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3b204271 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3b204271 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3b204271 Branch: refs/heads/master Commit: 3b2042712b22839ec81147bd605c1cf85a0b856e Parents: 7146234 Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Thu Jul 16 21:32:07 2015 +0200 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Thu Jul 16 21:32:07 2015 +0200 ---------------------------------------------------------------------- .../tests/jaxws/EarClassLoaderTest.java | 3 +- .../jaxws/LoadJodaFromTheWebAppResource.java | 2 +- .../AlternateDriverJarEmbeddedDemo.java | 124 +++++++++++++++++++ .../org/superbiz/AlternateDriverJarTest.java | 124 ------------------- 4 files changed, 127 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/3b204271/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java index 607d2c2..c875bff 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java @@ -34,6 +34,7 @@ import java.io.IOException; import java.net.URL; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; @RunWith(Arquillian.class) public class EarClassLoaderTest { @@ -59,6 +60,6 @@ public class EarClassLoaderTest { @Test public void checkIfWasCorretlyLoaded() throws IOException { // when writing this test we ship joda-time 2.2 - assertEquals("2.5", IO.slurp(new URL(url.toExternalForm() + (url.getPath().isEmpty() ? "/broken-web/" : "") + "joda"))); + assertTrue(IO.slurp(new URL(url.toExternalForm() + (url.getPath().isEmpty() ? "/broken-web/" : "") + "joda")).endsWith("joda-time-2.5.jar")); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3b204271/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/LoadJodaFromTheWebAppResource.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/LoadJodaFromTheWebAppResource.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/LoadJodaFromTheWebAppResource.java index bfac42c..3bc2338 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/LoadJodaFromTheWebAppResource.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/LoadJodaFromTheWebAppResource.java @@ -28,7 +28,7 @@ public class LoadJodaFromTheWebAppResource { @GET public String worked() { LocalDateTime.now().toString(); // just trigger loading if not already done during scanning - return LocalDateTime.class.getPackage().getImplementationVersion(); + return LocalDateTime.class.getProtectionDomain().getCodeSource().getLocation().toExternalForm(); } public LocalDateTime triggerLoadingDuringScanning() { http://git-wip-us.apache.org/repos/asf/tomee/blob/3b204271/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDriverJarEmbeddedDemo.java ---------------------------------------------------------------------- diff --git a/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDriverJarEmbeddedDemo.java b/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDriverJarEmbeddedDemo.java new file mode 100644 index 0000000..1088bd0 --- /dev/null +++ b/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDriverJarEmbeddedDemo.java @@ -0,0 +1,124 @@ +/* + * 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.superbiz; + +import org.apache.openejb.jee.EjbJar; +import org.apache.openejb.jee.SingletonBean; +import org.apache.openejb.junit.ApplicationComposer; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.annotation.Resource; +import javax.ejb.EJB; +import javax.ejb.LocalBean; +import javax.ejb.Singleton; +import javax.sql.DataSource; +import java.io.File; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.util.Properties; + +@RunWith(ApplicationComposer.class) +public class AlternateDriverJarEmbeddedDemo { // using AppComposer and Arquillian in the same build needs more config, not the purpose of this sample + + private static final String USER = "SA"; + private static final String PASSWORD = ""; + + @Configuration + public Properties config() { + + final File drivers = new File(new File("target"), "drivers").getAbsoluteFile(); + + final Properties p = new Properties(); + p.put("openejb.jdbc.datasource-creator", "dbcp-alternative"); + + File file = new File(drivers, "derby-10.10.1.1.jar"); + Assert.assertTrue("Failed to find: " + file, file.exists()); + + p.put("JdbcOne", "new://Resource?type=DataSource&classpath=" + + file.getAbsolutePath().replace("\\", "/")); + p.put("JdbcOne.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver"); + p.put("JdbcOne.JdbcUrl", "jdbc:derby:memory:JdbcOne;create=true"); + p.put("JdbcOne.UserName", USER); + p.put("JdbcOne.Password", PASSWORD); + p.put("JdbcOne.JtaManaged", "false"); + + file = new File(drivers, "derby-10.9.1.0.jar"); + Assert.assertTrue("Failed to find: " + file, file.exists()); + + p.put("JdbcTwo", "new://Resource?type=DataSource&classpath=" + + file.getAbsolutePath().replace("\\", "/")); + p.put("JdbcTwo.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver"); + p.put("JdbcTwo.JdbcUrl", "jdbc:derby:memory:JdbcTwo;create=true"); + p.put("JdbcTwo.UserName", USER); + p.put("JdbcTwo.Password", PASSWORD); + p.put("JdbcTwo.JtaManaged", "false"); + return p; + } + + @Module + public EjbJar app() throws Exception { + return new EjbJar() + .enterpriseBean(new SingletonBean(JdbcOne.class).localBean()) + .enterpriseBean(new SingletonBean(JdbcTwo.class).localBean()); + } + + @EJB + private JdbcOne one; + + @EJB + private JdbcTwo two; + + @Test + public void testBoth() throws Exception { + Assert.assertEquals("Should be using 10.10.1.1 - (1458268)", "10.10.1.1 - (1458268)", one.getDriverVersion()); + Assert.assertEquals("Should be using 10.9.1.0 - (1344872)", "10.9.1.0 - (1344872)", two.getDriverVersion()); + } + + @LocalBean + @Singleton + public static class JdbcOne { + + @Resource(name = "JdbcOne") + private DataSource ds; + + public String getDriverVersion() throws Exception { + + final Connection con = ds.getConnection(); + final DatabaseMetaData md = con.getMetaData(); + return md.getDriverVersion(); + } + } + + @LocalBean + @Singleton + public static class JdbcTwo { + + @Resource(name = "JdbcTwo") + private DataSource ds; + + public String getDriverVersion() throws Exception { + + final Connection con = ds.getConnection(); + final DatabaseMetaData md = con.getMetaData(); + return md.getDriverVersion(); + } + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/3b204271/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDriverJarTest.java ---------------------------------------------------------------------- diff --git a/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDriverJarTest.java b/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDriverJarTest.java deleted file mode 100644 index 32fa5d6..0000000 --- a/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDriverJarTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * 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.superbiz; - -import org.apache.openejb.jee.EjbJar; -import org.apache.openejb.jee.SingletonBean; -import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.testing.Configuration; -import org.apache.openejb.testing.Module; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; - -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.ejb.LocalBean; -import javax.ejb.Singleton; -import javax.sql.DataSource; -import java.io.File; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.util.Properties; - -@RunWith(ApplicationComposer.class) -public class AlternateDriverJarTest { - - private static final String USER = "SA"; - private static final String PASSWORD = ""; - - @Configuration - public Properties config() { - - final File drivers = new File(new File("target"), "drivers").getAbsoluteFile(); - - final Properties p = new Properties(); - p.put("openejb.jdbc.datasource-creator", "dbcp-alternative"); - - File file = new File(drivers, "derby-10.10.1.1.jar"); - Assert.assertTrue("Failed to find: " + file, file.exists()); - - p.put("JdbcOne", "new://Resource?type=DataSource&classpath=" - + file.getAbsolutePath().replace("\\", "/")); - p.put("JdbcOne.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver"); - p.put("JdbcOne.JdbcUrl", "jdbc:derby:memory:JdbcOne;create=true"); - p.put("JdbcOne.UserName", USER); - p.put("JdbcOne.Password", PASSWORD); - p.put("JdbcOne.JtaManaged", "false"); - - file = new File(drivers, "derby-10.9.1.0.jar"); - Assert.assertTrue("Failed to find: " + file, file.exists()); - - p.put("JdbcTwo", "new://Resource?type=DataSource&classpath=" - + file.getAbsolutePath().replace("\\", "/")); - p.put("JdbcTwo.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver"); - p.put("JdbcTwo.JdbcUrl", "jdbc:derby:memory:JdbcTwo;create=true"); - p.put("JdbcTwo.UserName", USER); - p.put("JdbcTwo.Password", PASSWORD); - p.put("JdbcTwo.JtaManaged", "false"); - return p; - } - - @Module - public EjbJar app() throws Exception { - return new EjbJar() - .enterpriseBean(new SingletonBean(JdbcOne.class).localBean()) - .enterpriseBean(new SingletonBean(JdbcTwo.class).localBean()); - } - - @EJB - private JdbcOne one; - - @EJB - private JdbcTwo two; - - @Test - public void testBoth() throws Exception { - Assert.assertEquals("Should be using 10.10.1.1 - (1458268)", "10.10.1.1 - (1458268)", one.getDriverVersion()); - Assert.assertEquals("Should be using 10.9.1.0 - (1344872)", "10.9.1.0 - (1344872)", two.getDriverVersion()); - } - - @LocalBean - @Singleton - public static class JdbcOne { - - @Resource(name = "JdbcOne") - private DataSource ds; - - public String getDriverVersion() throws Exception { - - final Connection con = ds.getConnection(); - final DatabaseMetaData md = con.getMetaData(); - return md.getDriverVersion(); - } - } - - @LocalBean - @Singleton - public static class JdbcTwo { - - @Resource(name = "JdbcTwo") - private DataSource ds; - - public String getDriverVersion() throws Exception { - - final Connection con = ds.getConnection(); - final DatabaseMetaData md = con.getMetaData(); - return md.getDriverVersion(); - } - } -}