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

Test code changes only: Pulled some Authentication handling out into a common JUnit rule.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2012-03-02 00:49:39 +00:00
parent 6cc6268420
commit 57eef7ee93
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/rating/RatingServiceIntegrationTest.java
View File

@@ -49,7 +49,9 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.test.junitrules.AlfrescoPerson; import org.alfresco.util.test.junitrules.AlfrescoPerson;
import org.alfresco.util.test.junitrules.ApplicationContextInit; import org.alfresco.util.test.junitrules.ApplicationContextInit;
import org.alfresco.util.test.junitrules.RunAsFullyAuthenticatedRule;
import org.alfresco.util.test.junitrules.TemporaryNodes; import org.alfresco.util.test.junitrules.TemporaryNodes;
import org.alfresco.util.test.junitrules.RunAsFullyAuthenticatedRule.RunAsUser;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.ClassRule; import org.junit.ClassRule;
@@ -82,6 +84,10 @@ public class RatingServiceIntegrationTest
// A rule to manage test nodes use in each test method // A rule to manage test nodes use in each test method
@Rule public TemporaryNodes testNodes = new TemporaryNodes(APP_CONTEXT_INIT); @Rule public TemporaryNodes testNodes = new TemporaryNodes(APP_CONTEXT_INIT);
// A rule to allow individual test methods all to be run as "UserOne".
// Some test methods need to switch user during execution which they are free to do.
@Rule public RunAsFullyAuthenticatedRule runAsRule = new RunAsFullyAuthenticatedRule(TEST_USER1);
// Various services // Various services
private static NodeService NODE_SERVICE; private static NodeService NODE_SERVICE;
private static RatingService RATING_SERVICE; private static RatingService RATING_SERVICE;
@@ -155,8 +161,6 @@ public class RatingServiceIntegrationTest
*/ */
@Test public void applyIllegalRatings() throws Exception @Test public void applyIllegalRatings() throws Exception
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER1.getUsername());
// See rating-services-context.xml for definitions of these rating schemes. // See rating-services-context.xml for definitions of these rating schemes.
float[] illegalRatings = new float[]{0.0f, 2.0f}; float[] illegalRatings = new float[]{0.0f, 2.0f};
for (float illegalRating : illegalRatings) for (float illegalRating : illegalRatings)
@@ -271,7 +275,6 @@ public class RatingServiceIntegrationTest
{ {
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER1.getUsername());
RATING_SERVICE.applyRating(testDoc_Admin, 1.0f, FIVE_STAR_SCHEME_NAME); RATING_SERVICE.applyRating(testDoc_Admin, 1.0f, FIVE_STAR_SCHEME_NAME);
// A new score in the same rating scheme by the same user should replace the previous score. // A new score in the same rating scheme by the same user should replace the previous score.
@@ -300,8 +303,6 @@ public class RatingServiceIntegrationTest
*/ */
@Test public void oneUserRatesInTwoSchemes() throws Exception @Test public void oneUserRatesInTwoSchemes() throws Exception
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER1.getUsername());
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>() TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{ {
public Void execute() throws Throwable public Void execute() throws Throwable
@@ -391,20 +392,19 @@ public class RatingServiceIntegrationTest
@Test public void usersCantRateTheirOwnContent() throws Exception @Test public void usersCantRateTheirOwnContent() throws Exception
{ {
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER2.getUsername());
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>() TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{ {
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
// In the likes rating scheme, users can rate their own content. // In the likes rating scheme, users can rate their own content.
RATING_SERVICE.applyRating(testDoc_UserTwo, 1, LIKES_SCHEME_NAME); RATING_SERVICE.applyRating(testDoc_UserOne, 1, LIKES_SCHEME_NAME);
// But fiveStar rating scheme disallows rating your own content. // But fiveStar rating scheme disallows rating your own content.
boolean expectedExceptionThrown = false; boolean expectedExceptionThrown = false;
try try
{ {
RATING_SERVICE.applyRating(testDoc_UserTwo, 4, FIVE_STAR_SCHEME_NAME); RATING_SERVICE.applyRating(testDoc_UserOne, 4, FIVE_STAR_SCHEME_NAME);
} catch (RatingServiceException expected) } catch (RatingServiceException expected)
{ {
expectedExceptionThrown = true; expectedExceptionThrown = true;
@@ -416,7 +416,7 @@ public class RatingServiceIntegrationTest
}); });
} }
@Test public void javascriptAPI() throws Exception @Test @RunAsUser(userName="UserTwo") public void javascriptAPI() throws Exception
{ {
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>() TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{ {