Removed diff-destroying tabs

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-09-10 12:22:15 +00:00
parent 57d00ec499
commit d86666e0ea

View File

@@ -62,12 +62,12 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer
{ {
private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext();
private MessageService messageService; private MessageService messageService;
private NodeService nodeService; private NodeService nodeService;
private MutableAuthenticationService authenticationService; private MutableAuthenticationService authenticationService;
private ContentService contentService; private ContentService contentService;
private static final String BASE_BUNDLE_NAME = "testMessages"; private static final String BASE_BUNDLE_NAME = "testMessages";
private static final String BASE_RESOURCE_CLASSPATH = "org/alfresco/repo/i18n/"; private static final String BASE_RESOURCE_CLASSPATH = "org/alfresco/repo/i18n/";
@@ -107,8 +107,8 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer
fail("Detected a leaked transaction from a previous test."); fail("Detected a leaked transaction from a previous test.");
} }
// 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 = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService"); authenticationService = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService");
contentService = (ContentService) applicationContext.getBean("ContentService"); contentService = (ContentService) applicationContext.getBean("ContentService");
@@ -220,8 +220,8 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer
*/ */
public void test2GetMessagesLoadedFromRepo() throws Exception public void test2GetMessagesLoadedFromRepo() throws Exception
{ {
setupRepo(); setupRepo();
// Check with no bundles loaded // Check with no bundles loaded
assertNull(messageService.getMessage(MSG_NO)); assertNull(messageService.getMessage(MSG_NO));
@@ -238,17 +238,17 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer
*/ */
public void test3GetMessagesWithParamsLoadedFromRepo() throws Exception public void test3GetMessagesWithParamsLoadedFromRepo() throws Exception
{ {
setupRepo(); setupRepo();
// Check with no bundles loaded // Check with no bundles loaded
assertNull(messageService.getMessage(MSG_PARAMS, new Object[]{PARAM_VALUE})); assertNull(messageService.getMessage(MSG_PARAMS, new Object[]{PARAM_VALUE}));
// Register the bundle // Register the bundle
messageService.registerResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME); messageService.registerResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME);
getMessagesWithParams(); getMessagesWithParams();
messageService.unregisterResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME); messageService.unregisterResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME);
} }
@@ -272,15 +272,15 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer
* Test getting a parameterised message from classpath * Test getting a parameterised message from classpath
*/ */
public void test5GetMessagesWithParamsLoadedFromClasspath() throws Exception public void test5GetMessagesWithParamsLoadedFromClasspath() throws Exception
{ {
// Check with no bundles loaded // Check with no bundles loaded
assertNull(messageService.getMessage(MSG_PARAMS, new Object[]{PARAM_VALUE})); assertNull(messageService.getMessage(MSG_PARAMS, new Object[]{PARAM_VALUE}));
// Register the bundle // Register the bundle
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); messageService.unregisterResourceBundle(BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME);
} }
@@ -289,8 +289,8 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer
*/ */
public void test6RegisterBundleFromRepo() throws Exception public void test6RegisterBundleFromRepo() throws Exception
{ {
setupRepo(); setupRepo();
// Register the bundle // Register the bundle
messageService.registerResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME); messageService.registerResourceBundle(testStoreRef + "/cm:" + BASE_BUNDLE_NAME);