mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Migrate codebase onto Spring 3.0.5. There is an issue with using annotation based test cases that I haven't got to the bottom of yet. I have posted on the SpringSource forum here:
http://forum.springsource.org/showthread.php?111842-ConfigurationClassPostProcessor-IllegalStateException-when-starting-test-case As a workaround I have converted all such test cases so that they simply use the "normal" BaseSpringTest super class. Fortunately there were only eight or nine such classes. Although I have run quite a number of tests on the result I haven't run every test there is, so there may be some fallout. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -88,12 +88,16 @@ public class EnvironmentImplTest extends AbstractPublishingIntegrationTest
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void setUp() throws Exception
|
||||
public void onSetUp() throws Exception
|
||||
{
|
||||
super.setUp();
|
||||
super.onSetUp();
|
||||
channelService = (ChannelServiceImpl) getApplicationContext().getBean("channelService");
|
||||
|
||||
ChannelType channelType = mockChannelType();
|
||||
|
||||
channelService.register(channelType);
|
||||
if (channelService.getChannelType(channelType.getId()) == null)
|
||||
{
|
||||
channelService.register(channelType);
|
||||
}
|
||||
channelService.createChannel(siteId, channelTypeId, channel1Name, null);
|
||||
channelService.createChannel(siteId, channelTypeId, channel2Name, null);
|
||||
}
|
||||
|
Reference in New Issue
Block a user