Author: areshetnyak Date: 2009-11-12 04:28:28 -0500 (Thu, 12 Nov 2009) New Revision: 586 Modified: 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/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-12 09:09:42 UTC (rev 585) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 09:28:28 UTC (rev 586) @@ -18,8 +18,17 @@ */ package org.exoplatform.services.jcr.impl.storage.jbosscache; -import junit.framework.TestCase; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.sql.DataSource; + import org.apache.commons.dbcp.BasicDataSourceFactory; import org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl; import org.exoplatform.services.jcr.access.AccessControlList; @@ -34,8 +43,9 @@ import org.exoplatform.services.jcr.config.ValueStorageFilterEntry; import org.exoplatform.services.jcr.config.WorkspaceEntry; import org.exoplatform.services.jcr.datamodel.InternalQName; -import org.exoplatform.services.jcr.datamodel.NodeData; +import org.exoplatform.services.jcr.datamodel.PropertyData; import org.exoplatform.services.jcr.datamodel.QPath; +import org.exoplatform.services.jcr.datamodel.ValueData; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; @@ -45,18 +55,8 @@ import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider; import org.exoplatform.services.jcr.util.IdGenerator; +import org.jboss.cache.Modification; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.sql.DataSource; - /** * @author <a href="mailto:reshetnyak.alex@gmail.com">Alex Reshetnyak</a> * @version $Id$ @@ -274,9 +274,37 @@ public void testAddProperty() throws Exception { // prepare + initJCRRoot(); + + String propId = IdGenerator.generate(); + QPath propPath = QPath.makeChildPath(Constants.ROOT_PATH, Constants.JCR_DATA); + TransientPropertyData propData = new TransientPropertyData(propPath, propId, 1, 1, Constants.ROOT_UUID, false); + String propValue = "JCR DATA VALUE"; + propData.setValue(new TransientValueData(propValue)); + + List<Modification> modifications = new ArrayList<Modification>(); + + modifications.addAll(addProperty(propData)); + + loader.put(modifications); // tests - + WorkspaceStorageConnection connection = persistentContainer.openConnection(); + + PropertyData destPropData = (PropertyData) connection.getItemData(propId); + + assertNotNull(destPropData); + assertEquals(propData.getIdentifier(), destPropData.getIdentifier()); + assertEquals(propData.getParentIdentifier(), destPropData.getParentIdentifier()); + assertEquals(propData.getPersistedVersion(), destPropData.getPersistedVersion()); + assertEquals(propData.getType(), destPropData.getType()); + assertEquals(propData.getQPath(), destPropData.getQPath()); + assertEquals(propData.getValues().size(), destPropData.getValues().size()); + assertEquals(1, destPropData.getValues().size()); + + ValueData valueData = destPropData.getValues().get(0); + assertEquals("JCR DATA VALUE", new String (valueData.getAsByteArray(), "UTF-8")); + } public void testDeleteNode() throws Exception