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:04 UTC
[43/50] usergrid git commit: Further categorization of tests.
Further categorization of tests.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a9c1e840
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a9c1e840
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a9c1e840
Branch: refs/heads/USERGRID-872
Commit: a9c1e840172fb399a1b4212b4d9f9237b271ff61
Parents: 6af43dc
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 17 09:31:30 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 17 09:31:30 2015 -0500
----------------------------------------------------------------------
.../src/test/java/org/apache/usergrid/batch/BulkTestUtils.java | 1 -
.../org/apache/usergrid/count/BatchCountParallelismTest.java | 5 ++++-
.../src/test/java/org/apache/usergrid/utils/UUIDUtilsTest.java | 4 +++-
.../apache/usergrid/security/providers/FacebookProviderIT.java | 4 +++-
4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9c1e840/stack/core/src/test/java/org/apache/usergrid/batch/BulkTestUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/BulkTestUtils.java b/stack/core/src/test/java/org/apache/usergrid/batch/BulkTestUtils.java
index c88175b..d711094 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/BulkTestUtils.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/BulkTestUtils.java
@@ -23,7 +23,6 @@ import org.apache.usergrid.batch.repository.JobDescriptor;
/** @author zznate */
-@Ignore("Not a test")
public class BulkTestUtils {
public static JobFactory getBulkJobFactory() {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9c1e840/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java b/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java
index 37beeac..78c58a4 100644
--- a/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java
@@ -28,9 +28,11 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.usergrid.ExperimentalTest;
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;
@@ -62,7 +64,8 @@ public class BatchCountParallelismTest {
@Test
- @Ignore("This test causes the build to hang when all stack tests are run")
+ @Category(ExperimentalTest.class)
+ // "This test causes the build to hang when all stack tests are run"
public void verifyConcurrentAdd() throws Exception {
final long startCount = batcher.invocationCounter.count();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9c1e840/stack/core/src/test/java/org/apache/usergrid/utils/UUIDUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/utils/UUIDUtilsTest.java b/stack/core/src/test/java/org/apache/usergrid/utils/UUIDUtilsTest.java
index 0493d31..524c5ce 100644
--- a/stack/core/src/test/java/org/apache/usergrid/utils/UUIDUtilsTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/utils/UUIDUtilsTest.java
@@ -27,8 +27,10 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -142,7 +144,7 @@ public class UUIDUtilsTest {
@Test
- @Ignore("This test is timing dependent.")
+ @Category(ExperimentalTest.class)
@SuppressWarnings("unchecked")
public void verifyOrderingTsOnlyAndUnique() {
int count = 500;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9c1e840/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java b/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java
index d22647f..cde0255 100644
--- a/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.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,6 +38,7 @@ 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 org.apache.usergrid.TestHelper.newUUIDString;
import static org.apache.usergrid.TestHelper.uniqueOrg;
@@ -71,7 +73,7 @@ public class FacebookProviderIT {
@Test
- @Ignore("Requires Facebook credentials")
+ @Category(ExperimentalTest.class)
public void verifyGetOrCreateOk() throws Exception {
Application application = setup.getEmf().getEntityManager( applicationId ).getApplication();
Map fb_user = MapUtils.hashMap( "id", "12345678" ).map( "name", "Facebook User" ).map( "username", "fb.user" );