[exo-jcr-commits] exo-jcr SVN: r1595 - in jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs: operations and 1 other directory.

Author: pnedonosko Date: 2010-01-27 11:38:01 -0500 (Wed, 27 Jan 2010) New Revision: 1595 Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/Probe.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableSimpleFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableTreeFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java Log: EXOJCR-310 fix of dialect usage in VCAS tests; svn:Id Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-01-27 16:36:20 UTC (rev 1594) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-01-27 16:38:01 UTC (rev 1595) @@ -41,7 +41,7 @@ * Date: 19.07.2008 * * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter Nedonosko</a> - * @version $Id: CASableFileIOChannelTestBase.java 34801 2009-07-31 15:44:50Z dkatayev $ + * @version $Id$ */ public abstract class CASableFileIOChannelTestBase extends JcrImplBaseTest {// Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/Probe.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/Probe.java 2010-01-27 16:36:20 UTC (rev 1594) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/Probe.java 2010-01-27 16:38:01 UTC (rev 1595) @@ -25,7 +25,7 @@ * Created by The eXo Platform SAS. * * @author Gennady Azarenkov - * @version $Id: Probe.java 11907 2008-03-13 15:36:21Z ksm $ + * @version $Id$ */ public class Probe extends Thread Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/Probe.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableSimpleFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableSimpleFileIOChannel.java 2010-01-27 16:36:20 UTC (rev 1594) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableSimpleFileIOChannel.java 2010-01-27 16:38:01 UTC (rev 1595) @@ -31,7 +31,7 @@ * Date: 19.07.2008 * * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter Nedonosko</a> - * @version $Id: TestCASableSimpleFileIOChannel.java 34801 2009-07-31 15:44:50Z dkatayev $ + * @version $Id$ */ public class TestCASableSimpleFileIOChannel extends CASableFileIOChannelTestBase { @@ -51,15 +51,20 @@ if (wse.getName().equals(session.getWorkspace().getName())) { jdbcSourceName = wse.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME); - jdbcDialect = wse.getContainer().getParameterValue(JDBCWorkspaceDataContainer.DB_DIALECT); + jdbcDialect = wse.getContainer().getParameterValue(JDBCWorkspaceDataContainer.DB_DIALECT, null); } } if (jdbcSourceName == null) + { fail(JDBCWorkspaceDataContainer.SOURCE_NAME + " required in workspace container config"); + } props.put(JDBCValueContentAddressStorageImpl.JDBC_SOURCE_NAME_PARAM, jdbcSourceName); - props.put(JDBCValueContentAddressStorageImpl.JDBC_DIALECT_PARAM, jdbcDialect); + if (jdbcDialect != null) + { + props.put(JDBCValueContentAddressStorageImpl.JDBC_DIALECT_PARAM, jdbcDialect); + } props.put(JDBCValueContentAddressStorageImpl.TABLE_NAME_PARAM, JDBCValueContentAddressStorageImpl.DEFAULT_TABLE_NAME + "_TEST"); Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableSimpleFileIOChannel.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableTreeFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableTreeFileIOChannel.java 2010-01-27 16:36:20 UTC (rev 1594) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableTreeFileIOChannel.java 2010-01-27 16:38:01 UTC (rev 1595) @@ -31,7 +31,7 @@ * Date: 19.07.2008 * * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter Nedonosko</a> - * @version $Id: TestCASableTreeFileIOChannel.java 34801 2009-07-31 15:44:50Z dkatayev $ + * @version $Id$ */ public class TestCASableTreeFileIOChannel extends CASableFileIOChannelTestBase { @@ -51,15 +51,20 @@ if (wse.getName().equals(session.getWorkspace().getName())) { jdbcSourceName = wse.getContainer().getParameterValue(JDBCWorkspaceDataContainer.SOURCE_NAME); - jdbcDialect = wse.getContainer().getParameterValue(JDBCWorkspaceDataContainer.DB_DIALECT); + jdbcDialect = wse.getContainer().getParameterValue(JDBCWorkspaceDataContainer.DB_DIALECT, null); } } if (jdbcSourceName == null) + { fail(JDBCWorkspaceDataContainer.SOURCE_NAME + " required in workspace container config"); + } props.put(JDBCValueContentAddressStorageImpl.JDBC_SOURCE_NAME_PARAM, jdbcSourceName); - props.put(JDBCValueContentAddressStorageImpl.JDBC_DIALECT_PARAM, jdbcDialect); + if (jdbcDialect != null) + { + props.put(JDBCValueContentAddressStorageImpl.JDBC_DIALECT_PARAM, jdbcDialect); + } props.put(JDBCValueContentAddressStorageImpl.TABLE_NAME_PARAM, JDBCValueContentAddressStorageImpl.DEFAULT_TABLE_NAME + "_TEST"); Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestCASableTreeFileIOChannel.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-01-27 16:36:20 UTC (rev 1594) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-01-27 16:38:01 UTC (rev 1595) @@ -35,7 +35,7 @@ * Created by The eXo Platform SAS. * * @author Gennady Azarenkov - * @version $Id: TestFileIOChannel.java 34801 2009-07-31 15:44:50Z dkatayev $ + * @version $Id$ */ public class TestFileIOChannel extends TestCase Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-01-27 16:36:20 UTC (rev 1594) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-01-27 16:38:01 UTC (rev 1595) @@ -36,7 +36,7 @@ * Created by The eXo Platform SAS. * * @author Gennady Azarenkov - * @version $Id: TestFileValueIO.java 11907 2008-03-13 15:36:21Z ksm $ + * @version $Id$ */ public class TestFileValueIO extends TestCase Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java 2010-01-27 16:36:20 UTC (rev 1594) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java 2010-01-27 16:38:01 UTC (rev 1595) @@ -41,7 +41,7 @@ * cases. * * @author Nikolay Zamosenchuk - * @version $Id: $ + * @version $Id$ */ public class TestRemoveFromValueStorage extends BaseStandaloneTest { Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-01-27 16:36:20 UTC (rev 1594) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-01-27 16:38:01 UTC (rev 1595) @@ -44,7 +44,7 @@ * Date: 28.05.2009 * * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter Nedonosko</a> - * @version $Id: TestValueFileIOHelper.java 111 2008-11-11 11:11:11Z pnedonosko $ + * @version $Id$ */ public class TestValueFileIOHelper extends JcrImplBaseTest { Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java ___________________________________________________________________ Name: svn:keywords + Id