mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Collapsed test methods to avoid ordering issues
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42014 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -123,26 +123,27 @@ public class OAuth1CredentialsStoreServiceTest
|
||||
}
|
||||
|
||||
@Test (expected=AccessDeniedException.class)
|
||||
public void testSecureUpdateSharedOAuth1Credentials()
|
||||
public void testSecureUpdateSharedOAuth1CredentialsTestUpdateSharedOAuth1Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
|
||||
//Update credentials
|
||||
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
|
||||
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
|
||||
oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
|
||||
}
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
|
||||
//Update credentials
|
||||
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
|
||||
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
|
||||
oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateSharedOAuth1Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
|
||||
//Update credentials
|
||||
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
|
||||
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
|
||||
OAuth1CredentialsInfo _oAuth1CredentialsInfo = oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
|
||||
|
||||
assertEquals("Expect that access tokens will match", UpdatedToken, _oAuth1CredentialsInfo.getOAuthToken());
|
||||
assertEquals("Expect the refresh token will match", UpdatedSecret, _oAuth1CredentialsInfo.getOAuthSecret());
|
||||
//public void testUpdateSharedOAuth1Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
|
||||
//Update credentials
|
||||
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
|
||||
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
|
||||
OAuth1CredentialsInfo _oAuth1CredentialsInfo = oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
|
||||
|
||||
assertEquals("Expect that access tokens will match", UpdatedToken, _oAuth1CredentialsInfo.getOAuthToken());
|
||||
assertEquals("Expect the refresh token will match", UpdatedSecret, _oAuth1CredentialsInfo.getOAuthSecret());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -160,23 +161,23 @@ public class OAuth1CredentialsStoreServiceTest
|
||||
}
|
||||
|
||||
@Test(expected=AccessDeniedException.class)
|
||||
public void testSecureDeleteSharedOAuth1Credentials()
|
||||
public void testSecureDeleteSharedOAuth1CredentialsTestDeleteSharedOAuth1Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
|
||||
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
|
||||
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
|
||||
oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteSharedOAuth1Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
|
||||
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
|
||||
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
|
||||
boolean deleted = oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
|
||||
|
||||
assertTrue(deleted);
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
|
||||
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
|
||||
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
|
||||
oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
|
||||
}
|
||||
//public void testDeleteSharedOAuth1Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
|
||||
List<OAuth1CredentialsInfo> sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
|
||||
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
|
||||
boolean deleted = oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
|
||||
|
||||
assertTrue(deleted);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@@ -146,52 +146,54 @@ public class OAuth2CredentialsStoreServiceTest
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateSharedOAuth2Credentials()
|
||||
public void testUpdateSharedOAuth2CredentialsTestDeletePesonalOAuth2Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
|
||||
//Update credentials
|
||||
List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
|
||||
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 the expiration date will match", UpdatedExpiresAt, _oAuth2CredentialsInfo.getOAuthTicketExpiresAt());
|
||||
assertEquals("Expect that the issued date will match", UpdatedIssuedAt, _oAuth2CredentialsInfo.getOAuthTicketIssuedAt());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeletePesonalOAuth2Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
|
||||
boolean deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId);
|
||||
|
||||
assertTrue(deleted);
|
||||
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
|
||||
boolean _deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId);
|
||||
|
||||
assertFalse(_deleted);
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
|
||||
//Update credentials
|
||||
List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
|
||||
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 the expiration date will match", UpdatedExpiresAt, _oAuth2CredentialsInfo.getOAuthTicketExpiresAt());
|
||||
assertEquals("Expect that the issued date will match", UpdatedIssuedAt, _oAuth2CredentialsInfo.getOAuthTicketIssuedAt());
|
||||
}
|
||||
|
||||
//public void testDeletePesonalOAuth2Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
|
||||
boolean deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId);
|
||||
|
||||
assertTrue(deleted);
|
||||
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
|
||||
boolean _deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId);
|
||||
|
||||
assertFalse(_deleted);
|
||||
}
|
||||
}
|
||||
|
||||
@Test(expected=AccessDeniedException.class)
|
||||
public void testSecureDeleteSharedOAuth2Credentials()
|
||||
public void testSecureDeleteSharedOAuth2CredentialsTestDeleteSharedOAuth2Credentials()
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
|
||||
List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
|
||||
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);
|
||||
{
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
|
||||
List<OAuth2CredentialsInfo> sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
|
||||
OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user