[jboss-cvs] JBossAS SVN: r59076 - in projects/microcontainer/trunk/spring-int/src: resources/xml-test/org/jboss/test/spring/test tests/org/jboss/test/spring/support tests/org/jboss/test/spring/test

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

Author: alesj
Date: 2006-12-18 08:46:12 -0500 (Mon, 18 Dec 2006)
New Revision: 59076

Modified:
   projects/microcontainer/trunk/spring-int/src/resources/xml-test/org/jboss/test/spring/test/InstantiateSpringTestCase.xml
   projects/microcontainer/trunk/spring-int/src/resources/xml-test/org/jboss/test/spring/test/TestDescribe.xml
   projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java
   projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/InstantiateSpringTestCase.java
Log:
Test - working for list, set.
Not yet for Map - see DescribeSpringTC which now fails differently - after XB snapshot update.

Modified: projects/microcontainer/trunk/spring-int/src/resources/xml-test/org/jboss/test/spring/test/InstantiateSpringTestCase.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/src/resources/xml-test/org/jboss/test/spring/test/InstantiateSpringTestCase.xml	2006-12-18 13:30:34 UTC (rev 59075)
+++ projects/microcontainer/trunk/spring-int/src/resources/xml-test/org/jboss/test/spring/test/InstantiateSpringTestCase.xml	2006-12-18 13:46:12 UTC (rev 59076)
@@ -10,9 +10,8 @@
          <value>1</value>
       </constructor-arg>
       <constructor-arg index="1">
-         <value>3.1415</value>
+         <value>3.14159</value>
       </constructor-arg>
-      <!--
          <property name="mylist">
             <list value-type="java.lang.String">
                <value>onel</value>
@@ -27,10 +26,11 @@
                <value>ones</value>
             </set>
          </property>
+      <!--
          <property name="map">
             <entry>
                <key>
-                  <value>key</value>
+                  <value>test_key</value>
                </key>
                <value>myvalue</value>
             </entry>

Modified: projects/microcontainer/trunk/spring-int/src/resources/xml-test/org/jboss/test/spring/test/TestDescribe.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/src/resources/xml-test/org/jboss/test/spring/test/TestDescribe.xml	2006-12-18 13:30:34 UTC (rev 59075)
+++ projects/microcontainer/trunk/spring-int/src/resources/xml-test/org/jboss/test/spring/test/TestDescribe.xml	2006-12-18 13:46:12 UTC (rev 59076)
@@ -3,7 +3,7 @@
 <bean xmlns="urn:jboss:spring-beans:2.0" id="testBean" class="org.jboss.test.spring.support.SimpleBean" >
    <constructor-arg index="2"><value>SpringBean</value></constructor-arg>
    <constructor-arg index="0"><value>1</value></constructor-arg>
-   <constructor-arg index="1"><value>3.1415</value></constructor-arg>
+   <constructor-arg index="1"><value>3.14159</value></constructor-arg>
    <property name="mylist">
       <list value-type="java.lang.String">
          <value>onel</value>
@@ -18,14 +18,12 @@
          <value>ones</value>
       </set>
    </property>
-<!--
    <property name="map">
       <entry>
          <key>
-            <value>key</value>
+            <value>test_key</value>
          </key>
          <value>myvalue</value>
       </entry>
    </property>
--->
 </bean>

Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java	2006-12-18 13:30:34 UTC (rev 59075)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java	2006-12-18 13:46:12 UTC (rev 59076)
@@ -49,6 +49,21 @@
       this.s = s;
    }
 
+   public int getX()
+   {
+      return x;
+   }
+
+   public double getY()
+   {
+      return y;
+   }
+
+   public String getS()
+   {
+      return s;
+   }
+
    public List getMylist()
    {
       return mylist;

Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/InstantiateSpringTestCase.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/InstantiateSpringTestCase.java	2006-12-18 13:30:34 UTC (rev 59075)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/InstantiateSpringTestCase.java	2006-12-18 13:46:12 UTC (rev 59076)
@@ -49,8 +49,16 @@
    public void testDescribe() throws Exception
    {
       SimpleBean testBean = (SimpleBean) getBean("testBean", ControllerState.INSTANTIATED);
-      // todo - test instantiation
-      System.out.println("testBean = " + testBean);
+      assertEquals(testBean.getX(), 1);
+      assertEquals(testBean.getY(), 3.14159);
+      assertEquals(testBean.getS(), "SpringBean");
+      // collections
+      assertFalse(testBean.getMylist().isEmpty());
+      assertEquals(testBean.getMylist().size(), 3);
+      assertFalse(testBean.getMyset().isEmpty());
+      assertEquals(testBean.getMyset().size(),2);
+//      assertFalse(testBean.getMymap().values().isEmpty());
+//      assertEquals(testBean.getMymap().values().size(), 1);
    }
 
 }