[webbeans-commits] Webbeans SVN: r1619 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two and 5 other directories.

Saturday, 21 February 2009

Author: pete.muir(a)jboss.org
Date: 2009-02-21 15:20:44 -0500 (Sat, 21 Feb 2009)
New Revision: 1619

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml
Removed:
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java
Modified:
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
  
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Covert injection tests to @Artifact, minor fix for a couple of specialization tests

Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java	2009-02-21
12:55:15 UTC (rev 1618)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -3,13 +3,14 @@
 import javax.inject.DefinitionException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
 import org.jboss.jsr299.tck.impl.packaging.Artifact;
 import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
 import org.testng.annotations.Test;
 
 @Artifact
 @ExpectedDeploymentException(DefinitionException.class)
-public class SpecializingBeanExtendsEnterpriseBeanTest
+public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractDeclarativeTest
 {
    @Test(groups = { "specialization" })
    @SpecAssertion(section = "3.2.7", id = "a")

Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java	2009-02-21
12:55:15 UTC (rev 1618)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -3,13 +3,14 @@
 import javax.inject.InconsistentSpecializationException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
 import org.jboss.jsr299.tck.impl.packaging.Artifact;
 import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
 import org.testng.annotations.Test;
 
 @Artifact
 @ExpectedDeploymentException(InconsistentSpecializationException.class)
-public class TwoSpecializingBeansForOneSpecializedTest
+public class TwoSpecializingBeansForOneSpecializedTest extends AbstractDeclarativeTest
 {
    @Test
    @SpecAssertion(section="4.3.3", id="a")

Deleted:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java	2009-02-21
12:55:15 UTC (rev 1618)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.injection;
-
-import javax.inject.Current;
-
-class BeanWithFinalBoundField_Broken
-{
-   
-   @Current
-   public final Tuna tuna = null;
-   
-}

Deleted:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java	2009-02-21
12:55:15 UTC (rev 1618)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.injection;
-
-import javax.inject.Current;
-
-class BeanWithStaticBoundField_Broken
-{
-   
-   @Current
-   public static Tuna tuna;
-   
-}

Deleted:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java	2009-02-21
12:55:15 UTC (rev 1618)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -1,13 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.injection;
-
-import javax.inject.Produces;
-
-class FarmHouseProducer_Broken
-{
-   
-   @Produces public Integer getNumberOfBedrooms()
-   {
-      return null;
-   }
-   
-}

Deleted:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java	2009-02-21
12:55:15 UTC (rev 1618)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.injection;
-
-import javax.inject.Current;
-
-class FarmHouse_Broken
-{
-
-   @Current
-   public int noOfBedrooms;
-   
-}

Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java	2009-02-21
12:55:15 UTC (rev 1618)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -1,16 +1,12 @@
 package org.jboss.jsr299.tck.unit.lookup.injection;
 
-import java.lang.annotation.Annotation;
-import java.util.List;
-
 import javax.context.ContextNotActiveException;
 import javax.inject.DefinitionException;
-import javax.inject.NullableDependencyException;
-import javax.inject.manager.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.jboss.jsr299.tck.impl.util.MockCreationalContext;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
 /**
@@ -18,45 +14,27 @@
  * Spec version: PRD2
  *
  */
+@Artifact
+(a)BeansXml(&quot;beans.xml&quot;)
 public class InjectionTest extends AbstractDeclarativeTest
 {
-   
-   @Override
-   protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
-   {
-      List<Class<? extends Annotation>> deploymentTypes =
super.getStandardDeploymentTypes();
-      deploymentTypes.add(AnotherDeploymentType.class);
-      return deploymentTypes;
-   }
 
    @Test(groups = { "injection", "producerMethod" })
    @SpecAssertion(section = "5.2", id = "aa")
    public void testInjectionPerformsBoxingIfNecessary() throws Exception
    {
-      Bean<SpiderProducer> spiderProducer =
createSimpleBean(SpiderProducer.class);
-      getCurrentManager().addBean(spiderProducer);
-      Bean<SpiderNest> spiderNestBean = createSimpleBean(SpiderNest.class);
-     
getCurrentManager().addBean(createProducerMethodBean(SpiderProducer.class.getMethod("getWolfSpiderSize"),
spiderProducer));
-      SpiderNest spiderNest = spiderNestBean.create(new
MockCreationalContext<SpiderNest>());
+      assert getCurrentManager().resolveByType(SpiderNest.class).size() == 1;
+      SpiderNest spiderNest = getCurrentManager().getInstanceByType(SpiderNest.class);
       assert spiderNest.numberOfSpiders != null;
       assert spiderNest.numberOfSpiders.equals(4);
    }
 
-   @Test(groups = { "injection", "producerMethod" },
expectedExceptions = NullableDependencyException.class)
-   @SpecAssertion(section = "5.2", id = "a")
-   public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception
-   {
-      deployBeans(FarmHouseProducer_Broken.class, FarmHouse_Broken.class);
-   }
-
    @Test(groups = { "injection", "clientProxy" }, expectedExceptions
= ContextNotActiveException.class)
    @SpecAssertion(section = "5.3", id = "a")
    public void testInvokeNormalInjectedWebBeanWhenContextNotActive()
    {
-      Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
-      Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
-      getCurrentManager().addBean(tunaBean);
-      TunaFarm tunaFarm = tunaFarmBean.create(new
MockCreationalContext<TunaFarm>());
+      assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1;
+      TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class);
       assert tunaFarm.tuna != null;
      
getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext());
       tunaFarm.tuna.getName();
@@ -66,37 +44,14 @@
    @SpecAssertion(section = "5.3", id = "b")
    public void testInvokeDependentScopeWhenContextNotActive()
    {
-      Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class);
-      Bean<Fox> foxBean = createSimpleBean(Fox.class);
-      getCurrentManager().addBean(foxBean);
-      FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>());
+      assert getCurrentManager().resolveByType(FoxRun.class).size() == 1;
+      FoxRun foxRun = getCurrentManager().getInstanceByType(FoxRun.class);
       assert foxRun.fox.getName().equals("gavin");
    }
-
-   @Test(groups = "injection", expectedExceptions = DefinitionException.class)
-   @SpecAssertion(section = "outdated", id = "outdated")
-   public void testInjectingStaticField()
-   {
-      Bean<BeanWithStaticBoundField_Broken> bean =
createSimpleBean(BeanWithStaticBoundField_Broken.class);
-      Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
-      getCurrentManager().addBean(tunaBean);
-      bean.create(new MockCreationalContext<BeanWithStaticBoundField_Broken>());
-   }
-
-   @Test(groups = "injection", expectedExceptions = DefinitionException.class)
-   @SpecAssertion(section = "outdated", id = "outdated")
-   public void testInjectingFinalField()
-   {
-      Bean<BeanWithFinalBoundField_Broken> bean =
createSimpleBean(BeanWithFinalBoundField_Broken.class);
-      Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
-      getCurrentManager().addBean(tunaBean);
-      bean.create(new MockCreationalContext<BeanWithFinalBoundField_Broken>());
-   }
    
    @Test @SpecAssertion(section="4.2", id = "a")
    public void testFieldDeclaredInSuperclassInjected() throws Exception
    {
-      deployBeans(Fox.class, DeluxeHenHouse.class, HenHouse.class);
       
       new RunInDependentContext()
       {

Copied:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java
(from rev 1612,
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java)
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java	
                       (rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean;
+
+import javax.inject.Produces;
+
+class FarmHouseProducer_Broken
+{
+   
+   @Produces public Integer getNumberOfBedrooms()
+   {
+      return null;
+   }
+   
+}

Copied:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java
(from rev 1612,
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java)
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java	
                       (rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean;
+
+import javax.inject.Current;
+
+class FarmHouse_Broken
+{
+
+   @Current
+   public int noOfBedrooms;
+   
+}

Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java	
                       (rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java	2009-02-21
20:20:44 UTC (rev 1619)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean;
+
+import javax.inject.NullableDependencyException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(NullableDependencyException.class)
+public class NullableBeanTest extends AbstractDeclarativeTest
+{
+   
+
+   @Test(groups = { "injection", "producerMethod" })
+   @SpecAssertion(section = "5.2", id = "a")
+   public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception
+   {
+      assert false;
+   }
+   
+}


Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml
===================================================================
---
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml	   
                    (rev 0)
+++
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml	2009-02-21
20:20:44 UTC (rev 1619)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+       xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.injection"> 
+   <Deploy>
+      <Standard />
+      <Production />
+      <test:AnotherDeploymentType />
+   </Deploy>
+</Beans>


Property changes on:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================

--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-02-21 12:55:15 UTC (rev 1618)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-02-21 20:20:44 UTC (rev 1619)
@@ -1935,8 +1935,15 @@
       <text>An injected field is a non-static, non-final field of a bean
class.</text>
     </assertion>
     
+    <assertion id="a">
+      <text>An injected field is a non-static, non-final field of a bean
class.</text>
+    </assertion>
+    
+    
+    
     <assertion id="b">
       <text>An injected field is a non-static, non-final field of a
servlet.</text>
+      <note>Test needs to check that static and final fields aren't injected
and also that no exception is thrown when you have them</note>
     </assertion>
     
     <assertion id="c">


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

[webbeans-commits] Webbeans SVN: r1619 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two and 5 other directories.