From 7127fffd0ac443dc3bfc838a612633c79a78e7e9 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Mon, 7 Aug 2017 18:05:51 +0300 Subject: [PATCH] REPO-2774: rebalance the tests in the AppContextExtra 2 and 3 --- src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java | 2 ++ src/test/java/org/alfresco/AppContextExtra02TestSuite.java | 4 ++-- src/test/java/org/alfresco/AppContextExtra03TestSuite.java | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java b/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java index 8a0064c0bc..e082bae873 100644 --- a/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java +++ b/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java @@ -341,7 +341,9 @@ public class AllRepositoryTestsCatalogue suite.addTest(new JUnit4TestAdapter(RepositoryStartupTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanSystemTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.filesys.auth.cifs.CifsAuthenticatorPassthruTest.class)); + // the following fails locally - on windows suite.addTestSuite(org.alfresco.repo.content.transform.DifferrentMimeTypeTest.class); + suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class)); suite.addTestSuite(org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class); suite.addTest(new JUnit4TestAdapter(org.alfresco.service.ServiceRegistryTest.class)); diff --git a/src/test/java/org/alfresco/AppContextExtra02TestSuite.java b/src/test/java/org/alfresco/AppContextExtra02TestSuite.java index ee447f2291..eb5ead45ab 100644 --- a/src/test/java/org/alfresco/AppContextExtra02TestSuite.java +++ b/src/test/java/org/alfresco/AppContextExtra02TestSuite.java @@ -38,8 +38,8 @@ public class AppContextExtra02TestSuite extends TestSuite AllRepositoryTestsCatalogue.applicationContext_virtualizationTestContext(suite); AllRepositoryTestsCatalogue.applicationContext_testSubscriptionsContext(suite); AllRepositoryTestsCatalogue.applicationContext_openCmisContext(suite); - // TODO Uncomment the following 2 lines after REPO-2790 is implemented - // AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite); + AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite); + // TODO Uncomment the following line after REPO-2790 is implemented // AllRepositoryTestsCatalogue.applicationContext_mtAllContext(suite); return suite; diff --git a/src/test/java/org/alfresco/AppContextExtra03TestSuite.java b/src/test/java/org/alfresco/AppContextExtra03TestSuite.java index 44cce97ea2..af7b44b488 100644 --- a/src/test/java/org/alfresco/AppContextExtra03TestSuite.java +++ b/src/test/java/org/alfresco/AppContextExtra03TestSuite.java @@ -39,7 +39,6 @@ public class AppContextExtra03TestSuite extends TestSuite { TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite); AllRepositoryTestsCatalogue.applicationContext_mtAllContext(suite); return suite;