Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

90256: Remove creation of specific minimal context in UsageTestSuite - for some reason, it makes the whole suite fails when run with surefire 2.18


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94669 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 10:49:44 +00:00
parent 82417e2bff
commit fe8c0ad48c

View File

@@ -30,20 +30,8 @@ import org.springframework.context.ApplicationContext;
*/ */
public class UsageTestSuite extends TestSuite public class UsageTestSuite extends TestSuite
{ {
public static ApplicationContext getContext()
{
ApplicationContextHelper.setUseLazyLoading(false);
ApplicationContextHelper.setNoAutoStart(true);
return ApplicationContextHelper.getApplicationContext(
new String[] { "classpath:alfresco/minimal-context.xml" }
);
}
public static Test suite() public static Test suite()
{ {
// Setup the context
getContext();
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
suite.addTestSuite(RepoUsageComponentTest.class); suite.addTestSuite(RepoUsageComponentTest.class);
suite.addTestSuite(UserUsageTest.class); suite.addTestSuite(UserUsageTest.class);