Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-659 0c16f0e5a -> 1bd5edd76
fix connections Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1bd5edd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1bd5edd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1bd5edd7 Branch: refs/heads/USERGRID-659 Commit: 1bd5edd76132c1683b919ed2dfe40826e6326975 Parents: 0c16f0e Author: Shawn Feldman <[email protected]> Authored: Thu May 14 17:21:41 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Thu May 14 17:21:41 2015 -0600 ---------------------------------------------------------------------- .../apache/usergrid/management/OrganizationIT.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1bd5edd7/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java b/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java index 3c93fa3..385421e 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java @@ -68,7 +68,7 @@ public class OrganizationIT { final String orgName = uniqueOrg(); OrganizationOwnerInfo organization = newOrgAppAdminRule.createOwnerAndOrganization( orgName, uniqueUsername(), uniqueEmail(),"Ed Anuff", "test" ); //setup.getMgmtSvc().getOrganizationsForAdminUser( organization.getOwner().getUuid() ); //createOrganization( orgName, user, false ); - assertNotNull( organization ); + assertNotNull(organization); setup.getEntityIndex().refresh(); Map<UUID, String> userOrganizations = setup.getMgmtSvc().getOrganizationsForAdminUser( @@ -142,9 +142,9 @@ public class OrganizationIT { // set history to 4 Map<String, Object> props = new HashMap<String, Object>(); - props.put( OrganizationInfo.PASSWORD_HISTORY_SIZE_KEY, 3 ); - organization.setProperties( props ); - setup.getMgmtSvc().updateOrganization( organization ); + props.put(OrganizationInfo.PASSWORD_HISTORY_SIZE_KEY, 3); + organization.setProperties(props); + setup.getMgmtSvc().updateOrganization(organization); // check the history setup.getMgmtSvc().setAdminUserPassword( user.getUuid(), passwords[1] ); // ok @@ -153,10 +153,15 @@ public class OrganizationIT { setup.getMgmtSvc().setAdminUserPassword( user.getUuid(), passwords[4] ); // ok setup.getMgmtSvc().setAdminUserPassword( user.getUuid(), passwords[0] ); // ok - setup.getEmf().getEntityManager( setup.getSmf().getManagementAppId() ); + setup.getEmf().getEntityManager(setup.getSmf().getManagementAppId()); + setup.getEmf().refreshIndex(); try { - setup.getMgmtSvc().setAdminUserPassword( user.getUuid(), passwords[3] ); + int i = 0; + do { + setup.getMgmtSvc().setAdminUserPassword(user.getUuid(), passwords[3]); + Thread.sleep(500); + }while (i++<10); fail( "password change should fail" ); } catch ( RecentlyUsedPasswordException e ) {
