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:13:41 UTC
usergrid git commit: Adding more JIRA links;
all but 10 ignores are now linked to JIRA issues.
Repository: usergrid
Updated Branches:
refs/heads/ignores 22c29fb7c -> 68be7d702
Adding more JIRA links; all but 10 ignores are now linked to JIRA issues.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/68be7d70
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/68be7d70
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/68be7d70
Branch: refs/heads/ignores
Commit: 68be7d7027c51940445a43bed5fcb3270ff75846
Parents: 22c29fb
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 17 10:13:38 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 17 10:13:38 2015 -0500
----------------------------------------------------------------------
.../usergrid/batch/job/SchedulerRuntime1IT.java | 3 ++-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 3 ++-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 3 ++-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 3 ++-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 3 ++-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 3 ++-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 3 ++-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 3 ++-
.../batch/job/SchedulerRuntimeIntervalIT.java | 3 ++-
.../java/org/apache/usergrid/mq/MessagesIT.java | 8 ++++----
.../org/apache/usergrid/rest/IndexResourceIT.java | 4 +++-
.../usergrid/rest/management/AdminUsersIT.java | 18 ++++++++++--------
.../importer/ImportConnectionsTest.java | 2 +-
13 files changed, 36 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime1IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime1IT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime1IT.java
index 380a683..a7f2741 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime1IT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime1IT.java
@@ -34,7 +34,8 @@ import static org.junit.Assert.assertTrue;
* Class to test job runtimes.
*/
-@Ignore("These tests no longer work with shared Spring context, need to be fixed https://issues.apache.org/jira/browse/USERGRID-1105" )
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntime1IT extends AbstractSchedulerRuntimeIT {
private static final Logger logger = LoggerFactory.getLogger(SchedulerRuntime1IT.class.getName());
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime2IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime2IT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime2IT.java
index 2c2aa40..9f18dd0 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime2IT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime2IT.java
@@ -34,7 +34,8 @@ import static org.junit.Assert.assertTrue;
* Class to test job runtimes
*/
-@Ignore("These tests no longer work with shared Spring context, need to be fixed https://issues.apache.org/jira/browse/USERGRID-1105" )
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntime2IT extends AbstractSchedulerRuntimeIT {
private static final Logger logger = LoggerFactory.getLogger(SchedulerRuntime2IT.class.getName());
/** Test the scheduler ramps up correctly when there are more jobs to be read after a pause */
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime3IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime3IT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime3IT.java
index 5fc6398..60b25ab 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime3IT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime3IT.java
@@ -33,7 +33,8 @@ import static org.junit.Assert.assertTrue;
* Class to test job runtimes
*/
-@Ignore("These tests no longer work with shared Spring context, need to be fixed https://issues.apache.org/jira/browse/USERGRID-1105" )
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntime3IT extends AbstractSchedulerRuntimeIT {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime4IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime4IT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime4IT.java
index fbd49f2..97acaee 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime4IT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime4IT.java
@@ -31,7 +31,8 @@ import static org.junit.Assert.assertTrue;
* Class to test job runtimes
*/
-@Ignore("These tests no longer work with shared Spring context, need to be fixed https://issues.apache.org/jira/browse/USERGRID-1105" )
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntime4IT extends AbstractSchedulerRuntimeIT {
/**
* Test the scheduler ramps up correctly when there are more jobs to be read after a pause when the job specifies
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime5IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime5IT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime5IT.java
index 1b5cbab..5973fe9 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime5IT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime5IT.java
@@ -31,7 +31,8 @@ import static org.junit.Assert.assertTrue;
* Class to test job runtimes
*/
-@Ignore("These tests no longer work with shared Spring context, need to be fixed https://issues.apache.org/jira/browse/USERGRID-1105" )
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntime5IT extends AbstractSchedulerRuntimeIT {
/**
* Test the scheduler ramps up correctly when there are more jobs to be read after a pause when the job specifies
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime6IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime6IT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime6IT.java
index 5d2e00d..e8e4e54 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime6IT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime6IT.java
@@ -35,7 +35,8 @@ import static org.junit.Assert.assertTrue;
* Class to test job runtimes
*/
-@Ignore("These tests no longer work with shared Spring context, need to be fixed https://issues.apache.org/jira/browse/USERGRID-1105" )
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntime6IT extends AbstractSchedulerRuntimeIT {
/**
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime7IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime7IT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime7IT.java
index 000996d..6d4b4a4 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime7IT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime7IT.java
@@ -32,7 +32,8 @@ import static org.junit.Assert.assertTrue;
*/
//@org.junit.Ignore( "Todd you need to take a look at this since it's not clear to me what was intended in this test." )
-@Ignore("These tests no longer work with shared Spring context, need to be fixed https://issues.apache.org/jira/browse/USERGRID-1105" )
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntime7IT extends AbstractSchedulerRuntimeIT {
/** Test that we're only running once, even when a job exceeds the heartbeat time */
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime8IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime8IT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime8IT.java
index 65b5e67..bd49781 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime8IT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntime8IT.java
@@ -35,7 +35,8 @@ import static org.junit.Assert.assertFalse;
* Class to test job runtimes
*/
-@Ignore("These tests no longer work with shared Spring context, need to be fixed https://issues.apache.org/jira/browse/USERGRID-1105" )
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntime8IT extends AbstractSchedulerRuntimeIT {
/**
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntimeIntervalIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntimeIntervalIT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntimeIntervalIT.java
index 9504c9f..45d58a9 100644
--- a/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntimeIntervalIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/SchedulerRuntimeIntervalIT.java
@@ -36,7 +36,8 @@ import static org.junit.Assert.assertTrue;
* Tests saturation at each point of the runtime as well
*/
-@Ignore("Ignored awaiting fix for USERGRID-267")
+@Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1105. Spring problems." )
+// These tests no longer work with shared Spring context, need to be fixed
public class SchedulerRuntimeIntervalIT extends AbstractSchedulerRuntimeIT {
private static final Logger logger =
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java b/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java
index 70032f7..52ca4d8 100644
--- a/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java
@@ -48,7 +48,7 @@ public class MessagesIT extends AbstractCoreIT {
}
- @Ignore
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1116. ")
@Test
public void testMessages() throws Exception {
LOG.info( "MessagesIT.testMessages" );
@@ -118,7 +118,7 @@ public class MessagesIT extends AbstractCoreIT {
}
- @Ignore
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1116. ")
@Test
public void testSubscriberSearch() throws Exception {
QueueManager qm = app.getQm();
@@ -171,7 +171,7 @@ public class MessagesIT extends AbstractCoreIT {
}
- @Ignore
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1116. ")
@Test
public void testConsumer() throws Exception {
LOG.info( "Creating messages" );
@@ -214,7 +214,7 @@ public class MessagesIT extends AbstractCoreIT {
}
- @Ignore
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1116. ")
@Test
public void testTransactions() throws Exception {
QueueManager qm = app.getQm();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
index af91ad7..6a69190 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
@@ -20,6 +20,7 @@
package org.apache.usergrid.rest;
+import org.apache.usergrid.ExperimentalTest;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
@@ -27,6 +28,7 @@ import org.apache.usergrid.rest.test.resource.model.Token;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -99,8 +101,8 @@ public class IndexResourceIT extends AbstractRestIT {
}
- @Ignore
@Test
+ @Category(ExperimentalTest.class)
public void TestAddIndex() throws Exception{
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
index fba0c43..09a76aa 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
@@ -187,7 +187,7 @@ public class AdminUsersIT extends AbstractRestIT {
* TODO:test for parallel test that changing the properties here won't affect other tests
* @throws Exception
*/
- @Ignore("breaks other tests")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1115. breaks other tests")
@Test
public void testUnconfirmedAdminLogin() throws Exception{
@@ -273,7 +273,7 @@ public class AdminUsersIT extends AbstractRestIT {
* Test that the system admin doesn't need a confirmation email
* @throws Exception
*/
- @Ignore("breaks other tests")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1115. breaks other tests")
@Test
public void testSystemAdminNeedsNoConfirmation() throws Exception{
//Save original properties to return them to normal at the end of the test
@@ -311,7 +311,8 @@ public class AdminUsersIT extends AbstractRestIT {
* Test that the test account doesn't need confirmation and is created automatically.
* @throws Exception
*/
- @Ignore("Test doesn't pass because the test account isn't getting correct instantiated")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1115. Test account problem")
+ // Test doesn't pass because the test account isn't getting correct instantiated
@Test
public void testTestUserNeedsNoConfirmation() throws Exception{
//Save original properties to return them to normal at the end of the test
@@ -347,8 +348,9 @@ public class AdminUsersIT extends AbstractRestIT {
* Update the current management user and make sure the change persists
* @throws Exception
*/
- @Ignore("Fails because we cannot GET a management user with a super user token - only with an Admin level token."
- + "But, we can PUT with a superuser token. This test will work once that issue has been resolved.")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1115.")
+ // Fails because we cannot GET a management user with a super user token - only with an Admin level token.
+ // But, we can PUT with a superuser token. This test will work once that issue has been resolved.
@Test
public void updateManagementUser() throws Exception {
@@ -398,7 +400,8 @@ public class AdminUsersIT extends AbstractRestIT {
assertFalse( inbox.isEmpty() );
}
- @Ignore("Build problems - Test is broken due to viewables not being properly returned in the embedded tomcat")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1115. Viewables issue.")
+ // Test is broken due to viewables not being properly returned in the embedded tomcat
@Test
public void checkFormPasswordReset() throws Exception {
@@ -435,7 +438,6 @@ public class AdminUsersIT extends AbstractRestIT {
assertTrue( html.contains( "invalid token" ) );
}
-// // TODO: will work once resetpw viewables work
// @Test
// public void passwordResetIncorrectUserName() throws Exception {
//
@@ -636,7 +638,7 @@ public class AdminUsersIT extends AbstractRestIT {
}
}
- @Ignore("breaks other tests")
+ @Ignore("Pending https://issues.apache.org/jira/browse/USERGRID-1115. breaks other tests")
@Test
public void testProperties(){
ApiResponse originalTestPropertiesResponse = clientSetup.getRestClient().testPropertiesResource().get();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/68be7d70/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportConnectionsTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportConnectionsTest.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportConnectionsTest.java
index 8ca3caa..05948ff 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportConnectionsTest.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportConnectionsTest.java
@@ -58,7 +58,7 @@ public class ImportConnectionsTest {
@Test
- @Ignore("Because getTargetEntities() is broken")
+ @Ignore("Pending merge of export-feature branch. Because getTargetEntities() is broken")
public void testCreateAndCountConnectionsViaGet() throws Exception {
doTestCreateAndCountConnections(new ConnectionCounter() {