Author: rmannibucau
Date: Tue Dec 18 09:42:20 2012
New Revision: 1423373
URL: http://svn.apache.org/viewvc?rev=1423373&view=rev
Log:
fixing test (bad conf dur to this morning update)
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ResourceArquillianStandaloneTest.java
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ResourceArquillianStandaloneTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ResourceArquillianStandaloneTest.java?rev=1423373&r1=1423372&r2=1423373&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ResourceArquillianStandaloneTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ResourceArquillianStandaloneTest.java
Tue Dec 18 09:42:20 2012
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertNot
@RunWith(Arquillian.class)
public class ResourceArquillianStandaloneTest {
- @Resource
- private DataSource defaultDs;
+ @Resource(name = "db1")
+ private DataSource db1;
@Deployment
public static JavaArchive archive() {
@@ -42,6 +42,6 @@ public class ResourceArquillianStandalon
@Test
public void checkInjections() {
- assertNotNull(defaultDs);
+ assertNotNull(db1);
}
}
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=1423373&r1=1423372&r2=1423373&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 09:42:20 2012
@@ -23,8 +23,8 @@
<configuration>
<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
+ db1 = new://Resource?type=DataSource
+ db1.JdbcUrl = jdbc:hsqldb:mem:db1
java\:global/db = new://Resource?type=DataSource
java\:global/db.JdbcUrl = jdbc:hsqldb:mem:global
