[webbeans-commits] Webbeans SVN: r3141 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition and 6 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Wed Jul 22 13:20:07 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-07-22 13:20:05 -0400 (Wed, 22 Jul 2009)
New Revision: 3141

Removed:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/broken/newAndOtherBindingType/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Review more tests

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java	2009-07-22 17:06:33 UTC (rev 3140)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java	2009-07-22 17:20:05 UTC (rev 3141)
@@ -55,9 +55,8 @@
     * The request context is destroyed at the end of the servlet request, after
     * the Servlet service() method returns.
     */
-   @Test(groups = { "contexts", "servlet", "integration" })
-   //@SpecAssertion(section = "6.7.1", id = "ba")
-   @SpecAssertion(section="unknown", id="unknown")
+   @Test(groups = { "contexts", "servlet", "integration", "review" })
+   @SpecAssertion(section="6.7.1", id="baa")
    // TODO Need to tidy this one up, make it actually check that the context is active til after the service method ends
    public void testRequestScopeIsDestroyedAfterServletRequest() throws Exception
    {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java	2009-07-22 17:06:33 UTC (rev 3140)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java	2009-07-22 17:20:05 UTC (rev 3141)
@@ -5,7 +5,6 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.deployment.Production;
 import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
@@ -151,15 +150,6 @@
    }
 
    @Test(groups = "producerField")
-   @SpecAssertion(section = "3.4.2", id = "review")
-   public void testDeploymentType()
-   {
-      Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL);
-      assert !tarantulaBeans.isEmpty();
-      Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next();
-   }
-
-   @Test(groups = "producerField")
    @SpecAssertions({
       @SpecAssertion(section = "3.4.2", id = "c"),
       @SpecAssertion(section="2.5.1", id = "c")

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java	2009-07-22 17:06:33 UTC (rev 3140)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java	2009-07-22 17:20:05 UTC (rev 3141)
@@ -1,32 +0,0 @@
-package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-/**
- * Spec version: 20090625
- */
- at Artifact
- at Packaging(PackagingType.EAR)
- at BeansXml("beans.xml")
-public class InvalidEnterpriseBeanSpecializationTest extends AbstractJSR299Test
-{
-   @Test(groups={"stub", "specialization"})
-   @SpecAssertion(section="3.2.4", id = "review") // removed from spec?
-   public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean()
-   {
-      assert false;
-   }
-   
-   @Test(groups={"stub", "specialization"})
-   @SpecAssertion(section="3.2.4", id = "review") // removed from spec?
-   public void testSpecializingBeanDoesNotSupportLocalInterfaceView()
-   {
-      assert false;
-   }
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java	2009-07-22 17:06:33 UTC (rev 3140)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java	2009-07-22 17:20:05 UTC (rev 3141)
@@ -43,7 +43,7 @@
    }
 
    @Test
-   @SpecAssertion(section = "unknown", id = "unknown")
+   @SpecAssertion(section = "5.5", id = "c")
    public void testSimpleBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException
    {
       TunedTuna tuna = getInstanceByType(TunedTuna.class);

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java	2009-07-22 17:06:33 UTC (rev 3140)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java	2009-07-22 17:20:05 UTC (rev 3141)
@@ -53,9 +53,9 @@
       assert injectionPoint.getPaymentProcessor() instanceof Instance;
    }
    
-   @Test(groups = "ri-broken")
+   @Test(groups = {"ri-broken", "review"})
    @SpecAssertions({
-      @SpecAssertion(section = "5.7", id ="review"),
+      @SpecAssertion(section = "5.7", id ="ba"),
       @SpecAssertion(section = "5.7", id ="ca"),
       @SpecAssertion(section = "5.7.1", id ="ab"),
       @SpecAssertion(section = "5.7.1", id ="ba")

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java	2009-07-22 17:06:33 UTC (rev 3140)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java	2009-07-22 17:20:05 UTC (rev 3141)
@@ -3,7 +3,6 @@
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Current;
-import javax.enterprise.inject.deployment.Standard;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
@@ -52,14 +51,6 @@
       Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next();
       assert beanManager.getScopeType().equals(Dependent.class);
    }
-   
-   @Test(groups = {"deployment"})
-   @SpecAssertion(section = "11.3", id = "review") // deployment types removed from spec   
-   public void testManagerBeanHasStandardDeployment()
-   {
-      Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next();      
-      assert beanManager.getDeploymentType().equals(Standard.class);
-   }
 
    @Test
    @SpecAssertion(section = "11.3", id = "a")

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-22 17:06:33 UTC (rev 3140)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-22 17:20:05 UTC (rev 3141)
@@ -1901,9 +1901,15 @@
       <text>Client proxies are never required for a bean whose scope is a pseudo-scope such as |@Dependent|</text>
     </assertion>
 
-    <assertion id="b">
+    <assertion id="b" testable="false">
       <text>Client proxies are used for normal scoped beans</text>
+      <note>This is a statement of intent</note>
     </assertion>
+    
+    <assertion id="c" implied="true">
+      <text>Client proxies are serializable</text>
+      <note>For "client proxies are may be passivated, even when the bean itself may not be. Therefore the container must use a client proxy whenever a bean with normal scope is injected into a bean with a passivating scope" to hold true the client proxy must be serializable</note>
+    </assertion>
 
     <assertion id="d">
       <text>The container must guarantee that when any valid injected reference to a bean of normal scope is invoked, the invocation is always processed by the current instance of the injected bean.</text>




More information about the weld-commits mailing list