[jboss-cvs] JBossAS SVN: r58412 - in projects/microcontainer/trunk/kernel/src: resources/xml-test/org/jboss/test/kernel/config/test tests/org/jboss/test/kernel/config/support tests/org/jboss/test/kernel/config/test

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-11-15 12:39:14 -0500 (Wed, 15 Nov 2006)
New Revision: 58412

Modified:
   projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testConfigure.xml
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ConfigureAttributeFromStringTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ConfigureFromObjectTestCase.java
Log:
Add an enum to the bean to validate enum property handling

Modified: projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testConfigure.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testConfigure.xml	2006-11-15 17:15:29 UTC (rev 58411)
+++ projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testConfigure.xml	2006-11-15 17:39:14 UTC (rev 58412)
@@ -24,5 +24,6 @@
       <property name="adouble">3.14e12</property>
       <property name="ANumber" class="java.lang.Long">12345</property>
       <property name="overloadedProperty">StringValue</property>
+      <property name="enumProperty">StringValue</property>
    </bean>
 </deployment>

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java	2006-11-15 17:15:29 UTC (rev 58411)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java	2006-11-15 17:39:14 UTC (rev 58412)
@@ -40,6 +40,8 @@
  */
 public class SimpleBean implements Serializable
 {
+   public enum Alphabet {A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, X, Y, Z};
+
    // Constants -----------------------------------------------------
 
    private static final long serialVersionUID = 3258126972906387766L;
@@ -147,6 +149,8 @@
    
    /** Overloaded property */
    private String overloadedProperty;
+
+   private Alphabet enumProperty = Alphabet.A;
    
    // Static --------------------------------------------------------
 
@@ -616,4 +620,14 @@
    {
       throw new RuntimeException("Invoked the wrong setter");
    }
+
+   public Alphabet getEnumProperty()
+   {
+      return enumProperty;
+   }
+
+   public void setEnumProperty(Alphabet enumProperty)
+   {
+      this.enumProperty = enumProperty;
+   }
 }
\ No newline at end of file

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ConfigureAttributeFromStringTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ConfigureAttributeFromStringTestCase.java	2006-11-15 17:15:29 UTC (rev 58411)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ConfigureAttributeFromStringTestCase.java	2006-11-15 17:39:14 UTC (rev 58412)
@@ -32,6 +32,7 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.spi.config.KernelConfigurator;
 import org.jboss.test.kernel.config.support.SimpleBean;
+import org.jboss.test.kernel.config.support.SimpleBean.Alphabet;
 
 /**
  * Configuration from string Test Case.
@@ -201,7 +202,16 @@
       assertEquals(Long.class, number.getClass());
       assertEquals(value, number);
    }
-   
+
+   public void testEnum() throws Throwable
+   {
+      Alphabet value = Alphabet.Z;
+      SimpleBean bean = configureSimpleBean("enumProperty", value, Alphabet.class.getName());
+      Object evalue = bean.getEnumProperty();
+      assertEquals(Alphabet.class, evalue.getClass());
+      assertEquals(value, evalue);
+   }
+
    protected SimpleBean configureSimpleBean(String name, Object value) throws Throwable
    {
       Kernel kernel = bootstrap();

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ConfigureFromObjectTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ConfigureFromObjectTestCase.java	2006-11-15 17:15:29 UTC (rev 58411)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ConfigureFromObjectTestCase.java	2006-11-15 17:39:14 UTC (rev 58412)
@@ -35,6 +35,7 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.spi.config.KernelConfigurator;
 import org.jboss.test.kernel.config.support.SimpleBean;
+import org.jboss.test.kernel.config.support.SimpleBean.Alphabet;
 
 /**
  * Configuration from object Test Case.
@@ -68,6 +69,7 @@
       Date dateValue = createDate(2001, 1, 1);
       BigDecimal bigDecimalValue = new BigDecimal("12e4");
       BigInteger bigIntegerValue = new BigInteger("123456");
+      Alphabet enumValue = Alphabet.Z;
 
       Kernel kernel = bootstrap();
       KernelConfigurator configurator = kernel.getConfigurator();
@@ -98,6 +100,7 @@
       attributes.add(new AbstractPropertyMetaData("adouble", doubleValue));
       attributes.add(new AbstractPropertyMetaData("ANumber", longValue));
       attributes.add(new AbstractPropertyMetaData("overloadedProperty", stringValue));
+      attributes.add(new AbstractPropertyMetaData("enumProperty", enumValue));
       metaData.setProperties(attributes);
       
       configure(configurator, bean, info, metaData);
@@ -126,5 +129,6 @@
       assertEquals(Long.class, number.getClass());
       assertEquals(longValue, number);
       assertEquals(stringValue, bean.getOverloadedProperty());
+      assertEquals(enumValue, bean.getEnumProperty());
    }
 }
\ No newline at end of file