Author: dallen6 Date: 2009-05-05 04:43:05 -0400 (Tue, 05 May 2009) New Revision: 2651 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/beans.xml Log: Cleanup/simplification of some tests. Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java 2009-05-05 05:33:08 UTC (rev 2650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java 2009-05-05 08:43:05 UTC (rev 2651) @@ -1,43 +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.event.broken.observer10; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.testng.annotations.Test; - -/** - * Tests that an unchecked exception thrown from a non-transactional - * observer is rethrown. - * - * @author David Allen - * - */ -@Artifact -public class ObserverExceptionRethrown extends AbstractJSR299Test -{ - @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class }) - @SpecAssertion(section = "7.5.8", id = "q") - public void testNonTransactionalObserverThrowsNonCheckedExceptionIsRethrown() - { - getCurrentManager().fireEvent("Another event"); - } - - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java 2009-05-05 08:43:05 UTC (rev 2651) @@ -0,0 +1,43 @@ +/* + * 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.event.broken.observer10; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * Tests that an unchecked exception thrown from a non-transactional + * observer is rethrown. + * + * @author David Allen + * + */ +@Artifact +public class ObserverExceptionRethrownTest extends AbstractJSR299Test +{ + @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class }) + @SpecAssertion(section = "7.5.8", id = "q") + public void testNonTransactionalObserverThrowsNonCheckedExceptionIsRethrown() + { + getCurrentManager().fireEvent("Another event"); + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 05:33:08 UTC (rev 2650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 08:43:05 UTC (rev 2651) @@ -6,8 +6,6 @@ import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -15,17 +13,15 @@ import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class}) +@Classes( { TestBindingType.class }) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class MultipleDeclarationTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4", id="h") - }) - public void testMultipleDeclaration() - { - assert false; - } +public class MultipleDeclarationTest extends AbstractJSR299Test +{ + @Test + @SpecAssertions( { @SpecAssertion(section = "9.4", id = "h") }) + public void testMultipleDeclaration() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 05:33:08 UTC (rev 2650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 08:43:05 UTC (rev 2651) @@ -5,9 +5,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -15,17 +13,15 @@ import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class}) +@Classes( { TestInterceptorBindingType.class }) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class MultipleDeclarationTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4", id="h") - }) - public void testMultipleDeclaration() - { - assert false; - } +public class MultipleDeclarationTest extends AbstractJSR299Test +{ + @Test + @SpecAssertions( { @SpecAssertion(section = "9.4", id = "h") }) + public void testMultipleDeclaration() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 05:33:08 UTC (rev 2650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 08:43:05 UTC (rev 2651) @@ -5,8 +5,6 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; @@ -15,17 +13,15 @@ import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class}) +@Classes( { TestStereotype.class }) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class MultipleDeclarationTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4", id="h") - }) - public void testMultipleDeclaration() - { - assert false; - } +public class MultipleDeclarationTest extends AbstractJSR299Test +{ + @Test + @SpecAssertions( { @SpecAssertion(section = "9.4", id = "h") }) + public void testMultipleDeclaration() + { + assert false; + } } Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/beans.xml 2009-05-05 05:33:08 UTC (rev 2650) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/beans.xml 2009-05-05 08:43:05 UTC (rev 2651) @@ -3,12 +3,6 @@ <dd:TestBindingType> <BindingType /> </dd:TestBindingType> - <dd:TestInterceptorBindingType> - <InterceptorBindingType /> - </dd:TestInterceptorBindingType> - <dd:TestStereotype> - <Stereotype /> - </dd:TestStereotype> <dd:TestBindingType> <BindingType /> </dd:TestBindingType> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/beans.xml 2009-05-05 05:33:08 UTC (rev 2650) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/beans.xml 2009-05-05 08:43:05 UTC (rev 2651) @@ -1,14 +1,8 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> - <BindingType /> - </dd:TestBindingType> <dd:TestInterceptorBindingType> <InterceptorBindingType /> </dd:TestInterceptorBindingType> - <dd:TestStereotype> - <Stereotype /> - </dd:TestStereotype> <dd:TestInterceptorBindingType> <InterceptorBindingType /> </dd:TestInterceptorBindingType> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/beans.xml 2009-05-05 05:33:08 UTC (rev 2650) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/beans.xml 2009-05-05 08:43:05 UTC (rev 2651) @@ -1,11 +1,5 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> - <BindingType /> - </dd:TestBindingType> - <dd:TestInterceptorBindingType> - <InterceptorBindingType /> - </dd:TestInterceptorBindingType> <dd:TestStereotype> <Stereotype /> </dd:TestStereotype>