Weld SVN: r6958 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 17:40:29 -0400 (Tue, 10 Aug 2010)
New Revision: 6958
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
update tests file
Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-08-10 21:32:31 UTC (rev 6957)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-08-10 21:40:29 UTC (rev 6958)
@@ -16,43 +16,6 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-165 -->
- <class name="org.jboss.jsr299.tck.tests.context.NormalContextTest">
- <methods>
- <exclude name="testSameNormalScopeBeanInjectedEverywhere" />
- </methods>
- </class>
-
- <!-- CDITCK-168 -->
- <class name="org.jboss.jsr299.tck.tests.extensions.processBean.ProcessBeanTest">
- <methods>
- <exclude name="testProcessProducerFieldEvent" />
- <exclude name="testProcessProducerMethodEvent" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.extensions.processBean.ProcessSessionBeanTest">
- <methods>
- <exclude name="testProcessSessionBeanEvent" />
- </methods>
- </class>
-
- <!-- CDITCK-169 -->
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextInjectionTest">
- <methods>
- <exclude name="testInjectionOfPersistenceContext" />
- <exclude name="testInjectionOfPersistenceUnit" />
- <exclude name="testPassivationOfPersistenceContext" />
- <exclude name="testPassivationOfPersistenceUnit" />
- </methods>
- </class>
-
- <!-- CDITCK-170 -->
- <class name="org.jboss.jsr299.tck.tests.event.observer.transactional.TransactionalObserversTest">
- <methods>
- <exclude name="testObserverCanSetRollbackOnlyOnTransaction" />
- </methods>
- </class>
-
<!-- Issues in Weld (the RI) -->
<!-- WELD-401 -->
15 years, 8 months
Weld SVN: r6957 - in cdi-tck/branches/1.0/impl/src/main: resources and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 17:32:31 -0400 (Tue, 10 Aug 2010)
New Revision: 6957
Removed:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-audit-cdi.xml
Log:
CDITCK-170
Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-audit-cdi.xml 2010-08-10 21:27:44 UTC (rev 6956)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-audit-cdi.xml 2010-08-10 21:32:31 UTC (rev 6957)
@@ -5010,22 +5010,27 @@
<section id="10.4.4" title="Transactional observer methods">
<assertion id="a">
<text>Transactional observer methods are observer methods which receive event notifications during the before or after completion phase of the transaction in which the event was fired. If no transaction is in progress when the event is fired, they are notified at the same time as other observers</text>
+ <note>Unverifiable since an observer method cannot detect if a transaction is involved or not</note>
</assertion>
<assertion id="b">
<text>A before completion observer method is called during the before completion phase of the transaction</text>
+ <note>Unverifiable since an observer method cannot detect if a transaction is involved or not</note>
</assertion>
<assertion id="c">
<text>An after completion observer method is called during the after completion phase of the transaction</text>
+ <note>Unverifiable since an observer method cannot detect if a transaction is involved or not</note>
</assertion>
<assertion id="d">
<text>An after success observer method is called during the after completion phase of the transaction, only when the transaction completes successfully</text>
+ <note>Unverifiable since an observer method cannot detect if a transaction is involved or not</note>
</assertion>
<assertion id="e">
<text>An after failure observer method is called during the after completion phase of the transaction, only when the transaction fails</text>
+ <note>Unverifiable since an observer method cannot detect if a transaction is involved or not</note>
</assertion>
<assertion id="f" testable="false">
@@ -5049,10 +5054,12 @@
<assertion id="bb">
<text>If the observer method is a transactional observer method and there is currently a JTA transaction in progress, the container calls the observer method during the appropriate transaction completion phase. ~Otherwise, the container calls the observer immediately.~</text>
+ <note>Unverifiable since an observer method cannot detect if a transaction is involved or not</note>
</assertion>
<assertion id="bc">
<text>If the observer method is a transactional observer method and there is currently a JTA transaction in progress, ~the container calls the observer method during the appropriate transaction completion phase.~ Otherwise, the container calls the observer immediately.</text>
+ <note>Unverifiable since an observer method cannot detect if a transaction is involved or not</note>
</assertion>
<assertion id="bcb">
@@ -5061,6 +5068,7 @@
<assertion id="bd">
<text>Any observer method called before completion of a transaction may call |setRollbackOnly()| to force a transaction rollback.</text>
+ <note>Unverifiable since an observer method cannot access the transaction being committed</note>
</assertion>
<assertion id="bd" testable="false">
15 years, 8 months
Weld SVN: r6956 - in cdi-tck/branches/1.0: impl/src/main/java/org/jboss/jsr299/tck and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 17:27:44 -0400 (Tue, 10 Aug 2010)
New Revision: 6956
Modified:
cdi-tck/branches/1.0/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
Log:
CDITCK-94
Modified: cdi-tck/branches/1.0/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
===================================================================
--- cdi-tck/branches/1.0/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2010-08-10 21:16:42 UTC (rev 6955)
+++ cdi-tck/branches/1.0/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2010-08-10 21:27:44 UTC (rev 6956)
@@ -16,6 +16,8 @@
*/
package org.jboss.jsr299.tck.spi;
+import java.io.IOException;
+
/**
* Provides Bean related operations.
*
@@ -41,5 +43,21 @@
* @return true if the object is a proxy
*/
public boolean isProxy(Object instance);
+
+ /**
+ * Serializes the object tree starting with the bean instance provided.
+ *
+ * @param instance The bean instance to serialize
+ * @return the serialized byte array of the bean instance
+ */
+ public byte[] serialize(Object instance) throws IOException;
+
+ /**
+ * Deserializes a bean instance from the given serialized bytes.
+ *
+ * @param bytes The serialized byte stream of a bean instance
+ * @return the serialized byte array of the bean instance
+ */
+ public Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException;
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2010-08-10 21:16:42 UTC (rev 6955)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2010-08-10 21:27:44 UTC (rev 6956)
@@ -51,16 +51,12 @@
protected byte[] serialize(Object instance) throws IOException
{
- ByteArrayOutputStream bytes = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream(bytes);
- out.writeObject(instance);
- return bytes.toByteArray();
+ return getCurrentConfiguration().getBeans().serialize(instance);
}
protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
{
- ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
- return in.readObject();
+ return getCurrentConfiguration().getBeans().deserialize(bytes);
}
protected void setContextActive(Context context)
15 years, 8 months
Weld SVN: r6955 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 17:16:42 -0400 (Tue, 10 Aug 2010)
New Revision: 6955
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
Log:
CDITCK-171
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java 2010-08-10 21:14:12 UTC (rev 6954)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java 2010-08-10 21:16:42 UTC (rev 6955)
@@ -5,6 +5,8 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
import org.jboss.testharness.impl.packaging.jsr299.Extension;
import org.testng.annotations.Test;
@@ -12,6 +14,9 @@
@SpecVersion(spec="cdi", version="20091101")
@Extension("javax.enterprise.inject.spi.Extension")
@IntegrationTest
+@Resources({
+ @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
+})
public class EnterpriseBeanNotDiscoveredAsManagedBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2010-08-10 21:14:12 UTC (rev 6954)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2010-08-10 21:16:42 UTC (rev 6955)
@@ -23,10 +23,15 @@
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
import org.testng.annotations.Test;
@Artifact
@SpecVersion(spec="cdi", version="20091101")
+@Resources({
+ @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
+})
public class SimpleBeanDefinitionTest extends AbstractJSR299Test
{
15 years, 8 months
Weld SVN: r6954 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 17:14:12 -0400 (Tue, 10 Aug 2010)
New Revision: 6954
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java
Log:
CDITCK-165
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2010-08-10 20:39:49 UTC (rev 6953)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2010-08-10 21:14:12 UTC (rev 6954)
@@ -100,6 +100,8 @@
{
SimpleBeanA instanceOfA = getInstanceByType(SimpleBeanA.class);
SimpleBeanB instanceOfB = getInstanceByType(SimpleBeanB.class);
- assert instanceOfA.getZ() == instanceOfB.getZ();
+ instanceOfA.getZ().setName("Ben");
+ assert instanceOfA.getZ().getName().equals("Ben");
+ assert instanceOfB.getZ().getName().equals("Ben");
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java 2010-08-10 20:39:49 UTC (rev 6953)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java 2010-08-10 21:14:12 UTC (rev 6954)
@@ -24,5 +24,17 @@
public class SimpleBeanZ implements Serializable
{
private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
}
15 years, 8 months
Weld SVN: r6953 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 16:39:49 -0400 (Tue, 10 Aug 2010)
New Revision: 6953
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBean.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBeanImpl.java
Log:
CDITCK-169
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBean.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBean.java 2010-08-10 20:39:49 UTC (rev 6953)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.implementation.simple.resource.persistenceContext;
+
+import javax.ejb.Local;
+
+/**
+ * @author Marius Bogoevici
+ */
+@Local
+public interface ServiceBean
+{
+ public boolean validateEntityManager();
+
+ public ManagedBean getManagedBean();
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBean.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBeanImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBeanImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBeanImpl.java 2010-08-10 20:39:49 UTC (rev 6953)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.implementation.simple.resource.persistenceContext;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+/**
+ * @author Marius Bogoevici
+ */
+@Stateless
+public class ServiceBeanImpl implements ServiceBean
+{
+ @Inject
+ ManagedBean managedBean;
+
+ public ManagedBean getManagedBean()
+ {
+ return managedBean;
+ }
+
+ public boolean validateEntityManager()
+ {
+ boolean entityManagerValid = true;
+ EntityManager entityManager = managedBean.getPersistenceContext();
+ assert entityManager != null;
+ Object delegate = entityManager.getDelegate();
+ assert delegate != null;
+ try
+ {
+ entityManager.getTransaction();
+ entityManagerValid = false;
+ }
+ catch (IllegalStateException e)
+ {
+ // an IllegalStateException is the expected result if this is a JTA entityManager
+ }
+ try
+ {
+ entityManager.close();
+ entityManagerValid = false;
+ }
+ catch (IllegalStateException e)
+ {
+ // an IllegalStateException is the expected result if the entityManager is container-managed
+ }
+ return entityManagerValid;
+ }
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ServiceBeanImpl.java
___________________________________________________________________
Name: svn:eol-style
+ native
15 years, 8 months
Weld SVN: r6952 - cdi-tck/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 16:36:26 -0400 (Tue, 10 Aug 2010)
New Revision: 6952
Modified:
cdi-tck/trunk/pom.xml
Log:
update to parent-13
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2010-08-10 20:34:02 UTC (rev 6951)
+++ cdi-tck/trunk/pom.xml 2010-08-10 20:36:26 UTC (rev 6952)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>12</version>
+ <version>13</version>
</parent>
<!-- Metadata -->
15 years, 8 months
Weld SVN: r6951 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 16:34:02 -0400 (Tue, 10 Aug 2010)
New Revision: 6951
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
Log:
CDITCK-169
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java 2010-08-10 20:31:35 UTC (rev 6950)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java 2010-08-10 20:34:02 UTC (rev 6951)
@@ -22,7 +22,7 @@
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-class ManagedBean implements Serializable
+public class ManagedBean implements Serializable
{
@Inject @Database
private EntityManager persistenceContext;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2010-08-10 20:31:35 UTC (rev 6950)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2010-08-10 20:34:02 UTC (rev 6951)
@@ -55,11 +55,10 @@
})
public void testInjectionOfPersistenceContext()
{
- Bean<ManagedBean> managedBeanBean = getBeans(ManagedBean.class).iterator().next();
- CreationalContext<ManagedBean> managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean);
- ManagedBean managedBean = managedBeanBean.create(managedBeanCc);
+ ServiceBean serviceBean = getInstanceByType(ServiceBean.class);
+ ManagedBean managedBean = serviceBean.getManagedBean();
assert managedBean.getPersistenceContext() != null : "Persistence context was not injected into bean";
- assert managedBean.getPersistenceContext().isOpen() : "Persistence context not open injected into bean";
+ assert serviceBean.validateEntityManager();
}
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@@ -88,7 +87,7 @@
ManagedBean managedBean = managedBeanBean.create(managedBeanCc);
managedBean = (ManagedBean) deserialize(serialize(managedBean));
assert managedBean.getPersistenceContext() != null : "Persistence context was not injected into bean";
- assert managedBean.getPersistenceContext().isOpen() : "Persistence context not open injected into bean";
+ assert managedBean.getPersistenceContext().getDelegate() != null : "Persistence context not deserialized correctly";
}
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
15 years, 8 months
Weld SVN: r6950 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 16:31:35 -0400 (Tue, 10 Aug 2010)
New Revision: 6950
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java
Log:
CDITCK-168
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2010-08-10 20:23:30 UTC (rev 6949)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2010-08-10 20:31:35 UTC (rev 6950)
@@ -60,7 +60,6 @@
public void observeElephantSessionBean(@Observes ProcessSessionBean<Elephant> event)
{
ProcessBeanObserver.elephantProcessSessionBean = event;
- ProcessBeanObserver.elephantProcessBeanCount++;
}
public void observeElephantBean(@Observes ProcessBean<Elephant> event)
@@ -73,7 +72,7 @@
ProcessBeanObserver.cowProcessProducerMethod = event;
}
- public void observeCowProccesBean(@Observes ProcessBean<Cowshed> event)
+ public void observeCowShedProccesBean(@Observes ProcessBean<Cowshed> event)
{
ProcessBeanObserver.cowShedProcessBeanCount++;
}
@@ -83,7 +82,7 @@
ProcessBeanObserver.chickenProcessProducerField = event;
}
- public void observeChickenProccesBean(@Observes ProcessBean<ChickenHutch> event)
+ public void observeChickenHutchProccesBean(@Observes ProcessBean<ChickenHutch> event)
{
ProcessBeanObserver.chickenHutchProcessBeanCount++;
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2010-08-10 20:23:30 UTC (rev 6949)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2010-08-10 20:31:35 UTC (rev 6950)
@@ -76,7 +76,7 @@
assert ProcessBeanObserver.getCowProcessProducerMethod().getBean().getBeanClass().equals(Cowshed.class);
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getBaseType().equals(Cow.class);
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getDeclaringType().getBaseType().equals(Cowshed.class);
- assert ProcessBeanObserver.getCowShedProcessBeanCount() == 2;
+ assert ProcessBeanObserver.getCowShedProcessBeanCount() == 1;
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotated() instanceof AnnotatedMethod<?>;
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getJavaMember().getName().equals("getDaisy");
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getJavaMember().getDeclaringClass().equals(Cowshed.class);
@@ -99,7 +99,7 @@
assert ProcessBeanObserver.getChickenProcessProducerField().getBean().getBeanClass().equals(ChickenHutch.class);
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getBaseType().equals(Chicken.class);
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getDeclaringType().getBaseType().equals(ChickenHutch.class);
- assert ProcessBeanObserver.getChickenHutchProcessBeanCount() == 2;
+ assert ProcessBeanObserver.getChickenHutchProcessBeanCount() == 1;
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotated() instanceof AnnotatedField<?>;
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getJavaMember().getName().equals("chicken");
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getJavaMember().getDeclaringClass().equals(ChickenHutch.class);
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2010-08-10 20:23:30 UTC (rev 6949)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2010-08-10 20:31:35 UTC (rev 6950)
@@ -60,7 +60,7 @@
public void testProcessSessionBeanEvent()
{
assert ProcessBeanObserver.getElephantProcessSessionBean().getBean().getBeanClass().equals(Elephant.class);
- assert ProcessBeanObserver.getElephantProcessBeanCount() == 2;
+ assert ProcessBeanObserver.getElephantProcessBeanCount() == 0;
assert ProcessBeanObserver.getElephantProcessSessionBean().getEjbName().equals("Rosie");
assert ProcessBeanObserver.getElephantProcessSessionBean().getSessionBeanType().equals(SessionBeanType.STATELESS);
assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotated() instanceof AnnotatedType<?>;
15 years, 8 months