inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Collapsed test methods to avoid ordering issues

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42014 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2012-09-26 09:29:05 +00:00
parent ec8a54d69d
commit 6609ccaab5
2 changed files with 77 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
source/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
View File

@@ -123,26 +123,27 @@ public class OAuth1CredentialsStoreServiceTest
} }
@Test (expected=AccessDeniedException.class) @Test (expected=AccessDeniedException.class)
public void testSecureUpdateSharedOAuth1Credentials() public void testSecureUpdateSharedOAuth1CredentialsTestUpdateSharedOAuth1Credentials()
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO); {
//Update credentials AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId); //Update credentials
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0); List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret); OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
} oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
}
@Test //public void testUpdateSharedOAuth1Credentials()
public void testUpdateSharedOAuth1Credentials() {
{ AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE); //Update credentials
//Update credentials List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId); OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0); OAuth1CredentialsInfo _oAuth1CredentialsInfo = oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
OAuth1CredentialsInfo _oAuth1CredentialsInfo = oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
assertEquals("Expect that access tokens will match", UpdatedToken, _oAuth1CredentialsInfo.getOAuthToken());
assertEquals("Expect that access tokens will match", UpdatedToken, _oAuth1CredentialsInfo.getOAuthToken()); assertEquals("Expect the refresh token will match", UpdatedSecret, _oAuth1CredentialsInfo.getOAuthSecret());
assertEquals("Expect the refresh token will match", UpdatedSecret, _oAuth1CredentialsInfo.getOAuthSecret()); }
} }
@Test @Test
@@ -160,23 +161,23 @@ public class OAuth1CredentialsStoreServiceTest
} }
@Test(expected=AccessDeniedException.class) @Test(expected=AccessDeniedException.class)
public void testSecureDeleteSharedOAuth1Credentials() public void testSecureDeleteSharedOAuth1CredentialsTestDeleteSharedOAuth1Credentials()
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO); {
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId); AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0); List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo); OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
} oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
}
@Test //public void testDeleteSharedOAuth1Credentials()
public void testDeleteSharedOAuth1Credentials() {
{ AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE); List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId); OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0); boolean deleted = oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
boolean deleted = oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
assertTrue(deleted);
assertTrue(deleted); }
} }

82
source/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
View File

@@ -146,52 +146,54 @@ public class OAuth2CredentialsStoreServiceTest
} }
@Test @Test
public void testUpdateSharedOAuth2Credentials() public void testUpdateSharedOAuth2CredentialsTestDeletePesonalOAuth2Credentials()
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE); {
//Update credentials AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId); //Update credentials
OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0); List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
OAuth2CredentialsInfo _oAuth2CredentialsInfo = oauth2CredentialsStoreService.updateSharedOAuth2Credentials(oAuth2CredentialsInfo, RemoteSystemId, UpdatedAccessToken, UpdatedRefreshToken, UpdatedExpiresAt, UpdatedIssuedAt); OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
OAuth2CredentialsInfo _oAuth2CredentialsInfo = oauth2CredentialsStoreService.updateSharedOAuth2Credentials(oAuth2CredentialsInfo, RemoteSystemId, UpdatedAccessToken, UpdatedRefreshToken, UpdatedExpiresAt, UpdatedIssuedAt);
assertEquals("Expect that access tokens will match", UpdatedAccessToken, _oAuth2CredentialsInfo.getOAuthAccessToken());
assertEquals("Expect the refresh token will match", UpdatedRefreshToken, _oAuth2CredentialsInfo.getOAuthRefreshToken()); assertEquals("Expect that access tokens will match", UpdatedAccessToken, _oAuth2CredentialsInfo.getOAuthAccessToken());
assertEquals("Expect that the expiration date will match", UpdatedExpiresAt, _oAuth2CredentialsInfo.getOAuthTicketExpiresAt()); assertEquals("Expect the refresh token will match", UpdatedRefreshToken, _oAuth2CredentialsInfo.getOAuthRefreshToken());
assertEquals("Expect that the issued date will match", UpdatedIssuedAt, _oAuth2CredentialsInfo.getOAuthTicketIssuedAt()); assertEquals("Expect that the expiration date will match", UpdatedExpiresAt, _oAuth2CredentialsInfo.getOAuthTicketExpiresAt());
} assertEquals("Expect that the issued date will match", UpdatedIssuedAt, _oAuth2CredentialsInfo.getOAuthTicketIssuedAt());
}
@Test
public void testDeletePesonalOAuth2Credentials() //public void testDeletePesonalOAuth2Credentials()
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE); AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
boolean deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId); boolean deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId);
assertTrue(deleted); assertTrue(deleted);
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO); AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
boolean _deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId); boolean _deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId);
assertFalse(_deleted); assertFalse(_deleted);
}
} }
@Test(expected=AccessDeniedException.class) @Test(expected=AccessDeniedException.class)
public void testSecureDeleteSharedOAuth2Credentials() public void testSecureDeleteSharedOAuth2CredentialsTestDeleteSharedOAuth2Credentials()
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO); {
List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId); AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0); List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
oauth2CredentialsStoreService.deleteSharedOAuth2Credentials(RemoteSystemId, oAuth2CredentialsInfo); OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
} oauth2CredentialsStoreService.deleteSharedOAuth2Credentials(RemoteSystemId, oAuth2CredentialsInfo);
}
@Test
public void testDeleteSharedOAuth2Credentials()
{
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
boolean deleted = oauth2CredentialsStoreService.deleteSharedOAuth2Credentials(RemoteSystemId, oAuth2CredentialsInfo);
assertTrue(deleted); //public void testDeleteSharedOAuth2Credentials()
{
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
boolean deleted = oauth2CredentialsStoreService.deleteSharedOAuth2Credentials(RemoteSystemId, oAuth2CredentialsInfo);
assertTrue(deleted);
}
} }