9:07 a.m.
Author: dallen6
Date: 2009-02-06 10:07:43 -0500 (Fri, 06 Feb 2009)
New Revision: 1428
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BeanWithTooManyDeploymentTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
Log:
Changed some tests to use the new test deployment framework.
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-06
14:49:37 UTC (rev 1427)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -72,7 +72,6 @@
assert
manager.resolveByType(RedSnapper.class).iterator().next().getDeploymentType().equals(Production.class);
}
- @SuppressWarnings("unchecked")
@Test(groups = "producerMethod")
@SpecAssertion(section = "5.2", id = "unknown")
public void testIsNullable() throws Exception
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-06
14:49:37 UTC (rev 1427)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -11,12 +11,14 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
import org.jboss.webbeans.tck.SpecAssertions;
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
import org.jboss.webbeans.tck.literals.CurrentBinding;
import org.testng.annotations.Test;
/**
* Spec version: PRD2
*/
+@Artifact
public class BindingDefinitionTest extends AbstractTest
{
@@ -32,7 +34,6 @@
@SpecAssertions( { @SpecAssertion(section = "2.3.3", id =
"unknown"), @SpecAssertion(section = "2.3.1", id =
"unknown") })
public void testDefaultBindingDeclaredInJava()
{
- deployBeans(Order.class);
Bean<Order> order = manager.resolveByType(Order.class).iterator().next();
assert order.getBindings().size() == 1;
order.getBindings().iterator().next().annotationType().equals(Production.class);
@@ -62,7 +63,6 @@
@SpecAssertion(section = "2.3.2", id = "unknown")
public void testBindingDeclaresBindingAnnotation()
{
- deployBeans(SpiderProducer.class);
assert !manager.resolveByType(Tarantula.class, new TameBinding()).isEmpty();
}
@@ -70,7 +70,6 @@
@SpecAssertion(section = "2.3.3", id = "unknown")
public void testBindingsDeclaredInJava()
{
- deployBeans(Cat.class);
Bean<Cat> cat = manager.resolveByType(Cat.class, new
SynchronousBinding()).iterator().next();
assert cat.getBindings().size() == 1;
assert cat.getBindings().contains(new SynchronousBinding());
@@ -80,7 +79,6 @@
@SpecAssertion(section = "2.3.3", id = "unknown")
public void testMultipleBindings()
{
- deployBeans(Cod.class);
Bean<?> model = manager.resolveByType(Cod.class, new ChunkyBinding(true), new
WhitefishBinding()).iterator().next();
assert model.getBindings().size() == 2;
}
@@ -143,7 +141,6 @@
@SpecAssertions( { @SpecAssertion(section = "2.3.4", id =
"unknown"), @SpecAssertion(section = "2.3.1", id =
"unknown") })
public void testDefaultBindingDeclaredInXml()
{
- deployBeans(Tuna.class);
Bean<?> model = manager.resolveByType(Tuna.class).iterator().next();
assert model.getBindings().size() == 1;
assert model.getBindings().contains(new CurrentBinding());
@@ -154,7 +151,6 @@
@SpecAssertion(section = "2.3.5", id = "unknown")
public void testFieldInjectedFromProducerMethod() throws Exception
{
- deployBeans(SpiderProducer.class, Barn.class);
Barn barn = manager.resolveByType(Barn.class).iterator().next().create(new
MockCreationalContext<Barn>());
assert barn.petSpider != null;
assert barn.petSpider instanceof DefangedTarantula;
@@ -177,7 +173,6 @@
@Test(groups = { "injection", "producerMethod" })
public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws
Exception
{
- deployBeans(SpiderProducer.class);
Spider spider = manager.resolveByType(Spider.class).iterator().next().create(new
MockCreationalContext<Spider>());
assert spider != null;
assert spider instanceof DefangedTarantula;
@@ -201,7 +196,6 @@
@SpecAssertion(section = "4.1", id = "unknown")
public void testBindingDeclaredInheritedIsInherited() throws Exception
{
- deployBeans(BorderCollie.class);
Set<? extends Annotation> bindings =
manager.resolveByType(BorderCollie.class, new
HairyBinding(false)).iterator().next().getBindings();
assert bindings.size() == 1;
assert bindings.iterator().next().annotationType().equals(Hairy.class);
@@ -211,7 +205,6 @@
@SpecAssertion(section = "4.1", id = "unknown")
public void testBindingNotDeclaredInheritedIsNotInherited()
{
- deployBeans(ShetlandPony.class);
Set<? extends Annotation> bindings =
manager.resolveByType(ShetlandPony.class).iterator().next().getBindings();
assert bindings.size() == 1;
assert bindings.iterator().next().annotationType().equals(Current.class);
@@ -221,7 +214,6 @@
@SpecAssertion(section = "4.1", id = "unknown")
public void testBindingDeclaredInheritedIsBlockedByIntermediateClass()
{
- deployBeans(ClippedBorderCollie.class);
Set<? extends Annotation> bindings =
manager.resolveByType(ClippedBorderCollie.class, new
HairyBinding(true)).iterator().next().getBindings();
assert bindings.size() == 1;
Annotation binding = bindings.iterator().next();
Deleted:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java 2009-02-06
14:49:37 UTC (rev 1427)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.tck.unit.definition.deployment;
-
-import javax.inject.Production;
-
-@Production
-@AnotherDeploymentType
-class BeanWithTooManyDeploymentTypes_Broken
-{
-
-}
Deleted:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-02-06
14:49:37 UTC (rev 1427)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.tck.unit.definition.deployment;
-
-import javax.inject.DeploymentException;
-
-import org.jboss.webbeans.tck.AbstractTest;
-import org.jboss.webbeans.tck.SpecAssertion;
-import org.testng.annotations.Test;
-
-/**
- *
- * Spec version: PRD2
- */
-public class BrokenDeploymentTypeTest extends AbstractTest
-{
-
- @SuppressWarnings("unchecked")
- @Test(expectedExceptions=DeploymentException.class, groups="broken")
- @SpecAssertion(section="2.5.6", id = "unknown")
- public void testStandardMustBeDeclared()
- {
-
- //manager =
configuration().getContainers().deploy(Arrays.asList(AnotherDeploymentType.class,
HornedAnimalDeploymentType.class), Dog.class);
- }
-
-
-}
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-06
14:49:37 UTC (rev 1427)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -12,6 +12,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
import org.jboss.webbeans.tck.SpecAssertions;
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
/**
@@ -19,6 +20,7 @@
* Spec version: Public Release Draft 2
*
*/
+//@Artifact
public class DeploymentTypeDefinitionTest extends AbstractTest
{
@@ -84,18 +86,6 @@
}
/**
- * An bean class or producer method or field may specify at most one
- * deployment type. If multiple deployment type annotations are specified, a
- * DefinitionException is thrown by the container at deployment time.
- */
- @Test(groups = { "deploymentType" }, expectedExceptions =
DefinitionException.class)
- @SpecAssertion(section = "2.5.3", id = "unknown")
- public void testTooManyDeploymentTypes()
- {
- deployBeans(BeanWithTooManyDeploymentTypes_Broken.class);
- }
-
- /**
* By default, if no deployment type annotation is explicitly specified, a
* producer method or field inherits the deployment type of the bean in which
* it is defined.
Copied:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/AnotherDeploymentType.java
(from rev 1425,
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/AnotherDeploymentType.java)
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/AnotherDeploymentType.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/AnotherDeploymentType.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.unit.definition.deployment.broken;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@Inherited
+@interface AnotherDeploymentType
+{
+
+}
\ No newline at end of file
Copied:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BeanWithTooManyDeploymentTypes_Broken.java
(from rev 1425,
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BeanWithTooManyDeploymentTypes_Broken.java)
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BeanWithTooManyDeploymentTypes_Broken.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BeanWithTooManyDeploymentTypes_Broken.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.unit.definition.deployment.broken;
+
+import javax.inject.Production;
+
+@Production
+@AnotherDeploymentType
+class BeanWithTooManyDeploymentTypes_Broken
+{
+
+}
Copied:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java
(from rev 1425,
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java)
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -0,0 +1,26 @@
+package org.jboss.webbeans.tck.unit.definition.deployment.broken;
+
+import javax.inject.DeploymentException;
+
+import org.jboss.webbeans.tck.AbstractTest;
+import org.jboss.webbeans.tck.SpecAssertion;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: PRD2
+ */
+public class BrokenDeploymentTypeTest extends AbstractTest
+{
+
+ @SuppressWarnings("unchecked")
+ @Test(expectedExceptions=DeploymentException.class, groups="broken")
+ @SpecAssertion(section="2.5.6", id = "unknown")
+ public void testStandardMustBeDeclared()
+ {
+
+ //manager =
configuration().getContainers().deploy(Arrays.asList(AnotherDeploymentType.class,
HornedAnimalDeploymentType.class), Dog.class);
+ }
+
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java 2009-02-06
15:07:43 UTC (rev 1428)
@@ -0,0 +1,46 @@
+/*
+ * 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.webbeans.tck.unit.definition.deployment.broken;
+
+import javax.inject.DefinitionException;
+
+import org.jboss.webbeans.tck.AbstractTest;
+import org.jboss.webbeans.tck.SpecAssertion;
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+import org.jboss.webbeans.tck.impl.packaging.Classes;
+import org.testng.annotations.Test;
+
+/**
+ * Single test for a bean with too many deployment types.
+ */
+//@Artifact(addCurrentPackage=false)
+//@Classes(value = { BeanWithTooManyDeploymentTypes_Broken.class })
+public class TooManyDeploymentTypesTest extends AbstractTest
+{
+ /**
+ * An bean class or producer method or field may specify at most one
+ * deployment type. If multiple deployment type annotations are specified, a
+ * DefinitionException is thrown by the container at deployment time.
+ */
+ @Test(groups = { "deploymentType", "broken" }, expectedExceptions
= DefinitionException.class)
+ @SpecAssertion(section = "2.5.3", id = "unknown")
+ public void testTooManyDeploymentTypes()
+ {
+ }
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain