[webbeans-commits] Webbeans SVN: r1497 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy: unknown and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Feb 12 10:18:25 EST 2009
Author: dallen6
Date: 2009-02-12 10:18:25 -0500 (Thu, 12 Feb 2009)
New Revision: 1497
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
Log:
Reorganized tests with new annotations for TCK framework.
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-12 13:11:36 UTC (rev 1496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -11,6 +11,7 @@
import org.jboss.jsr299.tck.AbstractTest;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
/**
@@ -18,6 +19,7 @@
* Spec version: PRD2
*
*/
+ at Artifact
public class ClientProxyTest extends AbstractTest
{
@@ -33,34 +35,33 @@
@SpecAssertion(section = "5.4", id = "unknown")
public void testClientProxyUsedForNormalScope()
{
- deployBeans(Tuna.class);
Tuna tuna = manager.getInstanceByType(Tuna.class);
assert ConfigurationImpl.get().getBeans().isProxy(tuna);
}
@Test(groups = "configuration().getBeans()")
@SpecAssertion(section = "5.4", id = "unknown")
- public void testClientProxyNotUsedForPseudoScope()
+ public void testClientProxyNotUsedForPseudoScope() throws Exception
{
- Bean<Fox> foxBean = createSimpleBean(Fox.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- Fox fox = manager.getInstance(foxBean);
- assert !ConfigurationImpl.get().getBeans().isProxy(fox);
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ Bean<Fox> foxBean = manager.resolveByType(Fox.class).iterator().next();
+ Fox fox = manager.getInstance(foxBean);
+ assert !ConfigurationImpl.get().getBeans().isProxy(fox);
+ }
+
+ }.run();
}
@Test(groups = "configuration().getBeans()")
@SpecAssertion(section = "5.4", id = "unknown")
public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException
{
- Bean<TunedTuna> tunaBean = createSimpleBean(TunedTuna.class);
- manager.addBean(tunaBean);
+ Bean<TunedTuna> tunaBean = manager.resolveByType(TunedTuna.class).iterator().next();
TunedTuna tuna = manager.getInstance(tunaBean);
assert ConfigurationImpl.get().getBeans().isProxy(tuna);
byte[] bytes = serialize(tuna);
@@ -69,34 +70,14 @@
assert tuna.getState().equals("tuned");
}
- @Test(groups = "configuration().getBeans()", expectedExceptions = UnproxyableDependencyException.class)
- @SpecAssertion(section = "5.4.1", id = "unknown")
- public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
- {
- Bean<FinalTuna_Broken> tunaBean = createSimpleBean(FinalTuna_Broken.class);
- manager.addBean(tunaBean);
- @SuppressWarnings("unused")
- FinalTuna_Broken tuna = manager.getInstanceByType(FinalTuna_Broken.class);
- assert false;
- }
-
@Test(groups = "configuration().getBeans()")
@SpecAssertion(section = "5.4.2", id = "unknown")
public void testClientProxyInvocation()
{
- Bean<TunedTuna> tunaBean = createSimpleBean(TunedTuna.class);
- manager.addBean(tunaBean);
+ Bean<TunedTuna> tunaBean = manager.resolveByType(TunedTuna.class).iterator().next();
TunedTuna tuna = manager.getInstance(tunaBean);
assert ConfigurationImpl.get().getBeans().isProxy(tuna);
assert tuna.getState().equals("tuned");
}
- @Test(groups = "configuration().getBeans()", expectedExceptions=DefinitionException.class)
- public void testGettingUnknownBeanFails() {
- deployBeans();
- Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
- @SuppressWarnings("unused")
- Tuna tuna = manager.getInstance(tunaBean);
- }
-
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java 2009-02-12 13:11:36 UTC (rev 1496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -1,10 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.clientProxy;
-
-import javax.context.RequestScoped;
-
- at AnotherDeploymentType
- at RequestScoped
-final class FinalTuna_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java (from rev 1496, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown;
+
+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.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+ at Documented
+ at DeploymentType
+ at interface AnotherDeploymentType
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java (from rev 1496, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown;
+
+import javax.context.RequestScoped;
+
+ at AnotherDeploymentType
+ at RequestScoped
+class Tuna
+{
+
+ public String getName()
+ {
+ return "Ophir";
+ }
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown;
+
+import javax.inject.DefinitionException;
+import javax.inject.manager.Bean;
+
+import org.jboss.jsr299.tck.AbstractTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class UnknownBeanTest extends AbstractTest
+{
+ //TODO What is this trying to test, and where in the spec is the assertion?
+ @Test(groups = {"configuration().getBeans()", "broken"}, expectedExceptions=DefinitionException.class)
+ public void testGettingUnknownBeanFails() {
+// Bean<Tuna> tunaBean = manager.resolveByType(Tuna.class).iterator().next();
+// @SuppressWarnings("unused")
+// Tuna tuna = manager.getInstance(tunaBean);
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java (from rev 1496, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable;
+
+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.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+ at Documented
+ at DeploymentType
+ at interface AnotherDeploymentType
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java (from rev 1496, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable;
+
+import javax.context.RequestScoped;
+
+ at AnotherDeploymentType
+ at RequestScoped
+final class FinalTuna_Broken
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable;
+
+import javax.inject.UnproxyableDependencyException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+ at Artifact
+// TODO This test can be fixed by specifying the exception that is expected as below
+public class UnproxyableTest extends AbstractTest
+{
+ @Test(groups = { "configuration().getBeans()", "broken" }, expectedExceptions = UnproxyableDependencyException.class)
+ @SpecAssertion(section = "5.4.1", id = "unknown")
+ public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
+ {
+ @SuppressWarnings("unused")
+ FinalTuna_Broken tuna = manager.getInstanceByType(FinalTuna_Broken.class);
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the weld-commits
mailing list