Weld SVN: r5599 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:46:44 -0500 (Fri, 22 Jan 2010)
New Revision: 5599
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
Log:
port r5503 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2010-01-22 16:46:19 UTC (rev 5598)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2010-01-22 16:46:44 UTC (rev 5599)
@@ -87,7 +87,6 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "5.1.1", id = "fa")
- //@SpecAssertion(section = "2.6.1", id = "e") removed from spec
})
public void testProducerPoliciesOnClass() throws Exception
14 years, 11 months
Weld SVN: r5598 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:46:19 -0500 (Fri, 22 Jan 2010)
New Revision: 5598
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
Log:
port CDITCK-85 to trunk
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-01-22 16:46:19 UTC (rev 5598)
@@ -0,0 +1,45 @@
+package org.jboss.jsr299.tck.impl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.IMethodSelector;
+import org.testng.IMethodSelectorContext;
+import org.testng.ITestNGMethod;
+
+public class WebProfileMethodSelector implements IMethodSelector
+{
+
+ private static final long serialVersionUID = 4868366080536037160L;
+
+ public boolean includeMethod(IMethodSelectorContext ctx, ITestNGMethod method, boolean isTestMethod)
+ {
+ return isWar(method.getMethod().getDeclaringClass()) && !isFullProfileOnly(method.getGroups());
+ }
+
+ public void setTestMethods(List<ITestNGMethod> arg0)
+ {
+ // No-op, not needed
+ }
+
+ private static boolean isWar(Class<?> declaringClass)
+ {
+ if (declaringClass.isAnnotationPresent(Packaging.class))
+ {
+ return declaringClass.getAnnotation(Packaging.class).value().equals(PackagingType.WAR);
+ }
+ else
+ {
+ // WAR is default
+ return true;
+ }
+ }
+
+ private boolean isFullProfileOnly(String[] groups)
+ {
+ return Arrays.asList(groups).contains("javaee-full");
+ }
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
14 years, 11 months
Weld SVN: r5597 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken: exception and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:45:45 -0500 (Fri, 22 Jan 2010)
New Revision: 5597
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
Log:
port CDITCK-68 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2010-01-22 16:45:16 UTC (rev 5596)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2010-01-22 16:45:45 UTC (rev 5597)
@@ -24,8 +24,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
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;
/**
@@ -36,15 +35,13 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentFailure.class)
-@Resources({
- @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
-})
+@Extension("javax.enterprise.inject.spi.Extension")
@IntegrationTest
@SpecVersion(spec="cdi", version="20091101")
public class ProcessObserverMethodErrorTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertion(section = "11.5.9", id = "da")
public void testAddDefinitionError()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2010-01-22 16:45:16 UTC (rev 5596)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2010-01-22 16:45:45 UTC (rev 5597)
@@ -24,8 +24,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
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;
/**
@@ -37,15 +36,13 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentFailure.class)
-@Resources({
- @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
-})
+@Extension("javax.enterprise.inject.spi.Extension")
@IntegrationTest
@SpecVersion(spec="cdi", version="20091101")
public class ProcessObserverMethodExceptionTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertion(section = "11.5.9", id = "db")
public void testExceptionIsDefinitionError()
{
14 years, 11 months
Weld SVN: r5596 - 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-01-22 11:45:16 -0500 (Fri, 22 Jan 2010)
New Revision: 5596
Removed:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
Log:
port CDITCK-56 to trunk
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java 2010-01-22 16:44:39 UTC (rev 5595)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java 2010-01-22 16:45:16 UTC (rev 5596)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.definition;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class MockEntity
-{
- private Integer id;
-
- @Id
- public Integer getId() { return id; }
- public void setId(Integer id) { this.id = id; }
-}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java 2010-01-22 16:44:39 UTC (rev 5595)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockFilter.java 2010-01-22 16:45:16 UTC (rev 5596)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.definition;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-class MockFilter implements Filter
-{
-
- public void destroy()
- {
-
- }
-
- public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2) throws IOException, ServletException
- {
-
- }
-
- public void init(FilterConfig arg0) throws ServletException
- {
-
- }
-
-}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java 2010-01-22 16:44:39 UTC (rev 5595)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockHttpSessionListener.java 2010-01-22 16:45:16 UTC (rev 5596)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.definition;
-
-import javax.servlet.http.HttpSessionEvent;
-
-class MockHttpSessionListener implements javax.servlet.http.HttpSessionListener
-{
-
- public void sessionCreated(HttpSessionEvent arg0)
- {
-
- }
-
- public void sessionDestroyed(HttpSessionEvent arg0)
- {
-
- }
-
-}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java 2010-01-22 16:44:39 UTC (rev 5595)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ParameterizedClass_NotBean.java 2010-01-22 16:45:16 UTC (rev 5596)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.definition;
-
-class ParameterizedClass_NotBean<T>
-{
-
-}
\ No newline at end of file
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-01-22 16:44:39 UTC (rev 5595)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2010-01-22 16:45:16 UTC (rev 5596)
@@ -23,13 +23,10 @@
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.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
@Artifact
@SpecVersion(spec="cdi", version="20091101")
-(a)Packaging(PackagingType.EAR)
public class SimpleBeanDefinitionTest extends AbstractJSR299Test
{
14 years, 11 months
Weld SVN: r5594 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:43:33 -0500 (Fri, 22 Jan 2010)
New Revision: 5594
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
Log:
port CDITCK-74 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2010-01-22 16:43:04 UTC (rev 5593)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2010-01-22 16:43:33 UTC (rev 5594)
@@ -52,7 +52,7 @@
// is a method only on Farmer, and not LazyFarmer
observers.iterator().next().notify(egg);
assert egg.getClassesVisited().size() == 1;
- assert egg.getClassesVisited().iterator().next().equals(Farmer.class);
+ assert FarmerLocal.class.isAssignableFrom(egg.getClassesVisited().iterator().next());
}
@Test(groups = { "events", "inheritance" })
@@ -67,6 +67,6 @@
// is a method only on StockWatcher, and not IndirectStockWatcher
observers.iterator().next().notify(stockPrice);
assert stockPrice.getClassesVisited().size() == 1;
- assert stockPrice.getClassesVisited().iterator().next().equals(StockWatcher.class);
+ assert StockWatcherLocal.class.isAssignableFrom(stockPrice.getClassesVisited().iterator().next());
}
}
14 years, 11 months
Weld SVN: r5593 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:43:04 -0500 (Fri, 22 Jan 2010)
New Revision: 5593
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChickenLocal.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
Log:
port CDITCK-79 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChickenLocal.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChickenLocal.java 2010-01-22 16:42:28 UTC (rev 5592)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChickenLocal.java 2010-01-22 16:43:04 UTC (rev 5593)
@@ -19,7 +19,7 @@
import javax.ejb.Local;
@Local
-public interface AndalusianChickenLocal
+public interface AndalusianChickenLocal extends ChickenLocal
{
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2010-01-22 16:42:28 UTC (rev 5592)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2010-01-22 16:43:04 UTC (rev 5593)
@@ -43,7 +43,7 @@
public void testNonStaticProducerMethodInheritedBySpecializingSubclass()
{
assert getBeans(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
- assert getInstanceByType(Egg.class,new AnnotationLiteral<Yummy>() {}).getMother().getClass().equals(AndalusianChicken.class);
+ assert getInstanceByType(Egg.class,new AnnotationLiteral<Yummy>() {}).getMother() instanceof AndalusianChickenLocal;
}
@Test
@@ -51,7 +51,7 @@
public void testNonStaticProducerMethodNotInherited()
{
assert getBeans(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
- assert getInstanceByType(Apple.class,new AnnotationLiteral<Yummy>() {}).getTree().getClass().equals(AppleTree.class);
+ assert getInstanceByType(Apple.class,new AnnotationLiteral<Yummy>() {}).getTree() instanceof AppleTreeLocal;
}
@Test
14 years, 11 months
Weld SVN: r5592 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:42:28 -0500 (Fri, 22 Jan 2010)
New Revision: 5592
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
Log:
port WELD-307 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2010-01-22 16:41:10 UTC (rev 5591)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2010-01-22 16:42:28 UTC (rev 5592)
@@ -40,8 +40,7 @@
public class AddingPassivatingScopeTest extends AbstractJSR299Test
{
- @Test(groups="jboss-as-broken")
- // WBRI-312
+ @Test
@SpecAssertion(section="11.5.1", id="ac")
public void testAddingScopeType()
{
14 years, 11 months
Weld SVN: r5591 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken: nonPassivationCapableProducerField and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:41:10 -0500 (Fri, 22 Jan 2010)
New Revision: 5591
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
Log:
port WELD-10 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2010-01-22 16:39:43 UTC (rev 5590)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2010-01-22 16:41:10 UTC (rev 5591)
@@ -37,11 +37,10 @@
@ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
- @Test(groups = { "passivation", "ri-wrong-cause" })
+ @Test(groups = { "passivation" })
@SpecAssertions({
@SpecAssertion(section = "6.6.1", id = "db")
})
- // TODO RI is causing a deployement problem, but for the wrong reason
public void testNonPassivationCapableProducerFieldNotOk()
{
assert false;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2010-01-22 16:39:43 UTC (rev 5590)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2010-01-22 16:41:10 UTC (rev 5591)
@@ -37,11 +37,10 @@
@ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
- @Test(groups = { "passivation", "ri-wrong-cause" })
+ @Test(groups = { "passivation" })
@SpecAssertions({
@SpecAssertion(section = "6.6.4", id = "d")
})
- // TODO RI is erroring, but for the wrong reason
public void testNonPassivationCapableProducerFieldNotOk()
{
assert false;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2010-01-22 16:39:43 UTC (rev 5590)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2010-01-22 16:41:10 UTC (rev 5591)
@@ -37,12 +37,11 @@
@ExpectedDeploymentException(DeploymentFailure.class)
public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test
{
- @Test(groups = { "passivation", "ri-wrong-cause" })
+ @Test(groups = { "passivation" })
@SpecAssertions({
@SpecAssertion(section = "6.6.1", id = "cb"),
@SpecAssertion(section = "6.6.4", id = "ca")
})
- // TODO Test passes, but with wrong exception
public void testNonPassivationCapableProducerMethodNotOk()
{
assert false;
14 years, 11 months
Weld SVN: r5590 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem and 6 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:39:43 -0500 (Fri, 22 Jan 2010)
New Revision: 5590
Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/javax.enterprise.inject.spi.Extension
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/javax.enterprise.inject.spi.Extension
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/javax.enterprise.inject.spi.Extension
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java
Log:
port WELD-306 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2010-01-22 16:38:38 UTC (rev 5589)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2010-01-22 16:39:43 UTC (rev 5590)
@@ -45,8 +45,7 @@
@SpecVersion(spec="cdi", version="20091101")
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
- @Test(groups={"jboss-as-broken", "rewrite"})
- // WBRI-312
+ @Test(groups={"rewrite"})
@SpecAssertions({
@SpecAssertion(section = "11.5.2", id = "ca"),
@SpecAssertion(section = "12.2", id = "c")
@@ -55,13 +54,5 @@
{
assert false;
}
-
- // FIXME need to communicate state of container at the time of failure
- // @Override
- // @AfterClass(alwaysRun = true, groups = "scaffold")
- // public void afterClass() throws Exception
- // {
- // super.afterClass();
- // assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterBeanDiscovery observer methods should have been called";
- // }
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2010-01-22 16:38:38 UTC (rev 5589)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2010-01-22 16:39:43 UTC (rev 5590)
@@ -23,6 +23,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.Extension;
import org.testng.annotations.Test;
/**
@@ -34,26 +35,16 @@
* @author Dan Allen
*/
@Artifact
+@Extension(value="javax.enterprise.inject.spi.Extension")
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
public class AddDeploymentProblemTest extends AbstractJSR299Test
{
- @Test(groups={"rewrite", "jboss-as-broken"})
- // TODO Needs Extension stuff adding
- // WBRI-312
+ @Test(groups={"rewrite"})
@SpecAssertion(section = "11.5.3", id = "b")
public void testObserverDeploymentProblemTreatedAsDeploymentError()
{
assert false;
}
- // FIXME need to communicate state of container at the time of failure
- // @Override
- // @AfterClass(alwaysRun = true, groups = "scaffold")
- // public void afterClass() throws Exception
- // {
- // super.afterClass();
- // assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterDeploymentValidation observer methods should have been called";
- // }
-
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java 2010-01-22 16:38:38 UTC (rev 5589)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java 2010-01-22 16:39:43 UTC (rev 5590)
@@ -18,8 +18,9 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.Extension;
-class BeanDiscoveryObserver
+public class BeanDiscoveryObserver implements Extension
{
private static int invocationCount = 0;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2010-01-22 16:38:38 UTC (rev 5589)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2010-01-22 16:39:43 UTC (rev 5590)
@@ -22,6 +22,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.Extension;
import org.testng.annotations.Test;
/**
@@ -34,11 +35,10 @@
@Artifact
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
+@Extension(value="javax.enterprise.inject.spi.Extension")
public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test
{
- @Test(groups={"jboss-as-broken", "rewrite"})
- //TODO Needs Extension stuff adding
- // WBRI-312
+ @Test(groups={"rewrite"})
@SpecAssertion(section = "11.5.2", id = "g")
public void testObserverFailureTreatedAsDefinitionError()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java 2010-01-22 16:38:38 UTC (rev 5589)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java 2010-01-22 16:39:43 UTC (rev 5590)
@@ -18,8 +18,9 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
-class BeanDiscoveryObserver
+public class BeanDiscoveryObserver implements Extension
{
public void afterBeanDiscovery(@Observes AfterBeanDiscovery event)
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2010-01-22 16:38:38 UTC (rev 5589)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2010-01-22 16:39:43 UTC (rev 5590)
@@ -23,6 +23,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.Extension;
import org.testng.annotations.Test;
/**
@@ -35,14 +36,15 @@
@Artifact
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
+@Extension(value="javax.enterprise.inject.spi.Extension")
public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
{
- @Test(groups={"jboss-as-broken", "rewrite"})
- // TODO Needs Extension stuff adding
- // WBRI-312
+
+ @Test(groups={"rewrite"})
@SpecAssertion(section = "11.5.3", id = "c")
public void testObserverFailureTreatedAsDeploymentError()
{
assert false;
}
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java 2010-01-22 16:38:38 UTC (rev 5589)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java 2010-01-22 16:39:43 UTC (rev 5590)
@@ -18,8 +18,9 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.Extension;
-class BeanDiscoveryObserver
+public class BeanDiscoveryObserver implements Extension
{
public void afterDeploymentValidation(@Observes AfterDeploymentValidation event)
{
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/javax.enterprise.inject.spi.Extension
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/javax.enterprise.inject.spi.Extension (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/javax.enterprise.inject.spi.Extension 2010-01-22 16:39:43 UTC (rev 5590)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem.BeanDiscoveryObserver
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/javax.enterprise.inject.spi.Extension
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/javax.enterprise.inject.spi.Extension (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/javax.enterprise.inject.spi.Extension 2010-01-22 16:39:43 UTC (rev 5590)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver.BeanDiscoveryObserver
\ No newline at end of file
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/javax.enterprise.inject.spi.Extension
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/javax.enterprise.inject.spi.Extension (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/javax.enterprise.inject.spi.Extension 2010-01-22 16:39:43 UTC (rev 5590)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver.BeanDiscoveryObserver
\ No newline at end of file
14 years, 11 months