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

@@ -81,7 +81,7 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
import org.alfresco.util.PropertyMap;
@@ -104,7 +104,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
* @author Derek Hulley
* @since 4.0
*/
@Category(BaseSpringTestsCategory.class)
@Category(OwnJVMTestsCategory.class)
public class NodeServiceTest
{
public static final String NAMESPACE = "http://www.alfresco.org/test/BaseNodeServiceTest";