[webbeans-commits] Webbeans SVN: r2456 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/resource/constant and 3 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Fri Apr 17 05:17:05 EDT 2009


Author: dallen6
Date: 2009-04-17 05:17:05 -0400 (Fri, 17 Apr 2009)
New Revision: 2456

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
Log:
Additional test for injection of an environment entry as resource.

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java	2009-04-17 09:17:05 UTC (rev 2456)
@@ -0,0 +1,38 @@
+package org.jboss.jsr299.tck.tests.xml.resource.constant;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.WAR)
+ at IntegrationTest
+ at Resources({
+   @Resource(source="web.xml", destination="WEB-INF/web.xml")
+})
+ at BeansXml("beans.xml")
+public class InjectionOfPrimitiveResourceTest extends AbstractJSR299Test
+{
+   @Test(groups = { "xml", "broken" })
+   @SpecAssertions( { 
+      @SpecAssertion(section = "6.9", id = "f"), 
+      @SpecAssertion(section = "3.6", id = "a"),
+      @SpecAssertion(section = "3.6", id = "f"),
+      @SpecAssertion(section = "3.6.1", id = "a"),
+      @SpecAssertion(section = "3.6.1", id = "f")
+   })
+   public void testInjectionOfSimpleResource()
+   {
+      SimpleBean bean = getCurrentManager().getInstanceByType(SimpleBean.class);
+      assert bean.getInjectedCode() != null : "Integer code was not injected into bean";
+      assert bean.getInjectedCode() == 42 : "Wrong code value injected into bean";
+   }
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java	2009-04-17 09:17:05 UTC (rev 2456)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.xml.resource.constant;
+
+public class SimpleBean
+{
+   private Integer injectedCode = null;
+
+   public Integer getInjectedCode()
+   {
+      return injectedCode;
+   }
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java	2009-04-17 09:03:46 UTC (rev 2455)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java	2009-04-17 09:17:05 UTC (rev 2456)
@@ -49,7 +49,10 @@
    @Test(groups = { "xml", "broken" })
    @SpecAssertions( { 
       @SpecAssertion(section = "6.9", id = "i"), 
-      @SpecAssertion(section = "3.6", id = "d")
+      @SpecAssertion(section = "3.6", id = "d"),
+      @SpecAssertion(section = "3.6", id = "i"),
+      @SpecAssertion(section = "3.6.1", id = "d"),
+      @SpecAssertion(section = "3.6.1", id = "i")
    })
    public void testEjbInjectionByXml()
    {

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml (from rev 2453, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml	2009-04-17 09:17:05 UTC (rev 2456)
@@ -0,0 +1,12 @@
+<Beans xmlns="urn:java:ee"
+       xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.resource.ejb"> 
+   <Deploy>
+      <Standard />
+      <Production />
+   </Deploy>
+   <test:SimpleBean>
+      <Resource>
+         <name>AnswerToLife</name>
+      </Resource>
+   </test:SimpleBean>
+</Beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml (from rev 2453, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml	2009-04-17 09:17:05 UTC (rev 2456)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <description>Test servlets used to test session contexts.</description>
+ <display-name>Session Context Tests</display-name>
+ 
+ <!-- resource-ref>
+    <res-ref-name>AnswerToLife</res-ref-name>
+    <res-type>java.lang.Integer</res-type>
+    <mapped-name>constants/AnswerToLife</mapped-name>
+ </resource-ref -->
+  
+  <env-entry>
+     <env-entry-name>AnswerToLife</env-entry-name>
+     <env-entry-type>java.lang.Integer</env-entry-type>
+     <env-entry-value>42</env-entry-value>
+     <mapped-name>constants/AnswerToLife</mapped-name>
+  </env-entry>
+
+ <session-config>
+  <session-timeout>10</session-timeout>
+ </session-config>
+ <login-config>
+  <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
\ No newline at end of file




More information about the weld-commits mailing list