Author: areshetnyak Date: 2009-11-13 09:10:43 -0500 (Fri, 13 Nov 2009) New Revision: 654 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 14:04:54 UTC (rev 653) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-13 14:10:43 UTC (rev 654) @@ -351,8 +351,8 @@ { NodeData parentNodeData = (NodeData) conn.getItemData((String)name.get(1)); -// if (parentNodeData == null) -// throw new JDBCCacheLoaderException("The parent node with ID = " + (String)name.get(1) + " not exis, FQN = '" + name + "'."); + if (parentNodeData == null) + throw new JDBCCacheLoaderException("The parent node with ID = " + (String)name.get(1) + " not exis, FQN = '" + name + "'."); if (parentNodeData != null) { 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 14:04:54 UTC (rev 653) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-13 14:10:43 UTC (rev 654) @@ -638,6 +638,7 @@ // add child nodes [node1] String nodeId = IdGenerator.generate(); addDbNode(conn, QPath.makeChildPath(baseNodePath, InternalQName.parse("[]node1")), nodeId, Constants.NT_UNSTRUCTURED, baseNodeId); + conn.commit(); // tests it Map<Object, Object> attrebutes = loader.get(Fqn.fromElements(JBossCacheStorage.NODES, baseNodeId, "[]node1:1")); @@ -758,5 +759,51 @@ // tests it } + + public void testExistNode() throws Exception + { + // 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); + conn.commit(); + + // tests it + String nodeId = IdGenerator.generate(); + + assertFalse(loader.exists(Fqn.fromElements(JBossCacheStorage.NODES, nodeId))); + assertFalse(loader.exists(Fqn.fromElements(JBossCacheStorage.NODES, baseNodeId, "[]node1:1"))); + + conn = persistentContainer.openConnection(); + + addDbNode(conn, QPath.makeChildPath(baseNodePath, InternalQName.parse("[]node1")), nodeId, Constants.NT_UNSTRUCTURED, baseNodeId); + conn.commit(); + + assertTrue(loader.exists(Fqn.fromElements(JBossCacheStorage.NODES, nodeId))); + assertTrue(loader.exists(Fqn.fromElements(JBossCacheStorage.NODES, baseNodeId, "[]node1:1"))); + } + + public void testExistProperty() throws Exception + { + + // prepare + WorkspaceStorageConnection conn = persistentContainer.openConnection(); + + TransientPropertyData propData = + createProperty(Constants.ROOT_PATH, Constants.ROOT_UUID, Constants.JCR_DATA, "JCR DATA VALUE", + false); + + // tests it + assertFalse(loader.exists(Fqn.fromElements(JBossCacheStorage.PROPS, propData.getIdentifier()))); + + // commit in DB + conn.add(propData); + conn.commit(); + + assertTrue(loader.exists(Fqn.fromElements(JBossCacheStorage.PROPS, propData.getIdentifier()))); + } + }