[webbeans-commits] Webbeans SVN: r2503 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Apr 17 14:30:45 EDT 2009
Author: dallen6
Date: 2009-04-17 14:30:45 -0400 (Fri, 17 Apr 2009)
New Revision: 2503
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java
Modified:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
Log:
Renamed tests to better reflect what they do and some spec assertion assignment fixes
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java (from rev 2474, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.jsr299.tck.tests.xml.resource.ejb;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Simple lifecycle test with XML declaring injection of EJB.
+ *
+ * @author David Allen
+ *
+ */
+ at Artifact
+ at Packaging(PackagingType.EAR)
+ at IntegrationTest
+ at Resources({
+ @Resource(source="web.xml", destination="WEB-INF/web.xml")
+})
+ at BeansXml("beans.xml")
+ at EjbJarXml("ejb-jar.xml")
+public class DeclarationOfEjbTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "i"),
+ @SpecAssertion(section = "3.6", id = "d"),
+ @SpecAssertion(section = "3.6.1", id = "d"),
+ @SpecAssertion(section = "3.6.1", id = "i")
+ })
+ public void testXMLDeclarationOfEjb()
+ {
+ RemoteEjbInterface remoteEjbInterface = getCurrentManager().getInstanceByType(RemoteEjbInterface.class);
+ assert remoteEjbInterface.hello().equals("hi!");
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 18:24:02 UTC (rev 2502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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.jboss.jsr299.tck.tests.xml.resource.ejb;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.jboss.testharness.impl.packaging.Resources;
-import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-/**
- * Simple lifecycle test with XML declaring injection of EJB.
- *
- * @author David Allen
- *
- */
- at Artifact
- at Packaging(PackagingType.EAR)
- at IntegrationTest
- at Resources({
- @Resource(source="web.xml", destination="WEB-INF/web.xml")
-})
- at BeansXml("beans.xml")
- at EjbJarXml("ejb-jar.xml")
-public class InjectionOfEjbTest extends AbstractJSR299Test
-{
- @Test(groups = { "xml" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "i"),
- @SpecAssertion(section = "3.6", id = "d"),
- @SpecAssertion(section = "3.6", id = "i"),
- @SpecAssertion(section = "3.6.1", id = "d"),
- @SpecAssertion(section = "3.6.1", id = "i")
- })
- public void testEjbInjectionByXml()
- {
- RemoteEjbInterface remoteEjbInterface = getCurrentManager().getInstanceByType(RemoteEjbInterface.class);
- assert remoteEjbInterface.hello().equals("hi!");
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java (from rev 2474, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -0,0 +1,54 @@
+package org.jboss.jsr299.tck.tests.xml.resource.persistenceContext;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.WAR)
+ at IntegrationTest
+ at Resources({
+ @Resource(source="persistence.xml", destination="WEB-INF/persistence.xml")
+})
+ at BeansXml("beans.xml")
+public class DeclarationOfPersistenceUnitAndContextTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "g"),
+ @SpecAssertion(section = "3.6", id = "b"),
+ @SpecAssertion(section = "3.6.1", id = "b"),
+ @SpecAssertion(section = "3.6.1", id = "g")
+ })
+ public void testXMLDeclarationOfPersistenceContext()
+ {
+ EntityManager entityManager = getCurrentManager().getInstanceByType(EntityManager.class);
+ assert entityManager != null : "Persistence context was not injected into bean";
+ assert entityManager.isOpen() : "persistence context not open injected into bean";
+ }
+
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "h"),
+ @SpecAssertion(section = "3.6", id = "c"),
+ @SpecAssertion(section = "3.6.1", id = "c"),
+ @SpecAssertion(section = "3.6.1", id = "h")
+ })
+ public void testDeclarationOfPersistenceUnit()
+ {
+ EntityManagerFactory entityManagerFactory = getCurrentManager().getInstanceByType(EntityManagerFactory.class);
+ assert entityManagerFactory != null : "Persistence unit was not injected into bean";
+ assert entityManagerFactory.isOpen() : "persistence unit not open injected into bean";
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java 2009-04-17 18:24:02 UTC (rev 2502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -1,56 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.persistenceContext;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.jboss.testharness.impl.packaging.Resources;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.WAR)
- at IntegrationTest
- at Resources({
- @Resource(source="persistence.xml", destination="WEB-INF/persistence.xml")
-})
- at BeansXml("beans.xml")
-public class InjectionOfPersistenceContextTest extends AbstractJSR299Test
-{
- @Test(groups = { "xml" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "g"),
- @SpecAssertion(section = "3.6", id = "b"),
- @SpecAssertion(section = "3.6", id = "g"),
- @SpecAssertion(section = "3.6.1", id = "b"),
- @SpecAssertion(section = "3.6.1", id = "g")
- })
- public void testInjectionOfPersistenceContext()
- {
- EntityManager entityManager = getCurrentManager().getInstanceByType(EntityManager.class);
- assert entityManager != null : "Persistence context was not injected into bean";
- assert entityManager.isOpen() : "persistence context not open injected into bean";
- }
-
- @Test(groups = { "xml" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "h"),
- @SpecAssertion(section = "3.6", id = "c"),
- @SpecAssertion(section = "3.6", id = "h"),
- @SpecAssertion(section = "3.6.1", id = "c"),
- @SpecAssertion(section = "3.6.1", id = "h")
- })
- public void testInjectionOfPersistenceUnit()
- {
- EntityManagerFactory entityManagerFactory = getCurrentManager().getInstanceByType(EntityManagerFactory.class);
- assert entityManagerFactory != null : "Persistence unit was not injected into bean";
- assert entityManagerFactory.isOpen() : "persistence unit not open injected into bean";
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java (from rev 2474, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -0,0 +1,36 @@
+package org.jboss.jsr299.tck.tests.xml.resource.resource;
+
+import javax.inject.AnnotationLiteral;
+import javax.inject.manager.Manager;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.WAR)
+ at IntegrationTest
+ at BeansXml("beans.xml")
+public class DeclarationOfResourceTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "f"),
+ @SpecAssertion(section = "3.6", id = "a"),
+ @SpecAssertion(section = "3.6.1", id = "a"),
+ @SpecAssertion(section = "3.6.1", id = "f"),
+ @SpecAssertion(section = "3.6.1", id = "l")
+ })
+ public void testXMLDeclarationOfResource()
+ {
+ Manager manager = getCurrentManager().getInstanceByType(Manager.class, new AnnotationLiteral<Another>() {});
+ assert manager != null : "@Another Manager not found";
+ assert manager.equals(getCurrentManager()): "Wrong manager found";
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java 2009-04-17 18:24:02 UTC (rev 2502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -1,36 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.resource;
-
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Manager;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.WAR)
- at IntegrationTest
- at BeansXml("beans.xml")
-public class InjectionOfResourceTest extends AbstractJSR299Test
-{
- @Test(groups = { "xml" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "f"),
- @SpecAssertion(section = "3.6", id = "a"),
- @SpecAssertion(section = "3.6", id = "f"),
- @SpecAssertion(section = "3.6.1", id = "a"),
- @SpecAssertion(section = "3.6.1", id = "f")
- })
- public void testInjectionOfResource()
- {
- Manager manager = getCurrentManager().getInstanceByType(Manager.class, new AnnotationLiteral<Another>() {});
- assert manager != null : "@Another Manager was not injected into bean";
- assert manager.equals(getCurrentManager()): "Wrong manager injected into bean";
- }
-}
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml 2009-04-17 18:24:02 UTC (rev 2502)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml 2009-04-17 18:30:45 UTC (rev 2503)
@@ -6,7 +6,7 @@
</Deploy>
<test:RemoteEjbInterface>
<EJB>
- <mappedName>org.jboss.jsr299.tck.tests.xml.resource.ejb.InjectionOfEjbTest/MyRemoteEjb/remote-org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</mappedName>
+ <mappedName>ejb/MyRemoteEjb</mappedName>
</EJB>
</test:RemoteEjbInterface>
</Beans>
More information about the weld-commits
mailing list