From 10cfe880d50b7c6da99b637d69ffa45141154e11 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 16 Mar 2015 13:37:08 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 99397: Move tests into the suite (BENCH-369) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 -- source/test-java/org/alfresco/repo/model/ModelTestSuite.java | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a29f42a67f..912763e5b9 100644 --- a/pom.xml +++ b/pom.xml @@ -995,8 +995,6 @@ **/org/alfresco/AllUnitTestsSuite.java - **/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java - **/org/alfresco/repo/model/filefolder/FileFolderLoaderTest.java diff --git a/source/test-java/org/alfresco/repo/model/ModelTestSuite.java b/source/test-java/org/alfresco/repo/model/ModelTestSuite.java index 390d82f1a4..e4cf822c71 100644 --- a/source/test-java/org/alfresco/repo/model/ModelTestSuite.java +++ b/source/test-java/org/alfresco/repo/model/ModelTestSuite.java @@ -20,6 +20,7 @@ package org.alfresco.repo.model; import org.alfresco.repo.model.filefolder.FileFolderDuplicateChildTest; import org.alfresco.repo.model.filefolder.FileFolderLoaderTest; +import org.alfresco.repo.model.filefolder.FileFolderPerformanceTester; import org.alfresco.repo.model.filefolder.FileFolderServiceImplTest; import org.alfresco.repo.model.filefolder.FileFolderServicePropagationTest; import org.alfresco.repo.model.filefolder.HiddenAspectTest; @@ -49,11 +50,13 @@ import org.junit.runners.Suite.SuiteClasses; HiddenAspectTest.class, + FileFolderLoaderTest.class, + FileFolderPerformanceTester.class, + // Add the file folder tests // These need to come afterwards, as they insert extra // interceptors which would otherwise confuse things FileFolderServiceImplTest.class, - FileFolderLoaderTest.class, FileFolderDuplicateChildTest.class, FileFolderServicePropagationTest.class })