jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1484705 - in /jackrabbit/branches/2.6: ./ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyStringTest.java jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyValueTest.java
Date Tue, 21 May 2013 09:02:22 GMT
Author: jukka
Date: Tue May 21 09:02:21 2013
New Revision: 1484705

URL: http://svn.apache.org/r1484705
Log:
2.6: Merged revision 1460995 (JCR-3543)

Modified:
    jackrabbit/branches/2.6/   (props changed)
    jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyStringTest.java
    jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyValueTest.java

Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1460995

Modified: jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyStringTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyStringTest.java?rev=1484705&r1=1484704&r2=1484705&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyStringTest.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyStringTest.java
Tue May 21 09:02:21 2013
@@ -307,25 +307,6 @@ public class SetPropertyStringTest exten
     }
 
     /**
-     * Tests if <code>Node.setProperty(String, String[])</code> throws a {@link
-     * javax.jcr.ValueFormatException} when trying to set an existing
-     * single-valued property to a multi-value
-     */
-    public void testSetSingleStringArrayValueFormatException() throws Exception {
-        // prerequisite: existing single-valued STRING property
-        if (!testNode.hasProperty(propertyName1)) {
-            testNode.setProperty(propertyName1, s1);
-            testNode.getParent().save();
-        }
-
-        try {
-            testNode.setProperty(propertyName1, sArray1);
-            fail("setProperty(singleValueProperty, String[]) not throwing a ValueFormatException");
-        } catch (ValueFormatException success) {
-        }
-    }
-
-    /**
      * Tests if removing a <code>String[]</code> property with
      * <code>Node.setProperty(String, null)</code> works with
      * <code>Session.save()</code>
@@ -421,25 +402,6 @@ public class SetPropertyStringTest exten
     }
 
     /**
-     * Tests if <code>Node.setProperty(String, String[], int)</code> throws a
-     * {@link javax.jcr.ValueFormatException} when trying to set an existing
-     * single-value property to a multi-value
-     */
-    public void testSetSingleStringArrayValueFormatExceptionWithPropertyType() throws Exception
{
-        // prerequisite: existing single-valued STRING property
-        if (!testNode.hasProperty(propertyName1)) {
-            testNode.setProperty(propertyName1, s1);
-            testNode.getParent().save();
-        }
-
-        try {
-            testNode.setProperty(propertyName1, sArray1, PropertyType.STRING);
-            fail("setProperty(singleValueProperty, String[], int) not throwing a ValueFormatException");
-        } catch (ValueFormatException success) {
-        }
-    }
-
-    /**
      * Tests if removing a <code>String[]</code> property with
      * <code>Node.setProperty(String, null, int)</code> works with
      * <code>Session.save()</code>

Modified: jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyValueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyValueTest.java?rev=1484705&r1=1484704&r2=1484705&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyValueTest.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyValueTest.java
Tue May 21 09:02:21 2013
@@ -332,25 +332,6 @@ public class SetPropertyValueTest extend
     }
 
     /**
-     * Tests if <code>Node.setProperty(String, Value[])</code> throws a {@link
-     * javax.jcr.ValueFormatException} when trying to set an existing
-     * single-valued property to a multi-value
-     */
-    public void testSetSingleValueArrayValueFormatException() throws Exception {
-        // prerequisite: existing single-valued property
-        if (!testNode.hasProperty(propertyName1)) {
-            testNode.setProperty(propertyName1, v1);
-            testNode.getParent().save();
-        }
-
-        try {
-            testNode.setProperty(propertyName1, vArray1);
-            fail("setProperty(singleValueProperty, Value[]) not throwing a ValueFormatException");
-        } catch (ValueFormatException success) {
-        }
-    }
-
-    /**
      * Tests if removing a <code>Value[]</code> property with
      * <code>Node.setProperty(String, null)</code> works with
      * <code>Session.save()</code>
@@ -472,25 +453,6 @@ public class SetPropertyValueTest extend
     }
 
     /**
-     * Tests if <code>Node.setProperty(String, Value[], int)</code> throws a
-     * {@link javax.jcr.ValueFormatException} when trying to set an existing
-     * single-valued property to a multi-value
-     */
-    public void testSetSingleValueArrayValueFormatExceptionWithPropertyType() throws Exception
{
-        // prerequisite: existing single-valued property
-        if (!testNode.hasProperty(propertyName1)) {
-            testNode.setProperty(propertyName1, v1);
-            testNode.getParent().save();
-        }
-
-        try {
-            testNode.setProperty(propertyName1, vArray1, PropertyType.STRING);
-            fail("setProperty(singleValueProperty, Value[], int) not throwing a ValueFormatException");
-        } catch (ValueFormatException success) {
-        }
-    }
-
-    /**
      * Tests if removing a <code>Value[]</code> property with
      * <code>Node.setProperty(String, null, int)</code> works with
      * <code>Session.save()</code>



Mime
View raw message