Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[cfid-283] Remove cycles in password and scim

[Fixes #39073217]

Change-Id: Ifcb265d229c97ee6a66f9ec49bbabd5e3206e6c2
  • Loading branch information...
commit 2a5e049d4ca469ec8681466fcba825adfc4e712b 1 parent 9fbbd9f
@dsyer dsyer authored
Showing with 64 additions and 40 deletions.
  1. +1 −13 common/src/main/java/org/cloudfoundry/identity/uaa/{password → message}/PasswordChangeRequest.java
  2. +1 −1  common/src/main/java/org/cloudfoundry/identity/uaa/{rest → message}/SimpleMessage.java
  3. +1 −1  common/src/main/java/org/cloudfoundry/identity/uaa/oauth/ClientAdminEndpoints.java
  4. +1 −1  common/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenAdminEndpoints.java
  5. +2 −1  common/src/main/java/org/cloudfoundry/identity/uaa/password/PasswordChangeEndpoint.java
  6. +1 −1  common/src/main/java/org/cloudfoundry/identity/uaa/scim/remote/RemoteScimUserProvisioning.java
  7. +0 −1  common/src/main/java/org/cloudfoundry/identity/uaa/test/ParentContextLoader.java
  8. +1 −1  common/src/main/java/org/cloudfoundry/identity/uaa/{integration → test}/TestAccountSetup.java
  9. +1 −1  common/src/main/java/org/cloudfoundry/identity/uaa/{integration → test}/TestProfileEnvironment.java
  10. +0 −1  common/src/main/java/org/cloudfoundry/identity/uaa/test/TestUtils.java
  11. +1 −1  common/src/main/java/org/cloudfoundry/identity/uaa/{integration → test}/UaaTestAccounts.java
  12. +1 −1  common/src/main/java/org/cloudfoundry/identity/uaa/{integration → test}/UrlHelper.java
  13. +1 −1  common/src/test/java/org/cloudfoundry/identity/uaa/oauth/TokenAdminEndpointsTests.java
  14. +1 −0  common/src/test/java/org/cloudfoundry/identity/uaa/password/PasswordChangeEndpointTests.java
  15. +1 −0  common/src/test/java/org/cloudfoundry/identity/uaa/rest/MessageTests.java
  16. +1 −1  common/src/test/java/org/cloudfoundry/identity/uaa/scim/remote/RemoteScimUserProvisioningTests.java
  17. +2 −2 samples/api/src/test/java/org/cloudfoundry/identity/api/web/AppsIntegrationTests.java
  18. +2 −2 samples/api/src/test/java/org/cloudfoundry/identity/api/web/CloudfoundryApiIntegrationTests.java
  19. +1 −1  samples/api/src/test/java/org/cloudfoundry/identity/api/web/ServerRunning.java
  20. +2 −2 samples/app/src/test/java/org/cloudfoundry/identity/app/integration/AuthenticationIntegrationTests.java
  21. +2 −2 samples/app/src/test/java/org/cloudfoundry/identity/app/integration/ServerRunning.java
  22. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/AuthorizationCodeGrantIntegrationTests.java
  23. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java
  24. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ClientAdminEndpointsIntegrationTests.java
  25. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ClientInfoEndpointIntegrationTests.java
  26. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/FormLoginIntegrationTests.java
  27. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ImplicitTokenGrantIntegrationTests.java
  28. +3 −1 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/LoginServerSecurityIntegrationTests.java
  29. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/NativeApplicationIntegrationTests.java
  30. +3 −1 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordChangeEndpointIntegrationTests.java
  31. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RefreshTokenSupportIntegrationTests.java
  32. +3 −1 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ScimGroupEndpointsIntegrationTests.java
  33. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ScimUserEndpointsIntegrationTests.java
  34. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ServerRunning.java
  35. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/TokenAdminEndpointsIntegrationTests.java
  36. +2 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/UserInfoEndpointIntegrationTests.java
  37. +1 −0  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/VmcAuthenticationTests.java
  38. +3 −1 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/VmcScimUserEndpointIntegrationTests.java
  39. +3 −1 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/VmcUserIdTranslationEndpointIntegrationTests.java
View
14 .../identity/uaa/password/PasswordChangeRequest.java → ...y/identity/uaa/message/PasswordChangeRequest.java
@@ -10,13 +10,9 @@
* subcomponents is subject to the terms and conditions of the
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.uaa.password;
+package org.cloudfoundry.identity.uaa.message;
-import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.springframework.util.Assert;
-
-import java.util.Arrays;
/**
* @author Dave Syer
@@ -44,12 +40,4 @@ public void setOldPassword(String oldPassword) {
this.oldPassword = oldPassword;
}
- public void setSchemas(String[] schemas) {
- Assert.isTrue(Arrays.equals(ScimUser.SCHEMAS, schemas), "Only schema '" + ScimUser.SCHEMAS[0] + "' is currently supported");
- }
-
- public String[] getSchemas() {
- return ScimUser.SCHEMAS;
- }
-
}
View
2  ...cloudfoundry/identity/uaa/rest/SimpleMessage.java → ...udfoundry/identity/uaa/message/SimpleMessage.java
@@ -11,7 +11,7 @@
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.uaa.rest;
+package org.cloudfoundry.identity.uaa.message;
import java.io.Serializable;
View
2  common/src/main/java/org/cloudfoundry/identity/uaa/oauth/ClientAdminEndpoints.java
@@ -26,7 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.cloudfoundry.identity.uaa.rest.SimpleMessage;
+import org.cloudfoundry.identity.uaa.message.SimpleMessage;
import org.cloudfoundry.identity.uaa.security.DefaultSecurityContextAccessor;
import org.cloudfoundry.identity.uaa.security.SecurityContextAccessor;
import org.cloudfoundry.identity.uaa.util.UaaStringUtils;
View
2  common/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenAdminEndpoints.java
@@ -18,7 +18,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.cloudfoundry.identity.uaa.rest.SimpleMessage;
+import org.cloudfoundry.identity.uaa.message.SimpleMessage;
import org.cloudfoundry.identity.uaa.scim.exception.ScimResourceNotFoundException;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.cloudfoundry.identity.uaa.scim.ScimUserProvisioning;
View
3  common/src/main/java/org/cloudfoundry/identity/uaa/password/PasswordChangeEndpoint.java
@@ -16,7 +16,8 @@
import org.apache.commons.logging.LogFactory;
import org.cloudfoundry.identity.uaa.error.ConvertingExceptionView;
import org.cloudfoundry.identity.uaa.error.ExceptionReport;
-import org.cloudfoundry.identity.uaa.rest.SimpleMessage;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
+import org.cloudfoundry.identity.uaa.message.SimpleMessage;
import org.cloudfoundry.identity.uaa.scim.ScimUserProvisioning;
import org.cloudfoundry.identity.uaa.scim.exception.InvalidPasswordException;
import org.cloudfoundry.identity.uaa.scim.exception.ScimException;
View
2  common/src/main/java/org/cloudfoundry/identity/uaa/scim/remote/RemoteScimUserProvisioning.java
@@ -13,7 +13,7 @@
package org.cloudfoundry.identity.uaa.scim.remote;
-import org.cloudfoundry.identity.uaa.password.PasswordChangeRequest;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.cloudfoundry.identity.uaa.scim.ScimUserProvisioning;
import org.cloudfoundry.identity.uaa.scim.exception.InvalidPasswordException;
View
1  common/src/main/java/org/cloudfoundry/identity/uaa/test/ParentContextLoader.java
@@ -13,7 +13,6 @@
package org.cloudfoundry.identity.uaa.test;
-import org.cloudfoundry.identity.uaa.integration.TestProfileEnvironment;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.context.support.GenericXmlApplicationContext;
import org.springframework.test.context.support.GenericXmlContextLoader;
View
2  ...ry/identity/uaa/integration/TestAccountSetup.java → ...udfoundry/identity/uaa/test/TestAccountSetup.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.cloudfoundry.identity.uaa.integration;
+package org.cloudfoundry.identity.uaa.test;
import static org.junit.Assert.assertEquals;
View
2  ...ntity/uaa/integration/TestProfileEnvironment.java → ...dry/identity/uaa/test/TestProfileEnvironment.java
@@ -10,7 +10,7 @@
* subcomponents is subject to the terms and conditions of the
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.uaa.integration;
+package org.cloudfoundry.identity.uaa.test;
import java.util.ArrayList;
import java.util.Collections;
View
1  common/src/main/java/org/cloudfoundry/identity/uaa/test/TestUtils.java
@@ -19,7 +19,6 @@
import javax.sql.DataSource;
-import org.cloudfoundry.identity.uaa.integration.TestProfileEnvironment;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.springframework.core.env.Environment;
import org.springframework.core.io.ClassPathResource;
View
2  ...dry/identity/uaa/integration/UaaTestAccounts.java → ...oudfoundry/identity/uaa/test/UaaTestAccounts.java
@@ -10,7 +10,7 @@
* subcomponents is subject to the terms and conditions of the
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.uaa.integration;
+package org.cloudfoundry.identity.uaa.test;
import java.util.Arrays;
import java.util.HashMap;
View
2  ...udfoundry/identity/uaa/integration/UrlHelper.java → ...org/cloudfoundry/identity/uaa/test/UrlHelper.java
@@ -11,7 +11,7 @@
* subcomponent's license, as noted in the LICENSE file.
*/
-package org.cloudfoundry.identity.uaa.integration;
+package org.cloudfoundry.identity.uaa.test;
/**
* Convenience interface for classes that externalize URLs.
View
2  common/src/test/java/org/cloudfoundry/identity/uaa/oauth/TokenAdminEndpointsTests.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Collections;
-import org.cloudfoundry.identity.uaa.rest.SimpleMessage;
+import org.cloudfoundry.identity.uaa.message.SimpleMessage;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.cloudfoundry.identity.uaa.scim.ScimUserProvisioning;
import org.junit.Test;
View
1  common/src/test/java/org/cloudfoundry/identity/uaa/password/PasswordChangeEndpointTests.java
@@ -15,6 +15,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.cloudfoundry.identity.uaa.scim.exception.ScimException;
import org.cloudfoundry.identity.uaa.scim.jdbc.JdbcScimUserProvisioning;
View
1  common/src/test/java/org/cloudfoundry/identity/uaa/rest/MessageTests.java
@@ -17,6 +17,7 @@
import java.io.StringWriter;
+import org.cloudfoundry.identity.uaa.message.SimpleMessage;
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test;
View
2  common/src/test/java/org/cloudfoundry/identity/uaa/scim/remote/RemoteScimUserProvisioningTests.java
@@ -13,7 +13,7 @@
package org.cloudfoundry.identity.uaa.scim.remote;
-import org.cloudfoundry.identity.uaa.password.PasswordChangeRequest;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
import org.cloudfoundry.identity.uaa.scim.remote.RemoteScimUserProvisioning;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.junit.After;
View
4 samples/api/src/test/java/org/cloudfoundry/identity/api/web/AppsIntegrationTests.java
@@ -16,8 +16,8 @@
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
-import org.cloudfoundry.identity.uaa.integration.TestAccountSetup;
-import org.cloudfoundry.identity.uaa.integration.UaaTestAccounts;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.http.HttpStatus;
View
4 samples/api/src/test/java/org/cloudfoundry/identity/api/web/CloudfoundryApiIntegrationTests.java
@@ -16,8 +16,8 @@
import org.cloudfoundry.client.lib.CloudFoundryClient;
import org.cloudfoundry.client.lib.CloudInfo;
-import org.cloudfoundry.identity.uaa.integration.TestAccountSetup;
-import org.cloudfoundry.identity.uaa.integration.UaaTestAccounts;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
View
2  samples/api/src/test/java/org/cloudfoundry/identity/api/web/ServerRunning.java
@@ -22,7 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.cloudfoundry.identity.uaa.integration.UrlHelper;
+import org.cloudfoundry.identity.uaa.test.UrlHelper;
import org.junit.Assume;
import org.junit.internal.AssumptionViolatedException;
import org.junit.rules.TestWatchman;
View
4 samples/app/src/test/java/org/cloudfoundry/identity/app/integration/AuthenticationIntegrationTests.java
@@ -15,8 +15,8 @@
import java.util.Arrays;
-import org.cloudfoundry.identity.uaa.integration.TestAccountSetup;
-import org.cloudfoundry.identity.uaa.integration.UaaTestAccounts;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.http.HttpHeaders;
View
4 samples/app/src/test/java/org/cloudfoundry/identity/app/integration/ServerRunning.java
@@ -23,8 +23,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.cloudfoundry.identity.uaa.integration.TestProfileEnvironment;
-import org.cloudfoundry.identity.uaa.integration.UrlHelper;
+import org.cloudfoundry.identity.uaa.test.TestProfileEnvironment;
+import org.cloudfoundry.identity.uaa.test.UrlHelper;
import org.junit.Assume;
import org.junit.internal.AssumptionViolatedException;
import org.junit.rules.TestWatchman;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/AuthorizationCodeGrantIntegrationTests.java
@@ -20,6 +20,8 @@
import java.util.List;
import java.util.Map;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java
@@ -19,6 +19,8 @@
import java.util.Arrays;
import java.util.Map;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.http.HttpHeaders;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ClientAdminEndpointsIntegrationTests.java
@@ -22,6 +22,8 @@
import org.cloudfoundry.identity.uaa.error.UaaException;
import org.cloudfoundry.identity.uaa.oauth.SecretChangeRequest;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ClientInfoEndpointIntegrationTests.java
@@ -17,6 +17,8 @@
import java.util.Arrays;
import java.util.Map;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.http.HttpHeaders;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/FormLoginIntegrationTests.java
@@ -17,6 +17,8 @@
import java.util.Arrays;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.http.HttpHeaders;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ImplicitTokenGrantIntegrationTests.java
@@ -19,6 +19,8 @@
import java.net.URI;
import java.util.Arrays;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.http.HttpHeaders;
View
4 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/LoginServerSecurityIntegrationTests.java
@@ -19,8 +19,10 @@
import java.util.Collections;
import java.util.Map;
-import org.cloudfoundry.identity.uaa.password.PasswordChangeRequest;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/NativeApplicationIntegrationTests.java
@@ -19,6 +19,8 @@
import java.util.List;
import java.util.Map;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
View
4 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PasswordChangeEndpointIntegrationTests.java
@@ -15,8 +15,10 @@
import static org.junit.Assert.assertEquals;
-import org.cloudfoundry.identity.uaa.password.PasswordChangeRequest;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/RefreshTokenSupportIntegrationTests.java
@@ -14,6 +14,8 @@
import java.util.Arrays;
import java.util.Map;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
View
4 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ScimGroupEndpointsIntegrationTests.java
@@ -14,10 +14,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.cloudfoundry.identity.uaa.password.PasswordChangeRequest;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.cloudfoundry.identity.uaa.scim.ScimGroup;
import org.cloudfoundry.identity.uaa.scim.ScimGroupMember;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ScimUserEndpointsIntegrationTests.java
@@ -25,6 +25,8 @@
import java.util.UUID;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Assume;
import org.junit.Before;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/ServerRunning.java
@@ -24,6 +24,8 @@
import org.apache.http.client.HttpClient;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.client.params.CookiePolicy;
+import org.cloudfoundry.identity.uaa.test.TestProfileEnvironment;
+import org.cloudfoundry.identity.uaa.test.UrlHelper;
import org.junit.Assume;
import org.junit.internal.AssumptionViolatedException;
import org.junit.rules.MethodRule;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/TokenAdminEndpointsIntegrationTests.java
@@ -17,6 +17,8 @@
import java.util.Arrays;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
View
2  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/UserInfoEndpointIntegrationTests.java
@@ -15,6 +15,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.http.HttpStatus;
View
1  uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/VmcAuthenticationTests.java
@@ -19,6 +19,7 @@
import java.util.Arrays;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
View
4 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/VmcScimUserEndpointIntegrationTests.java
@@ -18,8 +18,10 @@
import java.util.Collections;
import java.util.Map;
-import org.cloudfoundry.identity.uaa.password.PasswordChangeRequest;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Assume;
import org.junit.Rule;
import org.junit.Test;
View
4 ...rc/test/java/org/cloudfoundry/identity/uaa/integration/VmcUserIdTranslationEndpointIntegrationTests.java
@@ -19,9 +19,11 @@
import java.util.Collections;
import java.util.Map;
-import org.cloudfoundry.identity.uaa.password.PasswordChangeRequest;
+import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.cloudfoundry.identity.uaa.scim.ScimUser.Group;
+import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
+import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
import org.junit.Assume;
import org.junit.Rule;
import org.junit.Test;
Please sign in to comment.
Something went wrong with that request. Please try again.