You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/09/02 00:51:43 UTC

[24/35] usergrid git commit: Fix test for SSO enabled Usergrid when generating admin tokens.

Fix test for SSO enabled Usergrid when generating admin tokens.


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

Branch: refs/heads/master
Commit: 1e925c023ebb70d777b326529659d72e6f104d9d
Parents: 2f21b31
Author: Michael Russo <mr...@apigee.com>
Authored: Tue Aug 30 16:23:18 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Tue Aug 30 16:23:18 2016 -0700

----------------------------------------------------------------------
 .../apache/usergrid/rest/management/ManagementResourceIT.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/1e925c02/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 1da00d4..1a3eb1d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -38,6 +38,7 @@ import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.util.*;
 
+import static org.apache.usergrid.security.tokens.cassandra.TokenServiceImpl.USERGRID_EXTERNAL_SSO_PROVIDER;
 import static org.apache.usergrid.security.tokens.cassandra.TokenServiceImpl.USERGRID_EXTERNAL_SSO_PROVIDER_URL;
 import static org.apache.usergrid.security.tokens.cassandra.TokenServiceImpl.USERGRID_EXTERNAL_SSO_ENABLED;
 import static org.apache.usergrid.utils.MapUtils.hashMap;
@@ -660,7 +661,7 @@ public class ManagementResourceIT extends AbstractRestIT {
 
 
     @Test
-    public void testSuperuserOnlyWhenValidateExternalTokensEnabled() throws Exception {
+    public void testSuperuserOnlyWhenValidateExternalTokensEnabledForUsergridProvider() throws Exception {
 
         // create an org and an admin user
 
@@ -673,6 +674,7 @@ public class ManagementResourceIT extends AbstractRestIT {
 
         String suToken = clientSetup.getSuperuserToken().getAccessToken();
         Map<String, String> props = new HashMap<String, String>();
+        props.put(USERGRID_EXTERNAL_SSO_PROVIDER, "usergrid");
         props.put(USERGRID_EXTERNAL_SSO_ENABLED, "true");
         props.put(USERGRID_EXTERNAL_SSO_PROVIDER_URL, getBaseURI().toURL().toExternalForm() );
         pathResource( "testproperties" ).post( props );