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

source/test-java/org/alfresco/util/test/junitrules/ApplicationContextInitTest.java

@@ -23,8 +23,10 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test class for {@link ApplicationContextInit}.
@@ -32,6 +34,7 @@ import org.junit.Test;
  * @author Neil Mc Erlean
  * @since Odin
  */
+@Category(OwnJVMTestsCategory.class)
 public class ApplicationContextInitTest
 {
     // Some dummy contexts with test beans in them.