[exo-jcr-commits] exo-jcr SVN: r624 - in jcr/branches/1.12.0-JBC/component/core/src: test/java/org/exoplatform/services/jcr/impl/storage/jbosscache and 1 other directory.

Author: areshetnyak Date: 2009-11-13 04:40:49 -0500 (Fri, 13 Nov 2009) New Revision: 624 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java Log: EXOJCR-201 : The JDBCCacheLoaderTest was changed. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-13 09:16:23 UTC (rev 623) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-13 09:40:49 UTC (rev 624) @@ -488,7 +488,7 @@ NodeData parentNodeData = (NodeData)conn.getItemData((String) name.get(1)); if (parentNodeData == null) - throw new JDBCCacheLoaderException("The parent node with ID = " + (String)name.get(2) + " not exis, FQN = '" + name + "'."); + throw new JDBCCacheLoaderException("The parent node with ID = " + (String)name.get(1) + " not exis, FQN = '" + name + "'."); // get child nodes by parent Id for (NodeData node : conn.getChildNodesData(parentNodeData)) Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-13 09:16:23 UTC (rev 623) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-13 09:40:49 UTC (rev 624) @@ -53,6 +53,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import javax.naming.Context; import javax.naming.InitialContext; @@ -241,7 +242,7 @@ WorkspaceStorageConnection conn = persistentContainer.openConnection(); // add root (/) with jcr:primaryType - addDbNode(conn, Constants.ROOT_PATH, Constants.ROOT_UUID, Constants.NT_UNSTRUCTURED); + addDbNode(conn, Constants.ROOT_PATH, Constants.ROOT_UUID, Constants.NT_UNSTRUCTURED, null); // add property (/jcr:mixinTypes) List<InternalQName> mixins = new ArrayList<InternalQName>(); @@ -259,7 +260,7 @@ WorkspaceStorageConnection conn = persistentContainer.openConnection(); // add root (/) with jcr:primaryType - addDbNode(conn, Constants.ROOT_PATH, Constants.ROOT_UUID, Constants.NT_UNSTRUCTURED); + addDbNode(conn, Constants.ROOT_PATH, Constants.ROOT_UUID, Constants.NT_UNSTRUCTURED, null); // add property (/jcr:mixinTypes) List<InternalQName> mixins = new ArrayList<InternalQName>(); @@ -280,11 +281,11 @@ * @param primaryType InternalQName * @throws Exception */ - private void addDbNode(WorkspaceStorageConnection conn, QPath root, String nodeId, InternalQName primaryType) + private void addDbNode(WorkspaceStorageConnection conn, QPath root, String nodeId, InternalQName primaryType, String parentNodeId) throws Exception { // add root (/) - conn.add(new TransientNodeData(root, nodeId, 1, primaryType, new InternalQName[0], 0, null, + conn.add(new TransientNodeData(root, nodeId, 1, primaryType, new InternalQName[0], 0, parentNodeId, new AccessControlList())); // add property (/jcr:primaryType) @@ -457,7 +458,7 @@ String nodeId = IdGenerator.generate(); addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, - Constants.NT_UNSTRUCTURED); + Constants.NT_UNSTRUCTURED, Constants.ROOT_UUID); conn.commit(); List<Modification> modifications = new ArrayList<Modification>(); @@ -495,7 +496,7 @@ String nodeId = IdGenerator.generate(); addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, - Constants.NT_UNSTRUCTURED); + Constants.NT_UNSTRUCTURED, Constants.ROOT_UUID); conn.commit(); conn = persistentContainer.openConnection(); @@ -553,7 +554,7 @@ String nodeId = IdGenerator.generate(); addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, - Constants.NT_UNSTRUCTURED); + Constants.NT_UNSTRUCTURED, Constants.ROOT_UUID); conn.commit(); // tests it @@ -583,7 +584,7 @@ WorkspaceStorageConnection conn = persistentContainer.openConnection(); String nodeId = IdGenerator.generate(); - addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED); + addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, Constants.ROOT_UUID); conn.commit(); // tests it @@ -643,8 +644,23 @@ { // prepare + WorkspaceStorageConnection conn = persistentContainer.openConnection(); + QPath baseNodePath = QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]baseNode")); + String baseNodeId = IdGenerator.generate(); + addDbNode(conn, baseNodePath, baseNodeId,Constants.NT_UNSTRUCTURED, Constants.ROOT_UUID); + + // add child nodes [node1, node2, node3] + addDbNode(conn, QPath.makeChildPath(baseNodePath, InternalQName.parse("[]node1")), IdGenerator.generate(), Constants.NT_UNSTRUCTURED, baseNodeId); + addDbNode(conn, QPath.makeChildPath(baseNodePath, InternalQName.parse("[]node2")), IdGenerator.generate(), Constants.NT_UNSTRUCTURED, baseNodeId); + addDbNode(conn, QPath.makeChildPath(baseNodePath, InternalQName.parse("[]node3")), IdGenerator.generate(), Constants.NT_UNSTRUCTURED, baseNodeId); + conn.commit(); + // tests it + Set<String> childs = (Set<String>) loader.getChildrenNames(Fqn.fromElements(JBossCacheStorage.NODES, baseNodeId)); + + assertNotNull(childs); + }