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

Fix build/test failure (MessageServiceImplTest) - also switched from BaseSpringTest to straight TestCase

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13398 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-02-27 13:45:10 +00:00
parent 33bf0818ba
commit 4acb627a08
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java
View File

@@ -8,9 +8,11 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import junit.framework.TestCase;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.security.authentication.MutableAuthenticationDao; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
@@ -20,7 +22,8 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest; import org.alfresco.util.ApplicationContextHelper;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -28,12 +31,13 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
* Message Service unit tests * Message Service unit tests
* *
*/ */
public class MessageServiceImplTest extends BaseSpringTest implements MessageDeployer public class MessageServiceImplTest extends TestCase implements MessageDeployer
{ {
private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext();
private MessageService messageService; private MessageService messageService;
private NodeService nodeService; private NodeService nodeService;
private AuthenticationService authenticationService; private AuthenticationService authenticationService;
private MutableAuthenticationDao authenticationDAO;
private ContentService contentService; private ContentService contentService;
private static final String BASE_BUNDLE_NAME = "testMessages"; private static final String BASE_BUNDLE_NAME = "testMessages";
@@ -64,14 +68,13 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
@Override @Override
protected void onSetUpInTransaction() throws Exception protected void setUp() throws Exception
{ {
// Get the services by name from the application context // Get the services by name from the application context
messageService = (MessageService)applicationContext.getBean("messageService"); messageService = (MessageService)applicationContext.getBean("messageService");
nodeService = (NodeService)applicationContext.getBean("nodeService"); nodeService = (NodeService)applicationContext.getBean("NodeService");
authenticationService = (AuthenticationService)applicationContext.getBean("authenticationService"); authenticationService = (AuthenticationService)applicationContext.getBean("AuthenticationService");
authenticationDAO = (MutableAuthenticationDao) applicationContext.getBean("authenticationDao"); contentService = (ContentService) applicationContext.getBean("ContentService");
contentService = (ContentService) applicationContext.getBean("contentService");
// Re-set the current locale to be the default // Re-set the current locale to be the default
Locale.setDefault(Locale.ENGLISH); Locale.setDefault(Locale.ENGLISH);
@@ -80,7 +83,8 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
private void setupRepo() throws Exception private void setupRepo() throws Exception
{ {
authenticationService.clearCurrentSecurityContext(); AuthenticationUtil.clearCurrentSecurityContext();
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
// Create a test workspace // Create a test workspace
this.testStoreRef = this.nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis()); this.testStoreRef = this.nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis());
@@ -89,7 +93,7 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
NodeRef rootNodeRef = this.nodeService.getRootNode(this.testStoreRef); NodeRef rootNodeRef = this.nodeService.getRootNode(this.testStoreRef);
// Create an authenticate the user // Create an authenticate the user
if(!authenticationDAO.userExists(USER_NAME)) if(!authenticationService.authenticationExists(USER_NAME))
{ {
authenticationService.createAuthentication(USER_NAME, PWD.toCharArray()); authenticationService.createAuthentication(USER_NAME, PWD.toCharArray());
} }
@@ -120,7 +124,7 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
contentProps.put(ContentModel.PROP_NAME, name); contentProps.put(ContentModel.PROP_NAME, name);
ChildAssociationRef association = nodeService.createNode(rootNodeRef, ChildAssociationRef association = nodeService.createNode(rootNodeRef,
ContentModel.ASSOC_CONTAINS, ContentModel.ASSOC_CHILDREN,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name), QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name),
ContentModel.TYPE_CONTENT, ContentModel.TYPE_CONTENT,
contentProps); contentProps);
@@ -167,6 +171,8 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
messageService.registerResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME); messageService.registerResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME);
getMessages(); getMessages();
messageService.unregisterResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME);
} }
/** /**
@@ -183,6 +189,8 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
messageService.registerResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME); messageService.registerResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME);
getMessagesWithParams(); getMessagesWithParams();
messageService.unregisterResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME);
} }
@@ -198,6 +206,8 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
messageService.registerResourceBundle(BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME); messageService.registerResourceBundle(BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME);
getMessages(); getMessages();
messageService.unregisterResourceBundle(BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME);
} }
/** /**
@@ -212,6 +222,8 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
messageService.registerResourceBundle(BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME); messageService.registerResourceBundle(BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME);
getMessagesWithParams(); getMessagesWithParams();
messageService.unregisterResourceBundle(BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME);
} }
/** /**
@@ -226,6 +238,8 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
// Test getting a message // Test getting a message
assertEquals(VALUE_YES, messageService.getMessage(MSG_YES)); assertEquals(VALUE_YES, messageService.getMessage(MSG_YES));
messageService.unregisterResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME);
} }
/** /**
@@ -238,6 +252,8 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
// Test getting a message // Test getting a message
assertEquals(VALUE_YES, messageService.getMessage(MSG_YES)); assertEquals(VALUE_YES, messageService.getMessage(MSG_YES));
messageService.unregisterResourceBundle(BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME);
} }
/** /**