From 995821ee715c482a886a994b7ca661b5a80b1b95 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Feb 2014 00:26:34 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    58876:
 BDE-195 Fix tests in Maven      Put FTPServerTest back into OwnJVM until
 MNT-10160 is fixed      Put ThumbnailServiceImplTest back into OwnJVM too, as
 it is failing and seems to bring everything down      Bring back
 RepositoryStartStopTest: this one is fine!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62053 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/test-java/org/alfresco/RepositoryStartStopTest.java    | 3 ---
 source/test-java/org/alfresco/filesys/FTPServerTest.java      | 4 ++--
 .../org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/source/test-java/org/alfresco/RepositoryStartStopTest.java b/source/test-java/org/alfresco/RepositoryStartStopTest.java
index 6faa838234..ba177e06e7 100644
--- a/source/test-java/org/alfresco/RepositoryStartStopTest.java
+++ b/source/test-java/org/alfresco/RepositoryStartStopTest.java
@@ -28,11 +28,9 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.test_category.OwnJVMTestsCategory;
 
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.BaseApplicationContextHelper;
-import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.AbstractApplicationContext;
 
@@ -53,7 +51,6 @@ import junit.framework.TestCase;
  * 
  * @author Nick Burch
  */
-@Category(OwnJVMTestsCategory.class)
 public class RepositoryStartStopTest extends TestCase
 {
     private ServiceRegistry serviceRegistry;
diff --git a/source/test-java/org/alfresco/filesys/FTPServerTest.java b/source/test-java/org/alfresco/filesys/FTPServerTest.java
index 740f433057..30a05fdfac 100644
--- a/source/test-java/org/alfresco/filesys/FTPServerTest.java
+++ b/source/test-java/org/alfresco/filesys/FTPServerTest.java
@@ -44,7 +44,7 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.test_category.BaseSpringTestsCategory;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.PropertyMap;
 import org.apache.commons.logging.Log;
@@ -63,7 +63,7 @@ import org.springframework.context.ApplicationContext;
  * Uses the commons-net ftp client library to connect to the
  * Alfresco FTP server.
  */
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class FTPServerTest extends TestCase
 
 {
diff --git a/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java b/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
index 2f0c334323..bcbf50f593 100644
--- a/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
@@ -60,7 +60,7 @@ import org.alfresco.service.cmr.thumbnail.ThumbnailService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.test_category.BaseSpringTestsCategory;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.TempFileProvider;
@@ -72,7 +72,7 @@ import org.junit.experimental.categories.Category;
  * @author Roy Wetherall
  * @author Neil McErlean
  */
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
 {
     private NodeService secureNodeService;