You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/11/18 17:28:00 UTC
[39/50] usergrid git commit: Use JUnut Categories to exclude too
heavy (aka stress) tests and experimental tests.
Use JUnut Categories to exclude too heavy (aka stress) tests and experimental tests.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/99b932ad
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/99b932ad
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/99b932ad
Branch: refs/heads/USERGRID-872
Commit: 99b932ada3809a33ad8a824b9177d427edb6feba
Parents: d1f1710
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 17 07:54:39 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 17 07:54:39 2015 -0500
----------------------------------------------------------------------
stack/build-tools/pom.xml | 11 +++++
stack/config/pom.xml | 10 +++++
.../clustering/hazelcast/HazelcastTest.java | 5 ++-
.../usergrid/corepersistence/index/RxTest.java | 6 ++-
.../persistence/PerformanceEntityReadTest.java | 4 +-
.../persistence/PerformanceEntityWriteTest.java | 4 +-
.../EntityCollectionManagerStressTest.java | 6 ++-
.../impl/SerializationComparison.java | 5 ++-
stack/corepersistence/common/pom.xml | 1 +
stack/corepersistence/graph/pom.xml | 1 +
.../persistence/graph/GraphManagerLoadTest.java | 7 ++--
.../graph/GraphManagerShardConsistencyIT.java | 4 +-
.../graph/GraphManagerStressTest.java | 44 +++++++++-----------
.../serialization/EdgeSerializationTest.java | 6 ++-
stack/corepersistence/map/pom.xml | 1 +
.../org/apache/usergrid/ExperimentalTest.java | 22 ++++++++++
.../java/org/apache/usergrid/StressTest.java | 22 ++++++++++
stack/corepersistence/pom.xml | 2 +
stack/corepersistence/queryindex/pom.xml | 5 +--
.../index/impl/IndexLoadTestsIT.java | 3 ++
stack/pom.xml | 12 ++----
stack/rest/pom.xml | 2 +
stack/services/pom.xml | 8 +---
.../providers/PingIdentityProviderIT.java | 4 +-
.../AbstractServiceNotificationIT.java | 1 +
.../apns/NotificationsServiceIT.java | 1 +
.../gcm/NotificationsServiceIT.java | 2 +
27 files changed, 139 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/build-tools/pom.xml b/stack/build-tools/pom.xml
index 149c1a7..2001396 100644
--- a/stack/build-tools/pom.xml
+++ b/stack/build-tools/pom.xml
@@ -38,4 +38,15 @@
o to adjust checkstyle settings or suppress reporting please us the
files contained under src/main/resources/usergrid
-->
+
+ <!-- the surefire excludedGroups configuration in parent requires this dependency here -->
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/config/pom.xml
----------------------------------------------------------------------
diff --git a/stack/config/pom.xml b/stack/config/pom.xml
index 915d32a..4ee1a3b 100644
--- a/stack/config/pom.xml
+++ b/stack/config/pom.xml
@@ -42,4 +42,14 @@
</resource>
</resources>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/core/src/test/java/org/apache/usergrid/clustering/hazelcast/HazelcastTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/clustering/hazelcast/HazelcastTest.java b/stack/core/src/test/java/org/apache/usergrid/clustering/hazelcast/HazelcastTest.java
index 8f6226b..63a181e 100644
--- a/stack/core/src/test/java/org/apache/usergrid/clustering/hazelcast/HazelcastTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/clustering/hazelcast/HazelcastTest.java
@@ -20,10 +20,13 @@ package org.apache.usergrid.clustering.hazelcast;
import java.util.Collection;
import java.util.Set;
+import org.apache.usergrid.ExperimentalTest;
+import org.apache.usergrid.StressTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
@@ -38,7 +41,7 @@ import com.hazelcast.core.Member;
import com.hazelcast.core.MessageListener;
-@Ignore("Experimental test")
+@Category(ExperimentalTest.class)
public class HazelcastTest implements InstanceListener, MessageListener<Object> {
private static final Logger logger = LoggerFactory.getLogger( HazelcastTest.class );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
index 1a94aac..6bb8947 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
@@ -23,9 +23,11 @@ package org.apache.usergrid.corepersistence.index;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.usergrid.ExperimentalTest;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import rx.Observable;
import rx.Subscription;
import rx.observables.ConnectableObservable;
@@ -41,7 +43,7 @@ import static org.junit.Assert.assertTrue;
public class RxTest {
@Test
- @Ignore("This fails intermittently. Possible race condition with Rx. Need to investigate more.")
+ @Category(ExperimentalTest.class )
public void testPublish() throws InterruptedException {
final int count = 10;
@@ -64,7 +66,7 @@ public class RxTest {
@Test
- @Ignore("Experimental - seems like it should work, yet blocks forever")
+ @Category(ExperimentalTest.class )
public void testConnectableObserver() throws InterruptedException {
final int count = 10;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityReadTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityReadTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityReadTest.java
index f7435ef..88144c8 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityReadTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityReadTest.java
@@ -24,11 +24,13 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import org.apache.usergrid.StressTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +46,7 @@ import com.codahale.metrics.Slf4jReporter;
//@RunWith(JukitoRunner.class)
//@UseModules({ GuiceModule.class })
-@Ignore("Kills embedded cassandra")
+@Category(StressTest.class)
public class PerformanceEntityReadTest extends AbstractCoreIT {
private static final Logger logger = LoggerFactory.getLogger(PerformanceEntityReadTest.class );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityWriteTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityWriteTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityWriteTest.java
index 341af90..3997615 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityWriteTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityWriteTest.java
@@ -23,11 +23,13 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.apache.usergrid.StressTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +45,7 @@ import com.codahale.metrics.Slf4jReporter;
//@RunWith(JukitoRunner.class)
//@UseModules({ GuiceModule.class })
-@Ignore("Kills embedded cassandra")
+@Category(StressTest.class)
public class PerformanceEntityWriteTest extends AbstractCoreIT {
private static final Logger LOG = LoggerFactory.getLogger( PerformanceEntityWriteTest.class );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java
index 20cf24e..1aabf75 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java
@@ -21,9 +21,11 @@ package org.apache.usergrid.persistence.collection;
import java.util.HashSet;
import java.util.Set;
+import org.apache.usergrid.StressTest;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +52,7 @@ import static org.junit.Assert.assertNotNull;
@RunWith(ITRunner.class)
@UseModules(TestCollectionModule.class)
-@Ignore("Stress test should not be run in embedded mode")
+@Category(StressTest.class)
public class EntityCollectionManagerStressTest {
private static final Logger log = LoggerFactory.getLogger(
EntityCollectionManagerStressTest.class );
@@ -58,7 +60,7 @@ public class EntityCollectionManagerStressTest {
@Inject
private EntityCollectionManagerFactory factory;
- @Inject
+ @Inject
@Rule
public MigrationManagerRule migrationManagerRule;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SerializationComparison.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SerializationComparison.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SerializationComparison.java
index 660a6a9..a2ed6c7 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SerializationComparison.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SerializationComparison.java
@@ -23,8 +23,9 @@ package org.apache.usergrid.persistence.collection.serialization.impl;
import java.io.IOException;
import java.util.UUID;
-import org.junit.Ignore;
+import org.apache.usergrid.StressTest;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,6 +49,7 @@ import com.fasterxml.jackson.dataformat.smile.SmileFactory;
*
* @author tnine
*/
+@Category(StressTest.class)
public class SerializationComparison {
private static final Logger logger = LoggerFactory.getLogger( SerializationComparison.class );
@@ -56,7 +58,6 @@ public class SerializationComparison {
@Test
- @Ignore("Too heavy for normal build process?")
public void smileSerialization() throws IOException {
SmileFactory smile = new SmileFactory();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/common/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/pom.xml b/stack/corepersistence/common/pom.xml
index 2082b04..0f54896 100644
--- a/stack/corepersistence/common/pom.xml
+++ b/stack/corepersistence/common/pom.xml
@@ -183,6 +183,7 @@
<version>${surefire.plugin.version}</version>
<configuration>
<argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/graph/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/pom.xml b/stack/corepersistence/graph/pom.xml
index 23621fb..93fbbd5 100644
--- a/stack/corepersistence/graph/pom.xml
+++ b/stack/corepersistence/graph/pom.xml
@@ -104,6 +104,7 @@
<version>${surefire.plugin.version}</version>
<configuration>
<argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
index 22683f6..a0be6a6 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
@@ -29,10 +29,12 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import org.apache.usergrid.StressTest;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +65,7 @@ import static org.junit.Assert.fail;
@RunWith( ITRunner.class )
@UseModules( TestGraphModule.class )
-@Ignore("Not for testing during build. Kills embedded Cassandra")
+@Category(StressTest.class)
public class GraphManagerLoadTest {
private static final Logger log = LoggerFactory.getLogger( GraphManagerLoadTest.class );
@@ -95,7 +97,6 @@ public class GraphManagerLoadTest {
}
-// @Ignore
@Test
public void writeThousandsSingleSource() throws InterruptedException, ExecutionException {
EdgeGenerator generator = new EdgeGenerator() {
@@ -124,7 +125,7 @@ public class GraphManagerLoadTest {
@Test
- @Ignore("Too heavy for normal build process")
+ @Category(StressTest.class)
public void writeThousandsSingleTarget() throws InterruptedException, ExecutionException {
EdgeGenerator generator = new EdgeGenerator() {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java
index 9000c75..45c3d80 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java
@@ -39,10 +39,12 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.annotation.Nullable;
+import org.apache.usergrid.StressTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -393,7 +395,7 @@ public class GraphManagerShardConsistencyIT {
@Test(timeout=120000)
- @Ignore("This works, but is occasionally causing cassandra to fall over. Unignore when merged with new shard strategy")
+ @Category(StressTest.class)
public void writeThousandsDelete()
throws InterruptedException, ExecutionException, MigrationException, UnsupportedEncodingException {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java
index 6a2efc9..98065ce 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java
@@ -19,20 +19,10 @@
package org.apache.usergrid.persistence.graph;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import com.google.common.base.Optional;
+import com.google.inject.Inject;
import org.apache.commons.lang3.time.StopWatch;
-
+import org.apache.usergrid.StressTest;
import org.apache.usergrid.persistence.core.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.test.ITRunner;
@@ -42,25 +32,29 @@ import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.impl.SimpleSearchByEdgeType;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
-
-import com.google.common.base.Optional;
-import com.google.inject.Inject;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import rx.Observable;
import rx.Subscriber;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+
import static org.apache.usergrid.persistence.graph.test.util.EdgeTestUtils.createEdge;
-import static org.apache.usergrid.persistence.core.util.IdGenerator.createId;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(ITRunner.class)
@UseModules(TestGraphModule.class)
-@Ignore("Stress test should not be run in embedded mode")
+@Category(StressTest.class)
public class GraphManagerStressTest {
private static final Logger log = LoggerFactory.getLogger( GraphManagerStressTest.class );
@@ -89,7 +83,7 @@ public class GraphManagerStressTest {
@Test
- @Ignore("Too heavy for normal build process")
+ @Category(StressTest.class)
public void writeThousands() throws InterruptedException {
EdgeGenerator generator = new EdgeGenerator() {
@@ -177,7 +171,7 @@ public class GraphManagerStressTest {
}
- @Ignore("Too heavy for normal build process")
+ @Category(StressTest.class)
@Test
public void writeThousandsSingleSource() throws InterruptedException {
EdgeGenerator generator = new EdgeGenerator() {
@@ -205,7 +199,7 @@ public class GraphManagerStressTest {
@Test
- @Ignore("Too heavy for normal build process")
+ @Category(StressTest.class)
public void writeThousandsSingleTarget() throws InterruptedException {
EdgeGenerator generator = new EdgeGenerator() {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
index d875e83..d81413e 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
@@ -25,10 +25,12 @@ import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
+import org.apache.usergrid.StressTest;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -650,7 +652,7 @@ public abstract class EdgeSerializationTest {
* Test paging by resuming the search from the edge
*/
@Test
- @Ignore("Kills embedded cassandra")
+ @Category(StressTest.class)
public void pageIteration() throws ConnectionException {
int size = graphFig.getScanPageSize() * 2;
@@ -690,7 +692,7 @@ public abstract class EdgeSerializationTest {
* edge types
*/
@Test
- @Ignore("Kills embedded cassandra")
+ @Category(StressTest.class)
public void testIteratorPaging() throws ConnectionException {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/map/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/map/pom.xml b/stack/corepersistence/map/pom.xml
index e6f4d54..8589716 100644
--- a/stack/corepersistence/map/pom.xml
+++ b/stack/corepersistence/map/pom.xml
@@ -81,6 +81,7 @@ limitations under the License.
<version>${surefire.plugin.version}</version>
<configuration>
<argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/model/src/main/java/org/apache/usergrid/ExperimentalTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/ExperimentalTest.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/ExperimentalTest.java
new file mode 100644
index 0000000..5138fa4
--- /dev/null
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/ExperimentalTest.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.usergrid;
+
+public interface ExperimentalTest {}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/model/src/main/java/org/apache/usergrid/StressTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/StressTest.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/StressTest.java
new file mode 100644
index 0000000..a51439e
--- /dev/null
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/StressTest.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.usergrid;
+
+public interface StressTest {}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index dab863b..66129ed 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -54,6 +54,7 @@ limitations under the License.
<version>${surefire.plugin.version}</version>
<configuration>
<argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -126,6 +127,7 @@ limitations under the License.
<archaius.deployment.environment>UNIT</archaius.deployment.environment>
</systemPropertyVariables>
<argLine>-Xms2G -Xmx4G</argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/queryindex/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/pom.xml b/stack/corepersistence/queryindex/pom.xml
index 59f4f56..003281e 100644
--- a/stack/corepersistence/queryindex/pom.xml
+++ b/stack/corepersistence/queryindex/pom.xml
@@ -55,10 +55,7 @@
<include>**/*IT.java</include>
<include>**/*Test.java</include>
</includes>
- <!-- run this one manually to stress test -->
- <excludes>
- <exclude>**/IndexLoadTestsIT.java</exclude>
- </excludes>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java
index 1be1195..2343784 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java
@@ -23,12 +23,14 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.usergrid.StressTest;
import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
import org.apache.usergrid.persistence.index.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,6 +79,7 @@ import static org.junit.Assert.assertEquals;
*/
@RunWith( EsRunner.class )
@UseModules( { TestIndexModule.class } )
+@Category( StressTest.class )
public class IndexLoadTestsIT extends BaseIT {
private static final Logger log = LoggerFactory.getLogger( IndexLoadTestsIT.class );
public static final String FIELD_WORKER_INDEX = "workerIndex";
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 3f7b68b..1df8463 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -127,7 +127,7 @@
<usergrid.it.threads>8</usergrid.it.threads>
<metrics.version>3.0.0</metrics.version>
- <surefire.plugin.artifactName>surefire-junit47</surefire.plugin.artifactName>
+ <surefire.plugin.artifactName>surefire-junit47</surefire.plugin.artifactName>
<surefire.plugin.version>2.18.1</surefire.plugin.version>
<powermock.version>1.6.1</powermock.version>
@@ -1344,6 +1344,7 @@
<systemPropertyVariables>
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
</systemPropertyVariables>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
<!-- TODO, we may need an exclusion. Appears to be a classloader bug
@@ -1354,14 +1355,6 @@
<groupId>org.apache.maven.surefire</groupId>
<artifactId>${surefire.plugin.artifactName}</artifactId>
<version>${surefire.plugin.version}</version>
-<!--
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven.surfire</groupId>
- <artifactId>common-junit3</artifactId>
- </exclusion>
- </exclusions>
--->
</dependency>
<!-- override plex utils, otherwise bug from above SO post happens-->
@@ -1585,6 +1578,7 @@
<version>${surefire.plugin.version}</version>
<configuration>
<argLine>-javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 601ed61..f0ce7b3 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -85,6 +85,7 @@
<include>**/*IT.java</include>
<include>**/*Test.java</include>
</includes>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
@@ -422,6 +423,7 @@
<version>${surefire.plugin.version}</version>
<configuration>
<argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec -Dwebapp.directory=${basedir}/src/main/webapp -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar -Djava.util.logging.config.file=${basedir}/src/test/resources/logging.properties ${ug.argline}</argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 9837e76..bfd2f3b 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -103,12 +103,7 @@
<include>**/*IT.java</include>
<include>**/*Test.java</include>
</includes>
- <excludes>
- <exclude>**/*Scheduler*IT.java</exclude>
- <exclude>**/*Notification*IT.java</exclude>
- <exclude>**/ExportServiceIT.java</exclude>
- <exclude>**/ImportServiceIT.java</exclude>
- </excludes>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
<dependencies>
<dependency>
@@ -474,6 +469,7 @@
<version>${surefire.plugin.version}</version>
<configuration>
<argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java b/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java
index c47b954..df63d1f 100644
--- a/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java
@@ -20,6 +20,7 @@ package org.apache.usergrid.security.providers;
import java.util.Map;
import java.util.UUID;
+import org.apache.usergrid.ExperimentalTest;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Ignore;
@@ -37,13 +38,14 @@ import org.apache.usergrid.persistence.entities.Application;
import org.apache.usergrid.persistence.entities.User;
import org.apache.usergrid.persistence.index.impl.ElasticSearchResource;
import org.apache.usergrid.utils.MapUtils;
+import org.junit.experimental.categories.Category;
import static junit.framework.Assert.assertNotNull;
/** @author zznate */
-@Ignore("Experimental Ping Indentiyy test")
+@Category(ExperimentalTest.class )
public class PingIdentityProviderIT {
private static UserInfo adminUser;
private static OrganizationInfo organization;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
index 798f183..d0d2c29 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
@@ -23,6 +23,7 @@ import org.apache.usergrid.persistence.Query;
import org.apache.usergrid.services.ServiceManagerFactory;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.rules.TestName;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
index 8b94661..a3ff449 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
@@ -41,6 +41,7 @@ import static org.apache.usergrid.services.notifications.impl.ApplicationQueueMa
// todo: test reschedule on delivery time change
// todo: test restart of queuing
+@Ignore
public class NotificationsServiceIT extends AbstractServiceNotificationIT {
private static final Logger LOG = LoggerFactory.getLogger(NotificationsServiceIT.class);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/99b932ad/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
index 3218137..3369786 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
@@ -142,6 +142,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
}
@Test
+ @Ignore
public void singlePushNotification() throws Exception {
app.clear();
@@ -167,6 +168,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
}
@Test
+ @Ignore
public void singlePushNotificationViaUser() throws Exception {
app.clear();