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

58915: Recategorised some tests which we know aren’t very nice to the Spring context, moved FTPServerTest back in from the cold.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:29:09 +00:00
parent e26e7a70eb
commit 4d3653f388
7 changed files with 19 additions and 4 deletions

View File

@@ -44,6 +44,7 @@ import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.test.junitrules.AlfrescoPerson;
import org.alfresco.util.test.junitrules.ApplicationContextInit;
import org.alfresco.util.test.junitrules.RunAsFullyAuthenticatedRule;
@@ -56,6 +57,7 @@ import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.RuleChain;
import org.junit.rules.TestName;
import org.springframework.extensions.webscripts.GUID;
@@ -69,6 +71,7 @@ import org.springframework.extensions.webscripts.GUID;
* @author Neil Mc Erlean
* @since 4.0.3
*/
@Category(OwnJVMTestsCategory.class)
public class SiteServiceImplMoreTest
{
protected static Log log = LogFactory.getLog(SiteServiceImplMoreTest.class);