You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/23 23:48:40 UTC

[4/7] git commit: Re-enable tests that we ignored due to JSP problems (see also USERGRID-209).

Re-enable tests that we ignored due to JSP problems (see also USERGRID-209).


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a3e3b1f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a3e3b1f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a3e3b1f2

Branch: refs/heads/two-dot-o-events
Commit: a3e3b1f2ffba701aa1c9af354c9982112ff2d143
Parents: a37f318
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Oct 23 11:36:14 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Oct 23 11:36:14 2014 -0400

----------------------------------------------------------------------
 .../usergrid/rest/applications/ApplicationResourceIT.java      | 2 --
 .../java/org/apache/usergrid/rest/management/AdminUsersIT.java | 6 ------
 2 files changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a3e3b1f2/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 6b4f5cf..a370252 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
@@ -373,8 +373,6 @@ public class ApplicationResourceIT extends AbstractRestIT {
 
 
     @Test
-    @Ignore("Because JSP is broken in test setup, possibly due to JSTL classloader issue. "
-            + "see also: https://issues.apache.org/jira/browse/USERGRID-209")
     public void authorizationCodeWithWrongCredentials() throws Exception {
         ApplicationInfo appInfo = setup.getMgmtSvc().getApplicationInfo( "test-organization/test-app" );
         String clientId = setup.getMgmtSvc().getClientIdForApplication( appInfo.getId() );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a3e3b1f2/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 694b12d..91ea270 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
@@ -230,8 +230,6 @@ public class AdminUsersIT extends AbstractRestIT {
 
 
     @Test
-    //@Ignore // Because JSP is broken in test setup, possibly due to JSTL classloader issue
-    // see also: https://issues.apache.org/jira/browse/USERGRID-209
     public void testUnconfirmedAdminLogin() throws Exception {
 
         // Setup properties to require confirmation of users
@@ -575,8 +573,6 @@ public class AdminUsersIT extends AbstractRestIT {
 
 
     @Test
-    @Ignore("Because JSP is broken in test setup, possibly due to JSTL classloader issue. "
-            + "see also: https://issues.apache.org/jira/browse/USERGRID-209")
     public void checkPasswordReset() throws Exception {
 
         refreshIndex(context.getOrgName(), context.getAppName());
@@ -700,8 +696,6 @@ public class AdminUsersIT extends AbstractRestIT {
 
 
     @Test
-    @Ignore("Because JSP is broken in test setup, possibly due to JSTL classloader issue. "
-            + "see also: https://issues.apache.org/jira/browse/USERGRID-209")
     public void checkPasswordChangeTime() throws Exception {
 
         final TestUser user = context.getActiveUser();