Author: reschke
Date: Tue Aug 11 13:11:51 2015
New Revision: 1695299
URL: http://svn.apache.org/r1695299
Log:
OAK-3206: DocumentStorePerformanceTest executed together with unit tests
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java?rev=1695299&r1=1695298&r2=1695299&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
Tue Aug 11 13:11:51 2015
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
import java.util.ArrayList;
import java.util.Collections;
@@ -35,13 +36,18 @@ import org.slf4j.LoggerFactory;
/**
* Tests measuring the performance of various {@link DocumentStore} operations.
+ * <p>
+ * These tests are disabled by default due to their long running time. On the
command line
+ * specify {@code -DDocumentStorePerformanceTest=true} to enable them.
*/
public class DocumentStorePerformanceTest extends AbstractDocumentStoreTest {
private static final Logger LOG =
LoggerFactory.getLogger(DocumentStorePerformanceTest.class);
+ private static final boolean ENABLED =
Boolean.getBoolean(DocumentStorePerformanceTest.class.getSimpleName());
public DocumentStorePerformanceTest(DocumentStoreFixture dsf) {
super(dsf);
+ assumeTrue(ENABLED);
}
@Test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java?rev=1695299&r1=1695298&r2=1695299&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
Tue Aug 11 13:11:51 2015
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
import java.io.UnsupportedEncodingException;
import java.sql.Connection;
@@ -38,13 +39,18 @@ import org.slf4j.LoggerFactory;
/**
* Tests measuring the performance of various {@link RDBDocumentStore}
* operations.
+ * <p>
+ * These tests are disabled by default due to their long running time. On the
command line
+ * specify {@code -DRDBDocumentStorePerformanceTest=true} to enable them.
*/
public class RDBDocumentStorePerformanceTest extends AbstractDocumentStoreTest
{
private static final Logger LOG =
LoggerFactory.getLogger(RDBDocumentStorePerformanceTest.class);
+ private static final boolean ENABLED =
Boolean.getBoolean(DocumentStorePerformanceTest.class.getSimpleName());
public RDBDocumentStorePerformanceTest(DocumentStoreFixture dsf) {
super(dsf);
+ assumeTrue(ENABLED);
}
@Test
