Merged HEAD (5.2) to 5.2.N (5.2.1)

126578 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124729 jvonka: RA-773: Try bumping retry count for async rendition creation on build m/c (SharedLinkApiTest)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:11:45 +00:00
parent 8570181ea2
commit b3d2375271
2 changed files with 8 additions and 4 deletions

View File

@@ -38,8 +38,9 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
NodeApiTest.class,
SharedLinkApiTest.class,
QueriesApiTest.class,
RenditionsTest.class,
SharedLinkApiTest.class,
ActivitiesPostingTest.class,
TestSites.class,
TestNodeComments.class,
@@ -59,8 +60,7 @@ import org.junit.runners.Suite;
TestRemovePermissions.class,
TestPublicApi128.class,
TestPublicApiCaching.class,
ModulePackagesApiTest.class,
RenditionsTest.class
ModulePackagesApiTest.class
})
public class ApiTest
{