inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-2774: merged other tests related to application-context into one test suite

Browse Source
This commit is contained in:
Andrei Rebegea
2017-08-04 16:05:41 +03:00
parent 7dd4dc668f
commit 11ef399333
19 changed files with 289 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

448
src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java
View File

@@ -311,6 +311,23 @@ public class AllRepositoryTestsCatalogue
{ {
// context files: [classpath:alfresco/node-locator-context.xml, classpath:test-nodeLocatorServiceImpl-context.xml] // context files: [classpath:alfresco/node-locator-context.xml, classpath:test-nodeLocatorServiceImpl-context.xml]
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.nodelocator.NodeLocatorServiceImplTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.nodelocator.NodeLocatorServiceImplTest.class));
}
// [classpath*:alfresco/ibatis/ibatis-test-context.xml, classpath:alfresco/application-context.xml,
// classpath:alfresco/test/global-integration-test-context.xml]
static void ibatisTestContext_applicationContext_globalIntegrationTestContext_33(TestSuite suite)
{
// alfresco/ibatis/ibatis-test-context.xml seems to introduce this bean : cannedQueryDAOForTesting
// that is used only in testing
// should be safe for merge in application-context.xml
// was 22 (part)
// [classpath*:alfresco/ibatis/ibatis-test-context.xml, classpath:alfresco/application-context.xml,
// classpath:alfresco/test/global-integration-test-context.xml]
suite.addTest(new JUnit4TestAdapter(CannedQueryDAOTest.class));
// pass second try
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.node.NodeServiceTest.class));
} }
// [classpath:alfresco/application-context.xml, classpath:alfresco/minimal-context.xml] // [classpath:alfresco/application-context.xml, classpath:alfresco/minimal-context.xml]
@@ -713,205 +730,190 @@ public class AllRepositoryTestsCatalogue
suite.addTestSuite(org.alfresco.repo.rendition.RenditionServiceIntegrationTest.class); suite.addTestSuite(org.alfresco.repo.rendition.RenditionServiceIntegrationTest.class);
} }
// [classpath:alfresco/application-context.xml, classpath:test-cmisinteger_modell-context.xml] static void applicationContext_globalIntegrationTestContext_01(TestSuite suite)
static void applicationContext_cmisIntegerModel1Context_06(TestSuite suite)
{ {
suite.addTest(new JUnit4TestAdapter(org.alfresco.opencmis.CMISTest.class)); {
} // [classpath:alfresco/application-context.xml, classpath:alfresco/test/global-integration-test-context.xml]
// [classpath:alfresco/application-context.xml, classpath:opencmis/opencmistest-context.xml] // was 09 (part)
static void applicationContext_openCmisContext_07(TestSuite suite) suite.addTest(new JUnit4TestAdapter(MailActionExecuterTest.class));
{ suite.addTest(new JUnit4TestAdapter(ActionServiceImpl2Test.class));
suite.addTestSuite(org.alfresco.opencmis.OpenCmisLocalTest.class); suite.addTest(new JUnit4TestAdapter(ImporterActionExecuterTest.class));
} // was 21 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.dictionary.CustomModelServiceImplTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.dictionary.ValueDataTypeValidatorImplTest.class));
// [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/action/test-action-services-context.xml] // was 23 (part)
static void applicationContext_testServiceActionServiceContext_10(TestSuite suite) suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.download.DownloadServiceIntegrationTest.class));
{ // was 27
// was 09 (split) suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.forum.CommentsTest.class));
suite.addTestSuite(ActionServiceImplTest.class); // was 29 (part)
} suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.jscript.ScriptNodeTest.class));
// was 38 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.preference.PreferenceServiceImplTest.class));
// [classpath:alfresco/application-context.xml, classpath:alfresco/test/global-integration-test-context.xml] // was 42 (part)
static void applicationContext_globalIntegrationTestContext_11(TestSuite suite) suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rule.MiscellaneousRulesTest.class));
{ // was 44
// was 09 (part) suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rule.RuleServiceIntegrationTest.class)); // fails locally even
suite.addTest(new JUnit4TestAdapter(MailActionExecuterTest.class)); // on
suite.addTest(new JUnit4TestAdapter(ActionServiceImpl2Test.class)); // its own
suite.addTest(new JUnit4TestAdapter(ImporterActionExecuterTest.class)); // was 47 (part)
suite.addTest(new JUnit4TestAdapter(ResetPasswordServiceImplTest.class));
// was 51
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.subscriptions.SubscriptionServiceActivitiesTest.class));
// was 63 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.AlfrescoPersonTest.class));
// the following test only passes on a clean DB
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporaryNodesTest.class));
// was 21 (part) // was 66 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.dictionary.CustomModelServiceImplTest.class)); suite.addTest(
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.dictionary.ValueDataTypeValidatorImplTest.class)); new JUnit4TestAdapter(org.alfresco.repo.search.impl.solr.facet.SolrFacetQueriesDisplayHandlersTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImplTest.class));
// was 22 (part) // was 28 (part)
suite.addTest(new JUnit4TestAdapter(CannedQueryDAOTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.invitation.InvitationCleanupTest.class));
// was 40 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.quickshare.QuickShareServiceIntegrationTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.remotecredentials.RemoteCredentialsServicesTest.class));
}
// was 23 (part) // [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/site/site-custom-context.xml]
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.download.DownloadServiceIntegrationTest.class)); {
// pass - slow 54s - site-custom-context.xml overrides siteService_permissionBootstrap -
// not safe to merge - unless it is at the end
// was 49 (part)
suite.addTestSuite(org.alfresco.repo.site.SiteServiceImplTest.class);
}
// was 27 // [classpath:alfresco/application-context.xml, classpath:scriptexec/script-exec-test.xml]
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.forum.CommentsTest.class)); {
// pass - 26s - script-exec-test.xml should be fine to merge
// was 63
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.domain.schema.script.ScriptExecutorImplIntegrationTest.class));
suite.addTest(
new JUnit4TestAdapter(org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImplIntegrationTest.class));
}
// was 28 (part) // [classpath:alfresco/application-context.xml, classpath:alfresco/test/global-integration-test-context.xml,
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.invitation.InvitationCleanupTest.class)); // classpath:org/alfresco/util/test/junitrules/dummy1-context.xml,
// classpath:org/alfresco/util/test/junitrules/dummy2-context.xml]
{
// pass - 25 sec
// global-integration-test-context.xml safe
// dummy1-context.xml - safe
// dummy2-context.xml -safe
// was 63 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.ApplicationContextInitTest.class));
}
// was 29 (part) // [classpath:alfresco/application-context.xml,
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.jscript.ScriptNodeTest.class)); // classpath:org/alfresco/repo/policy/annotation/test-qname-type-editor-context.xml]
{
// pass - 25 s - safe to merge
// test-qname-type-editor-context.xml defines a bean: qNameContainerNoNamespace that seems to be used only in the
// tests
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.policy.annotation.QNameTypeEditorTest.class));
}
// was 38 (part) // [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/forms/MNT-7383-context.xml]
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.preference.PreferenceServiceImplTest.class)); // can't really be safely merged with other context sets as it overrides actionFormProcessorTestActionExecuter bean
{
// pass
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.forms.processor.action.ActionFormProcessorTest.class));
}
// was 40 (part) // [classpath:alfresco/application-context.xml, classpath:alfresco/filesys/auth/cifs/test-kerberos-context.xml]
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.quickshare.QuickShareServiceIntegrationTest.class)); {
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.remotecredentials.RemoteCredentialsServicesTest.class)); // pass- fast 2s -
// test-kerberos-context.xml defines a cifs-test-properties bean and then imports the
// kerberos-authentication-context.xml
// this may be safe to run in a test suite that doesn't have any other authnetication tests
// was 63 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.filesys.auth.cifs.CifsAuthenticatorKerberosTest.class));
}
// was 42 (part) {
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rule.MiscellaneousRulesTest.class)); // [classpath:alfresco/application-context.xml, classpath:test-cmisinteger_modell-context.xml]
// pass - 46s -
// test-cmisinteger_modell-context.xml introduces new models, that may be safe to run in suites where
// no other CMIS tests are run
suite.addTest(new JUnit4TestAdapter(org.alfresco.opencmis.CMISTest.class));
}
// was 44 {
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rule.RuleServiceIntegrationTest.class)); // fails locally even on // [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/action/test-action-services-context.xml]
// its own // pass - 60s - test-action-services-context.xml - seems safe - only defines some actions used in the tests
// was 09 (split)
suite.addTestSuite(ActionServiceImplTest.class);
}
// was 47 (part) {
suite.addTest(new JUnit4TestAdapter(ResetPasswordServiceImplTest.class)); // [classpath:alfresco/application-context.xml, classpath:alfresco/test/global-integration-test-context.xml,
// classpath:ratings/test-RatingServiceIntegrationTest-context.xml]
// was 51 // safe to merge
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.subscriptions.SubscriptionServiceActivitiesTest.class)); // test-RatingServiceIntegrationTest-context.xml introduces: spinalTapRatingScheme bean that seems to be used in the
// tests
// only
// global-integration-test-context.xml safe
// pass- very fast 2s
// was 40 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rating.RatingServiceIntegrationTest.class));
}
// was 63 (part) {
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.AlfrescoPersonTest.class)); // [classpath:alfresco/application-context.xml, classpath:sync-test-context.xml]
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporaryNodesTest.class)); // passes - slow 40s - but looks like it can be merged with the application-context.xml without problems as
// it only defines test beans in the custom context
suite.addTestSuite(org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizerTest.class);
}
// was 66 (part) {
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.search.impl.solr.facet.SolrFacetQueriesDisplayHandlersTest.class)); // [classpath:alfresco/application-context.xml, classpath:alfresco/test/global-integration-test-context.xml,
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImplTest.class)); // classpath:sites/test-TemporarySitesTest-context.xml]
// pass - slow 46 sec - alfresco/test/global-integration-test-context.xml
// seems to be safe - in general to be
// merged into application-context.xml
// global-integration-test-context.xml safe
//
// was 49 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.site.SiteServiceImplMoreTest.class));
// was 63 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporarySitesTest.class));
}
} }
// [classpath:alfresco/application-context.xml, classpath:cache-test/cache-test-context.xml] // [classpath:alfresco/application-context.xml, classpath:cache-test/cache-test-context.xml]
static void applicationContext_cacheTestContext_14(TestSuite suite) static void applicationContext_cacheTestContext_14(TestSuite suite)
{ {
// this does not want to work in the applicationContext_globalIntegrationTestContext_01 test - unless it is the first test
// pass - fast 6s -
// cache-test-context.xml should be safe to merge - it defines some beans that seem to be used only in tests
suite.addTestSuite(org.alfresco.repo.cache.CacheTest.class); suite.addTestSuite(org.alfresco.repo.cache.CacheTest.class);
} }
// [classpath:alfresco/minimal-context.xml] // [classpath:alfresco/application-context.xml, classpath:opencmis/opencmistest-context.xml]
static void minimalContext_16(TestSuite suite) static void applicationContext_openCmisContext_07(TestSuite suite)
{ {
// was 16 (part) // this does not want to play nice with the ones above
suite.addTest(org.alfresco.repo.content.ContentMinimalContextTestSuite.suite()); // pass - 8 s - fast - no DB -
// opencmistest-context.xml this overrides some CMIS beans OpenCMISMapping
// was 52 (part) // and eventPublisher bean that is used a lot -
suite.addTestSuite(org.alfresco.repo.content.metadata.MappingMetadataExtracterTest.class); // probably safe to merge only at the END
} suite.addTestSuite(org.alfresco.opencmis.OpenCmisLocalTest.class);
// [classpath:cachingstore/test-context.xml]
static void cachingstoreTestContext_18(TestSuite suite)
{
// was 17 (part)
suite.addTest(new JUnit4TestAdapter(FullTest.class));
}
// [classpath:cachingstore/test-cleaner-context.xml]
static void cachingstoreTestCleanerContext_21(TestSuite suite)
{
// was 17 (part)
suite.addTest(new JUnit4TestAdapter(CachedContentCleanupJobTest.class));
}
// [classpath:cachingstore/test-std-quota-context.xml]
static void cachingstoreTestStdQuotaContext_22(TestSuite suite)
{
// was 17 (part)
suite.addTest(new JUnit4TestAdapter(StandardQuotaStrategyTest.class));
}
// [classpath:cachingstore/test-slow-context.xml]
static void cachingstoreTestSlowContext_23(TestSuite suite)
{
// was 17 (part)
suite.addTest(new JUnit4TestAdapter(SlowContentStoreTest.class));
suite.addTest(new JUnit4TestAdapter(ConcurrentCachingStoreTest.class));
}
// [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/forms/MNT-7383-context.xml]
static void applicationContext_mnt7383Context_24(TestSuite suite)
{
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.forms.processor.action.ActionFormProcessorTest.class));
}
// [classpath:org/alfresco/repo/jscript/test-context.xml]
static void jscriptTestContext_29(TestSuite suite)
{
// was 29 (part)
suite.addTestSuite(org.alfresco.repo.jscript.ScriptBehaviourTest.class);
}
// [module/module-component-test-beans.xml]
static void moduleComponentTestBeansContext_32(TestSuite suite)
{
// was 32 (part)
suite.addTestSuite(org.alfresco.repo.module.ComponentsTest.class);
}
// [classpath*:alfresco/ibatis/ibatis-test-context.xml, classpath:alfresco/application-context.xml,
// classpath:alfresco/test/global-integration-test-context.xml]
static void ibatisTestContext_applicationContext_globalIntegrationTestContext_33(TestSuite suite)
{
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.node.NodeServiceTest.class));
}
// TODO can we remove this? Was it EOLed?
// [classpath:test/alfresco/test-web-publishing-context.xml]
static void testWebPublishingContext_39(TestSuite suite)
{
suite.addTest(new JUnit4TestAdapter(ChannelServiceImplTest.class));
suite.addTest(new JUnit4TestAdapter(PublishingEventHelperTest.class));
}
// [classpath:alfresco/application-context.xml, classpath:alfresco/test/global-integration-test-context.xml,
// classpath:ratings/test-RatingServiceIntegrationTest-context.xml]
static void applicationContext_globalIntegrationTestContext_testRatingServiceIntegrationTestContext_40(TestSuite suite)
{
// was 40 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rating.RatingServiceIntegrationTest.class));
}
// [classpath:/test/alfresco/test-renditions-context.xml, classpath:alfresco/application-context.xml,
// classpath:alfresco/test/global-integration-test-context.xml]
static void testRenditionsContext_applicationContext_globalIntegrationTestContext_41(TestSuite suite)
{
// was 40 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rendition.RenditionServicePermissionsTest.class));
}
// [classpath:alfresco/application-context.xml, classpath:sync-test-context.xml]
static void applicationContext_syncTestContext_48(TestSuite suite)
{
suite.addTestSuite(org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizerTest.class);
}
// [classpath:alfresco/application-context.xml, classpath:alfresco/test/global-integration-test-context.xml,
// classpath:sites/test-TemporarySitesTest-context.xml]
static void applicationContext_globalIntegrationTestContext_testTemporarySitesTestContext_49(TestSuite suite)
{
// was 49 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.site.SiteServiceImplMoreTest.class));
// was 63 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporarySitesTest.class));
}
// [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/site/site-custom-context.xml]
static void applicationContext_siteCustomContext_50(TestSuite suite)
{
// was 49 (part)
suite.addTestSuite(org.alfresco.repo.site.SiteServiceImplTest.class);
} }
// TODO can we remove this? Was it EOLed? // TODO can we remove this? Was it EOLed?
// [classpath:alfresco/application-context.xml, classpath:test/alfresco/test-subscriptions-context.xml] // [classpath:alfresco/application-context.xml, classpath:test/alfresco/test-subscriptions-context.xml]
static void applicationContext_testSubscriptionsContext_52(TestSuite suite) static void applicationContext_testSubscriptionsContext_52(TestSuite suite)
{ {
// pass - fast 3s - no DB
// test-subscriptions-context.xml overrides extension.dictionaryBootstrap - with custom models
// this seems to require deprecation/removal
// was 52 (part) // was 52 (part)
suite.addTestSuite(org.alfresco.repo.subscriptions.SubscriptionServiceImplTest.class); suite.addTestSuite(org.alfresco.repo.subscriptions.SubscriptionServiceImplTest.class);
} }
@@ -919,6 +921,9 @@ public class AllRepositoryTestsCatalogue
// [classpath:alfresco/application-context.xml, classpath:tenant/mt-*context.xml] // [classpath:alfresco/application-context.xml, classpath:tenant/mt-*context.xml]
static void applicationContext_mtAllContext_56(TestSuite suite) static void applicationContext_mtAllContext_56(TestSuite suite)
{ {
// pass - slow 182s -
// not sure what to say about the context files mt-*-context.xml
// it may be safe - at the end of
// was 56 (part) // was 56 (part)
suite.addTestSuite(org.alfresco.repo.tenant.MultiTDemoTest.class); suite.addTestSuite(org.alfresco.repo.tenant.MultiTDemoTest.class);
@@ -926,55 +931,112 @@ public class AllRepositoryTestsCatalogue
suite.addTestSuite(ActivitiMultitenantWorkflowTest.class); suite.addTestSuite(ActivitiMultitenantWorkflowTest.class);
} }
// [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/thumbnail/test-thumbnail-context.xml] // [classpath:**/virtualization-test-context.xml, classpath:alfresco/application-context.xml]
static void applicationContext_testThumnailContext_57(TestSuite suite) static void virtualizationTestContext_applicationContext_70(TestSuite suite)
{ {
suite.addTestSuite(org.alfresco.repo.thumbnail.ThumbnailServiceImplTest.class); // pass - 16s - safe for merge
// virtualization-test-context.xml two beans defined that only seem to be used in tests
suite.addTest(org.alfresco.repo.virtual.VirtualizationIntegrationTestSuite.suite());
} }
// [classpath:alfresco/application-context.xml, classpath:alfresco/filesys/auth/cifs/test-kerberos-context.xml] // ------------------------------------application context until here -------------------
static void applicationContext_testKerberosCntext_63(TestSuite suite)
// [classpath:cachingstore/test-context.xml]
static void cachingstoreTestContext_18(TestSuite suite)
{ {
// was 63 (part) // this is fast and passes
suite.addTest(new JUnit4TestAdapter(org.alfresco.filesys.auth.cifs.CifsAuthenticatorKerberosTest.class)); // was 17 (part)
suite.addTest(new JUnit4TestAdapter(FullTest.class));
} }
// [classpath:alfresco/application-context.xml, classpath:scriptexec/script-exec-test.xml] // [classpath:cachingstore/test-cleaner-context.xml]
static void applicationContext_scriptExecTestContext_65(TestSuite suite) static void cachingstoreTestCleanerContext_21(TestSuite suite)
{ {
// was 63 // this is fast as well
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.domain.schema.script.ScriptExecutorImplIntegrationTest.class)); // was 17 (part)
suite.addTest( suite.addTest(new JUnit4TestAdapter(CachedContentCleanupJobTest.class));
new JUnit4TestAdapter(org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImplIntegrationTest.class)); }
// [classpath:cachingstore/test-std-quota-context.xml]
static void cachingstoreTestStdQuotaContext_22(TestSuite suite)
{
// pass
// was 17 (part)
suite.addTest(new JUnit4TestAdapter(StandardQuotaStrategyTest.class));
}
// [classpath:cachingstore/test-slow-context.xml]
static void cachingstoreTestSlowContext_23(TestSuite suite)
{
// pass
// was 17 (part)
suite.addTest(new JUnit4TestAdapter(SlowContentStoreTest.class));
suite.addTest(new JUnit4TestAdapter(ConcurrentCachingStoreTest.class));
}
// [classpath:org/alfresco/repo/jscript/test-context.xml]
static void jscriptTestContext_29(TestSuite suite)
{
// pass
// was 29 (part)
suite.addTestSuite(org.alfresco.repo.jscript.ScriptBehaviourTest.class);
}
// [module/module-component-test-beans.xml]
static void moduleComponentTestBeansContext_32(TestSuite suite)
{
// pass
// was 32 (part)
suite.addTestSuite(org.alfresco.repo.module.ComponentsTest.class);
}
// TODO can we remove this? Was it EOLed?
// [classpath:test/alfresco/test-web-publishing-context.xml]
static void testWebPublishingContext_39(TestSuite suite)
{
// pass- very fast 2s
suite.addTest(new JUnit4TestAdapter(ChannelServiceImplTest.class));
suite.addTest(new JUnit4TestAdapter(PublishingEventHelperTest.class));
} }
// [alfresco/scheduler-core-context.xml, org/alfresco/util/test-scheduled-jobs-context.xml] // [alfresco/scheduler-core-context.xml, org/alfresco/util/test-scheduled-jobs-context.xml]
static void schedulerCoreContext_testScheduledJobsContext_66(TestSuite suite) static void schedulerCoreContext_testScheduledJobsContext_66(TestSuite suite)
{ {
// pass - 25s - this is not a candidate for a special merge- but maybe can run in the misc context test suite
// was 63 (part) // was 63 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanTest.class));
} }
// [classpath:alfresco/application-context.xml, classpath:alfresco/test/global-integration-test-context.xml, // fail-------------------------------------------------------------------------
// classpath:org/alfresco/util/test/junitrules/dummy1-context.xml,
// classpath:org/alfresco/util/test/junitrules/dummy2-context.xml] // [classpath:alfresco/minimal-context.xml]
static void applicationContext_globalIntegrationTestContext_dummy1Context_dummy2Context_67(TestSuite suite) static void minimalContext_16(TestSuite suite)
{ {
// was 63 (part) // This has a few failures - not sure what I can do about that. 513 tests in total ~ 100s
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.ApplicationContextInitTest.class)); // was 16 (part)
suite.addTest(org.alfresco.repo.content.ContentMinimalContextTestSuite.suite());
// was 52 (part)
suite.addTestSuite(org.alfresco.repo.content.metadata.MappingMetadataExtracterTest.class);
} }
// [classpath:alfresco/application-context.xml, // [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/thumbnail/test-thumbnail-context.xml]
// classpath:org/alfresco/repo/policy/annotation/test-qname-type-editor-context.xml] static void applicationContext_testThumnailContext_57(TestSuite suite)
static void applicationContext_testQnameTypeEditorContext_69(TestSuite suite)
{ {
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.policy.annotation.QNameTypeEditorTest.class)); // fails- 68s
// test-thumbnail-context.xml - should be fine to merge - only defines some extra test beans
suite.addTestSuite(org.alfresco.repo.thumbnail.ThumbnailServiceImplTest.class);
} }
// [classpath:**/virtualization-test-context.xml, classpath:alfresco/application-context.xml] // [classpath:/test/alfresco/test-renditions-context.xml, classpath:alfresco/application-context.xml,
static void virtualizationTestContext_applicationContext_70(TestSuite suite) // classpath:alfresco/test/global-integration-test-context.xml]
static void testRenditionsContext_applicationContext_globalIntegrationTestContext_41(TestSuite suite)
{ {
suite.addTest(org.alfresco.repo.virtual.VirtualizationIntegrationTestSuite.suite()); // safe to merge if it passes
// test-renditions-context.xml introduced a mock bean: mockRenderingEngine- used in testing
// global-integration-test-context.xml safe
// this does NOT passes locally - loads the context and connects to the db - slow
// was 40 (part)
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rendition.RenditionServicePermissionsTest.class));
} }
} }

4
src/test/java/org/alfresco/Repository03TestSuite.java
View File

@@ -36,8 +36,8 @@ public class Repository03TestSuite extends TestSuite
{ {
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
//Repository01TestSuite.tests3(suite); AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_01(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository06TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository06TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_cmisIntegerModel1Context_06(suite); // AllRepositoryTestsCatalogue.applicationContext_cmisIntegerModel1Context_06(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository09TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository09TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.noContext_09(suite); // AllRepositoryTestsCatalogue.noContext_09(suite);
return suite; return suite;
} }
} }

14
src/test/java/org/alfresco/Repository100TestSuite_ApplicationContext_GlobalIntegrationTestContext.java Normal file
View File

@@ -0,0 +1,14 @@
package org.alfresco;
import junit.framework.Test;
import junit.framework.TestSuite;
public class Repository100TestSuite_ApplicationContext_GlobalIntegrationTestContext extends TestSuite
{
public static Test suite()
{
TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_01(suite);
return suite;
}
}

2
src/test/java/org/alfresco/Repository10TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository10TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_testServiceActionServiceContext_10(suite); //AllRepositoryTestsCatalogue.applicationContext_testServiceActionServiceContext_10(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository11TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository11TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_11(suite); //AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_11(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository24TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository24TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_mnt7383Context_24(suite); //AllRepositoryTestsCatalogue.applicationContext_mnt7383Context_24(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository40TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository40TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_testRatingServiceIntegrationTestContext_40(suite); //AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_testRatingServiceIntegrationTestContext_40(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository46TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository46TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.dataModel6_16TestsContext_46(suite); //AllRepositoryTestsCatalogue.dataModel6_16TestsContext_46(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository48TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository48TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_syncTestContext_48(suite); //AllRepositoryTestsCatalogue.applicationContext_syncTestContext_48(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository49TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository49TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_testTemporarySitesTestContext_49(suite); //AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_testTemporarySitesTestContext_49(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository50TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository50TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_siteCustomContext_50(suite); //AllRepositoryTestsCatalogue.applicationContext_siteCustomContext_50(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository61TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository61TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.oneTestCloseContext_61(suite); //AllRepositoryTestsCatalogue.oneTestCloseContext_61(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository63TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository63TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_testKerberosCntext_63(suite); //AllRepositoryTestsCatalogue.applicationContext_testKerberosCntext_63(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository65TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository65TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_scriptExecTestContext_65(suite); //AllRepositoryTestsCatalogue.applicationContext_scriptExecTestContext_65(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository67TestSuite.java
View File

@@ -36,7 +36,7 @@ public class Repository67TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_dummy1Context_dummy2Context_67(suite); //AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext_dummy1Context_dummy2Context_67(suite);
return suite; return suite;
} }
} }

2
src/test/java/org/alfresco/Repository69TestSuite.java
View File

@@ -37,7 +37,7 @@ public class Repository69TestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_testQnameTypeEditorContext_69(suite); //AllRepositoryTestsCatalogue.applicationContext_testQnameTypeEditorContext_69(suite);
return suite; return suite;
} }
} }

4
src/test/java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java
View File

@@ -72,6 +72,8 @@ import org.junit.rules.RuleChain;
@Category(OwnJVMTestsCategory.class) @Category(OwnJVMTestsCategory.class)
public class TemporaryNodesTest public class TemporaryNodesTest
{ {
private static final String SITE_SHORT_NAME = "siteShortName"+TemporaryNodesTest.class.getSimpleName();
// Rule to initialise the default Alfresco spring configuration // Rule to initialise the default Alfresco spring configuration
public static ApplicationContextInit APP_CONTEXT_INIT = new ApplicationContextInit(); public static ApplicationContextInit APP_CONTEXT_INIT = new ApplicationContextInit();
@@ -300,7 +302,7 @@ public class TemporaryNodesTest
{ {
public SiteInfo execute() throws Throwable public SiteInfo execute() throws Throwable
{ {
return SITE_SERVICE.createSite("sitePreset", "siteShortName", "site title", "site description", SiteVisibility.PUBLIC); return SITE_SERVICE.createSite("sitePreset", SITE_SHORT_NAME, "site title", "site description", SiteVisibility.PUBLIC);
} }
}); });
final NodeRef siteNodeRef = createdSite.getNodeRef(); final NodeRef siteNodeRef = createdSite.getNodeRef();