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 16:53:44 UTC
[2/2] usergrid git commit: Adding "Pending" comments and JIRA links.
Adding "Pending" comments and JIRA links.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/78f3da6f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/78f3da6f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/78f3da6f
Branch: refs/heads/ignores
Commit: 78f3da6fcb194190af1d67151bb8d419f620c22e
Parents: 43f7ee0
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 17 10:53:38 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 17 10:53:38 2015 -0500
----------------------------------------------------------------------
.../apache/usergrid/persistence/CounterIT.java | 29 ++++++++++----------
.../persistence/core/rx/OrderedMergeTest.java | 5 ++--
.../shard/impl/ShardGroupDeletionImplTest.java | 2 +-
.../collection/groups/GroupResourceIT.java | 2 +-
.../applications/events/EventsResourceIT.java | 2 +-
.../organizations/AdminEmailEncodingIT.java | 3 +-
6 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/78f3da6f/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java
index e558bad..77dacf2 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java
@@ -18,17 +18,7 @@
package org.apache.usergrid.persistence;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import net.jcip.annotations.NotThreadSafe;
import org.apache.usergrid.AbstractCoreIT;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.persistence.entities.Event;
@@ -39,12 +29,19 @@ import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.utils.ImmediateCounterRule;
import org.apache.usergrid.utils.JsonUtils;
import org.apache.usergrid.utils.UUIDUtils;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import net.jcip.annotations.NotThreadSafe;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
@NotThreadSafe
@@ -63,7 +60,8 @@ public class CounterIT extends AbstractCoreIT {
}
- @Ignore( "needs to have elasticsearch refreshes implemented" )
+ @Ignore( "Pending https://issues.apache.org/jira/browse/USERGRID-1120. ")
+ // needs to have elasticsearch refreshes implemented
@Test
public void testIncrementAndDecrement() throws Exception {
@@ -89,12 +87,15 @@ public class CounterIT extends AbstractCoreIT {
LOG.debug( "user={}", user );
+ em.refreshIndex();
counters = em.getEntityCounters( applicationId );
assertEquals( new Long( 1 ), counters.get( "application.collection.users" ) );
em.delete( user );
+ em.refreshIndex();
+
counters = em.getEntityCounters( applicationId );
assertEquals( new Long( 0 ), counters.get( "application.collection.users" ) );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/78f3da6f/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/rx/OrderedMergeTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/rx/OrderedMergeTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/rx/OrderedMergeTest.java
index 6366de1..465e22d 100644
--- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/rx/OrderedMergeTest.java
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/rx/OrderedMergeTest.java
@@ -148,7 +148,7 @@ public class OrderedMergeTest {
@Test
- @Ignore( "Doesn't work until backpressure is implemented" )
+ @Ignore( "Pending implementation of backpressure" )
public void multipleOperatorSingleThreadSizeException() throws InterruptedException {
List<Integer> expected1List = Arrays.asList( 5, 3, 2, 0 );
@@ -269,8 +269,7 @@ public class OrderedMergeTest {
@Test
- @Ignore("Shouldn't throw an exception, should work with current impl. "
- + "Needs to be changed when backpressure is introduced" )
+ @Ignore("Pending implementation of backpressure")
public void multipleOperatorMultipleThreadSizeException() throws InterruptedException {
List<Integer> expected1List = Arrays.asList( 10, 4, 3, 2, 1 );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/78f3da6f/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImplTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImplTest.java
index 1cf6d54..fa6a3fd 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImplTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImplTest.java
@@ -56,7 +56,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@Ignore("Temporarily removing until delete is re-enabled")
+@Ignore("Pending re-enable of delete functionality")
public class ShardGroupDeletionImplTest {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/78f3da6f/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
index abf2be5..bd75adf 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
@@ -393,7 +393,7 @@ public class GroupResourceIT extends AbstractRestIT {
* Post a group activity and make sure it can be read back only by group members
*
*/
- @Ignore("Fails. See todo in the test itself.")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1119. Fails. See todo in the test itself.")
@Test
public void postGroupActivity() throws IOException {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/78f3da6f/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java
index 2777967..185a37b 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java
@@ -45,7 +45,7 @@ public class EventsResourceIT extends AbstractRestIT {
@Test
- @Ignore("Events not working yet")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1118. Events not working yet")
public void testEventPostandGet() throws IOException {
Map<String, Object> payload = new LinkedHashMap<String, Object>();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/78f3da6f/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
index c615b60..bb5593e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
@@ -77,7 +77,8 @@ public class AdminEmailEncodingIT extends AbstractRestIT {
* @throws Exception
*/
@Test
- @Ignore //This fails. I'm not sure if it is by design, but a single quote is valid in an email address
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1117")
+ // This fails. I'm not sure if it is by design, but a single quote is valid in an email address
public void getTokenQuote() throws Exception {
doTest("'");
}