You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/05/14 22:00:01 UTC

svn commit: r774902 - in /jackrabbit/trunk: jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java

Author: jukka
Date: Thu May 14 20:00:01 2009
New Revision: 774902

URL: http://svn.apache.org/viewvc?rev=774902&view=rev
Log:
JCR-1591: JSR 283: NodeType Management

The testns1:stringProperty used to be multivalued. Change it back to avoid test failures.

Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java

Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml?rev=774902&r1=774901&r2=774902&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml Thu May 14 20:00:01 2009
@@ -184,7 +184,7 @@
     </propertyDefinition>
     <propertyDefinition name="testns1:stringProperty"
                  requiredType="String" autoCreated="false" mandatory="false"
-                 onParentVersion="IGNORE" protected="false" multiple="false"
+                 onParentVersion="IGNORE" protected="false" multiple="true"
                  isFullTextSearchable="false" isQueryOrderable="false">
       <valueConstraints>
         <valueConstraint>bananas?</valueConstraint>

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java?rev=774902&r1=774901&r2=774902&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java Thu May 14 20:00:01 2009
@@ -336,8 +336,10 @@
                     for (int j = 0; j < values.length; j++) {
 
                         if (!def.isMultiple()) {
-                            assertEquals("Single-valued properties must not " +
-                                    "have more than one default value.",
+                            assertEquals(
+                                    "Single-valued property "
+                                    + type.getName() +"/" + def.getName()
+                                    + " must not have more than one default value.",
                                     1, values.length);
                         }
                     }