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/17 15:31:35 UTC
[1/2] usergrid git commit: Adding JIRA issue links to ignore
annotations
Repository: usergrid
Updated Branches:
refs/heads/ignores 4cf69e6f0 -> a9c1e8401
Adding JIRA issue links to ignore annotations
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6af43dc9
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6af43dc9
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6af43dc9
Branch: refs/heads/ignores
Commit: 6af43dc9b5c3963eefb7a93afb029a4e365cc65f
Parents: 4cf69e6
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 17 09:30:57 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 17 09:30:57 2015 -0500
----------------------------------------------------------------------
.../org/apache/usergrid/persistence/EntityManagerIT.java | 3 ++-
.../test/java/org/apache/usergrid/rest/NotificationsIT.java | 2 +-
.../usergrid/rest/applications/ApplicationResourceIT.java | 2 +-
.../usergrid/services/notifications/NotifiersServiceIT.java | 8 ++++----
.../services/notifications/apns/NotificationsServiceIT.java | 8 ++++----
.../services/notifications/gcm/NotificationsServiceIT.java | 8 ++++----
6 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6af43dc9/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java
index d81cad2..658c808 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java
@@ -381,7 +381,8 @@ public class EntityManagerIT extends AbstractCoreIT {
@Test
- @Ignore( "There is a concurrency issue due to counters not being thread safe: see USERGRID-1753" )
+ @Ignore( "Pending https://issues.apache.org/jira/browse/USERGRID-1753. Concurrency issue.")
+ // There is a concurrency issue due to counters not being thread safe
public void testEntityCounters() throws Exception {
LOG.info( "EntityManagerIT#testEntityCounters" );
EntityManager em = app.getEntityManager();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6af43dc9/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
index 63e7b49..61dc419 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
/**
* Test creating, sending and paging through Notifications via the REST API.
*/
-@Ignore
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. ")
public class NotificationsIT extends org.apache.usergrid.rest.test.resource.AbstractRestIT {
private static final Logger logger = LoggerFactory.getLogger( NotificationsIT.class );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6af43dc9/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
index 5915eca..8d29290 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
@@ -648,7 +648,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
* Retrieve an access token using HTTP Basic authentication
*/
@Test
- @Ignore("Should fix - https://issues.apache.org/jira/browse/USERGRID-1106")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1106")
//Are we trying to generate token with token? Couldn't find endpoint that accepts token for generating token
public void clientCredentialsFlowWithHeaderAuthorization() throws Exception {
//retrieve the credentials
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6af43dc9/stack/services/src/test/java/org/apache/usergrid/services/notifications/NotifiersServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/NotifiersServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/NotifiersServiceIT.java
index fbf8290..58172dd 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/NotifiersServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/NotifiersServiceIT.java
@@ -83,7 +83,7 @@ public class NotifiersServiceIT extends AbstractServiceIT {
}
}
- @Ignore("Mock doesn't work")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. Mock doesn't work")
@Test
public void badGcmToken() throws Exception {
app.clear();
@@ -146,7 +146,7 @@ public class NotifiersServiceIT extends AbstractServiceIT {
assertArrayEquals(notifier.getP12Certificate(), certBytes);
}
- @Ignore("Mock doesn't work")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. Mock doesn't work")
@Test
public void badAPNsCertificate() throws Exception {
@@ -170,7 +170,7 @@ public class NotifiersServiceIT extends AbstractServiceIT {
}
}
- @Ignore("Mock doesn't work")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. Mock doesn't work")
@Test
public void badAPNsPassword() throws Exception {
@@ -195,7 +195,7 @@ public class NotifiersServiceIT extends AbstractServiceIT {
}
@Test
- @Ignore("No longer needed to verify")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. No longer needed to verify")
public void encryption() throws Exception {
app.clear();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6af43dc9/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 a3ff449..60b02a6 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,7 +41,7 @@ import static org.apache.usergrid.services.notifications.impl.ApplicationQueueMa
// todo: test reschedule on delivery time change
// todo: test restart of queuing
-@Ignore
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. ")
public class NotificationsServiceIT extends AbstractServiceNotificationIT {
private static final Logger LOG = LoggerFactory.getLogger(NotificationsServiceIT.class);
@@ -383,7 +383,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
}
}
- @Ignore("todo: how can I mock this?")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. todo: how can I mock this?")
@Test
public void badToken() throws Exception {
@@ -576,7 +576,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
checkReceipts(notification, 2);
}
- @Ignore("todo: how can I mock this?")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. todo: how can I mock this?")
@Test
public void badCertificate() throws Exception {
@@ -649,7 +649,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
assertNotNull(entity);
}
- @Ignore("todo: how can I mock this?")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. todo: how can I mock this?")
@Test
public void inactiveDeviceUpdate() throws Exception {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6af43dc9/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 3369786..282055c 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,7 +142,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
}
@Test
- @Ignore
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. ")
public void singlePushNotification() throws Exception {
app.clear();
@@ -168,7 +168,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
}
@Test
- @Ignore
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. ")
public void singlePushNotificationViaUser() throws Exception {
app.clear();
@@ -303,7 +303,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
}
}
- @Ignore("todo: how can I mock this?")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. todo: how can I mock this?")
@Test
public void badToken() throws Exception {
@@ -346,7 +346,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
assertEquals("InvalidRegistration", receipt.getErrorCode());
}
- @Ignore("todo: how can I mock this?")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1113. todo: how can I mock this?")
@Test
public void badAPIKey() throws Exception {
[2/2] usergrid git commit: Further categorization of tests.
Posted by sn...@apache.org.
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/ignores
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" );