From 1900bc4c99a9096910f044e1ee4f2eccc725a2e7 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Wed, 26 Sep 2012 15:15:40 +0000 Subject: [PATCH] JDK7: Fix order in which test methods are executed, to make test pass git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42055 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../oauth1/OAuth1CredentialsStoreServiceTest.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java b/source/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java index c5246252e0..08bb938a99 100644 --- a/source/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java +++ b/source/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java @@ -37,9 +37,12 @@ import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PropertyMap; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import org.junit.Test; import org.springframework.context.ApplicationContext; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class OAuth1CredentialsStoreServiceTest { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); @@ -89,7 +92,7 @@ public class OAuth1CredentialsStoreServiceTest } @Test - public void testStorePersonalOAuth1Credentials() + public void test1StorePersonalOAuth1Credentials() { AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE); //Store new credentials @@ -108,7 +111,7 @@ public class OAuth1CredentialsStoreServiceTest } @Test - public void testStoreSharedOAuth1Credentials() + public void test2StoreSharedOAuth1Credentials() { AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE); //Store new credentials @@ -123,7 +126,7 @@ public class OAuth1CredentialsStoreServiceTest } @Test (expected=AccessDeniedException.class) - public void testSecureUpdateSharedOAuth1CredentialsTestUpdateSharedOAuth1Credentials() + public void test3SecureUpdateSharedOAuth1CredentialsTestUpdateSharedOAuth1Credentials() { { AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO); @@ -147,7 +150,7 @@ public class OAuth1CredentialsStoreServiceTest } @Test - public void testDeletePesonalOAuth1Credentials() + public void test4DeletePesonalOAuth1Credentials() { AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE); boolean deleted = oauth1CredentialsStoreService.deletePersonalOAuth1Credentials(RemoteSystemId); @@ -161,7 +164,7 @@ public class OAuth1CredentialsStoreServiceTest } @Test(expected=AccessDeniedException.class) - public void testSecureDeleteSharedOAuth1CredentialsTestDeleteSharedOAuth1Credentials() + public void test5SecureDeleteSharedOAuth1CredentialsTestDeleteSharedOAuth1Credentials() { { AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);