Author: rmannibucau
Date: Tue Dec 18 07:39:24 2012
New Revision: 1423303
URL: http://svn.apache.org/viewvc?rev=1423303&view=rev
Log:
adding a test for java:global resolution in arq embedded
Added:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/BindingInJavaGlobalTest.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
Added:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/BindingInJavaGlobalTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/BindingInJavaGlobalTest.java?rev=1423303&view=auto
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/BindingInJavaGlobalTest.java
(added)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/BindingInJavaGlobalTest.java
Tue Dec 18 07:39:24 2012
@@ -0,0 +1,66 @@
+/**
+ * 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.openejb.arquillian.openejb;
+
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.openejb.assembler.classic.ReloadableEntityManagerFactory;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnit;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Arquillian.class)
+public class BindingInJavaGlobalTest {
+ @Deployment
+ public static JavaArchive jar() {
+ return ShrinkWrap.create(JavaArchive.class)
+ .addAsManifestResource(new StringAsset("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n" +
+ "<persistence version=\"2.0\"\n" +
+ "
xmlns=\"http://java.sun.com/xml/ns/persistence\"\n" +
+ "
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ "
xsi:schemaLocation=\"http://java.sun.com/xml/ns/persistence\n" +
+ "
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd\">\n" +
+ " <persistence-unit name=\"person\">\n" +
+ "
<jta-data-source>java:global/db</jta-data-source>\n" +
+ " </persistence-unit>\n" +
+ "</persistence>"), "persistence.xml");
+ }
+
+ @PersistenceUnit
+ private EntityManagerFactory emf;
+
+ @Test
+ public void checkSimpleBiding() throws NamingException {
+ final BasicDataSource ds = (BasicDataSource) new
InitialContext().lookup("java:global/db");
+ assertEquals("jdbc:hsqldb:mem:global", ds.getUrl());
+ }
+
+ @Test
+ public void checkJpaBiding() throws NamingException {
+ assertEquals("jdbc:hsqldb:mem:global", ((BasicDataSource)
((ReloadableEntityManagerFactory) emf).info().getJtaDataSource()).getUrl());
+ }
+}
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml?rev=1423303&r1=1423302&r2=1423303&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
Tue Dec 18 07:39:24 2012
@@ -21,7 +21,14 @@
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<container qualifier="openejb" default="true">
<configuration>
- <property name="properties" />
+ <property name="properties">
+ # used to not have a single DataSource and be able to test the
resource resolution
+ db1 = new://Resource?type=Resource
+ db1 = jdbc:hsqldb:mem:db1
+
+ java\:global/db = new://Resource?type=DataSource
+ java\:global/db.JdbcUrl = jdbc:hsqldb:mem:global
+ </property>
</configuration>
</container>
</arquillian>