You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by dj...@apache.org on 2010/01/06 04:11:45 UTC
svn commit: r896315 - in /geronimo/xbean/trunk/xbean-blueprint/src/test:
java/org/apache/xbean/blueprint/context/
resources/org/apache/xbean/blueprint/context/
Author: djencks
Date: Wed Jan 6 03:11:44 2010
New Revision: 896315
URL: http://svn.apache.org/viewvc?rev=896315&view=rev
Log:
XBEAN-142 a few more test fixes
Modified:
geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java
geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/beer-xbean-null.xml
geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean-mixed.xml
geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean.xml
Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java?rev=896315&r1=896314&r2=896315&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java (original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java Wed Jan 6 03:11:44 2010
@@ -35,11 +35,15 @@
BeanMetadataImpl pints5 = (BeanMetadataImpl) reg.getComponentDefinition("pints5");
BeanMetadataImpl liter20 = (BeanMetadataImpl) reg.getComponentDefinition("liter20");
- checkPropertyValue("remaining", "1000", ml1000);
+ checkPropertyValue("remaining", "1000 ml", ml1000);
checkPropertyValue("remaining", "0", empty);
- checkPropertyValue("remaining", "8750", pints5);
- checkPropertyValue("remaining", "20000", liter20);
-
+ checkPropertyValue("remaining", "5 pints", pints5);
+ checkPropertyValue("remaining", "20 liter", liter20);
+// checkPropertyValue("remaining", "1000", ml1000);
+// checkPropertyValue("remaining", "0", empty);
+// checkPropertyValue("remaining", "8750", pints5);
+// checkPropertyValue("remaining", "20000", liter20);
+
}
protected String getPlan() {
Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/beer-xbean-null.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/beer-xbean-null.xml?rev=896315&r1=896314&r2=896315&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/beer-xbean-null.xml (original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/beer-xbean-null.xml Wed Jan 6 03:11:44 2010
@@ -20,9 +20,9 @@
<!-- START SNIPPET: xml -->
<s:blueprint xmlns:b="http://xbean.apache.org/schemas/pizza" xmlns:s="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <b:beer s:id="beerService" id="123" name="Stella"/>
+ <b:beer s:id="beerService" b:id="123" b:name="Stella"/>
- <b:beer s:id="beerService2" id="123" name="Blue Moon" source="#null"/>
+ <b:beer s:id="beerService2" b:id="123" b:name="Blue Moon" b:source="#null"/>
</s:blueprint>
<!-- END SNIPPET: xml -->
Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean-mixed.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean-mixed.xml?rev=896315&r1=896314&r2=896315&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean-mixed.xml (original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean-mixed.xml Wed Jan 6 03:11:44 2010
@@ -22,22 +22,22 @@
<b:favorite id="favoriteService">
<property name="favorites">
- <util:map>
+ <map>
<entry key="Dan" value="Grey Goose" />
<entry key="IndecisiveDan">
- <util:list>
+ <list>
<value>Malbec</value>
<bean class="java.lang.Integer">
<constructor-arg value="0"/>
</bean>
- </util:list>
+ </list>
</entry>
<entry key="WithInnerBean">
<bean class="org.apache.xbean.blueprint.example.GinService">
<property name="name" value="name"/>
</bean>
</entry>
- </util:map>
+ </map>
</property>
</b:favorite>
Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean.xml?rev=896315&r1=896314&r2=896315&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean.xml (original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/favorite-xbean.xml Wed Jan 6 03:11:44 2010
@@ -18,7 +18,7 @@
-->
<!-- START SNIPPET: xml -->
-<blueprint xmlns:s="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:b="http://xbean.apache.org/schemas/pizza">
+<s:blueprint xmlns:s="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:b="http://xbean.apache.org/schemas/pizza">
<b:favorite s:id="favoriteService">
<b:favorites>
@@ -37,6 +37,6 @@
</b:favorites>
</b:favorite>
-</blueprint>
+</s:blueprint>
<!-- END SNIPPET: xml -->