Author: petemuir Date: 2010-10-30 12:41:22 -0400 (Sat, 30 Oct 2010) New Revision: 7046 Removed: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml Log: CDITCK-177 Deleted: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java 2010-10-27 10:27:47 UTC (rev 7045) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java 2010-10-30 16:41:22 UTC (rev 7046) @@ -1,47 +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 org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.test.audit.annotations.SpecAssertion; -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; - -@Artifact -@SpecVersion(spec="cdi", version="20091101") -(a)Extension(&quot;javax.enterprise.inject.spi.Extension&quot;) -@IntegrationTest -@Resources({ - @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml") -}) -public class EnterpriseBeanNotDiscoveredAsManagedBeanTest extends AbstractJSR299Test -{ - - @Test - @SpecAssertion(section="3.1.1", id="f") - public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() - { - assert !EnterpriseBeanObserver.observedEnterpriseBean; - assert EnterpriseBeanObserver.observedAnotherBean; - } - -} Deleted: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java 2010-10-27 10:27:47 UTC (rev 7045) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java 2010-10-30 16:41:22 UTC (rev 7046) @@ -1,39 +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.enterprise.event.Observes; -import javax.enterprise.inject.spi.Extension; -import javax.enterprise.inject.spi.ProcessManagedBean; - -public class EnterpriseBeanObserver implements Extension -{ - - public static boolean observedEnterpriseBean; - public static boolean observedAnotherBean; - - public void observeAnotherBean(@Observes ProcessManagedBean<Sheep> event) - { - observedAnotherBean = true; - } - - public void observeEnterpriseBean(@Observes ProcessManagedBean<MockEnterpriseBean> event) - { - observedEnterpriseBean = true; - } - -} Deleted: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java 2010-10-27 10:27:47 UTC (rev 7045) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java 2010-10-30 16:41:22 UTC (rev 7046) @@ -1,29 +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.ejb.EnterpriseBean; - -class MockEnterpriseBean implements EnterpriseBean -{ - - /** - * - */ - private static final long serialVersionUID = -2903748486907540813L; - -} 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-10-27 10:27:47 UTC (rev 7045) +++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 16:41:22 UTC (rev 7046) @@ -81,13 +81,6 @@ </methods> </class> - <!-- CDITCK-177 --> - <class name="org.jboss.jsr299.tck.tests.implementation.simple.definition.EnterpriseBeanNotDiscoveredAsManagedBeanTest"> - <methods> - <exclude name="testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean" /> - </methods> - </class> - <!-- CDITCK-178 --> <class name="org.jboss.jsr299.tck.tests.decorators.definition.DecoratorDefinitionTest"> <methods>