svn commit: r1587485 - /jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgradeTest.java

[md...@apache.org]

Author: mduerig
Date: Tue Apr 15 09:27:38 2014
New Revision: 1587485

URL: http://svn.apache.org/r1587485
Log:
OAK-1731: Repository upgrade does not copy default values of property definitions
Test case (commented out for the time being)

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgradeTest.java

Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgradeTest.java?rev=1587485&r1=1587484&r2=1587485&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgradeTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgradeTest.java Tue Apr 15 09:27:38 2014
@@ -18,6 +18,12 @@
  */
 package org.apache.jackrabbit.oak.upgrade;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -35,6 +41,8 @@ import javax.jcr.Value;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeManager;
 import javax.jcr.nodetype.NodeTypeTemplate;
+import javax.jcr.nodetype.PropertyDefinition;
+import javax.jcr.nodetype.PropertyDefinitionTemplate;
 import javax.jcr.security.Privilege;
 
 import org.apache.jackrabbit.api.JackrabbitSession;
@@ -44,11 +52,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-
 public class RepositoryUpgradeTest extends AbstractRepositoryUpgradeTest {
 
     private static final Calendar DATE = Calendar.getInstance();
@@ -80,7 +83,12 @@ public class RepositoryUpgradeTest exten
             NodeTypeTemplate template = nodeTypeManager.createNodeTypeTemplate();
             template.setName("test:unstructured");
             template.setDeclaredSuperTypeNames(
-                    new String[] { "nt:unstructured" });
+                    new String[] {"nt:unstructured"});
+            PropertyDefinitionTemplate pDef = nodeTypeManager.createPropertyDefinitionTemplate();
+            pDef.setName("default");
+            pDef.setRequiredType(PropertyType.STRING);
+            pDef.setDefaultValues(new Value[]{session.getValueFactory().createValue("defaultValue")});
+            template.getPropertyDefinitionTemplates().add(pDef);
             nodeTypeManager.registerNodeType(template, false);
 
             Node root = session.getRootNode();
@@ -180,7 +188,16 @@ public class RepositoryUpgradeTest exten
             NodeType type = manager.getNodeType("test:unstructured");
             assertFalse(type.isMixin());
             assertTrue(type.isNodeType("nt:unstructured"));
-
+            for (PropertyDefinition pDef : type.getPropertyDefinitions()) {
+                if ("default".equals(pDef.getName())) {
+// FIXME uncomment once OAK-1731 is fixed
+//                    assertNotNull(pDef.getDefaultValues());
+//                    assertEquals(1, pDef.getDefaultValues().length);
+//                    assertEquals("defaultValue", pDef.getDefaultValues()[0].getString());
+                    break;
+                }
+                fail("Expected property definition with name \"default\"");
+            }
         } finally {
             session.logout();
         }