Skip to content

Commit

Permalink
#28422: Rebalancing ITs again part 2 (#31421)
Browse files Browse the repository at this point in the history
  • Loading branch information
@victoralfaro-dotcms
victoralfaro-dotcms authored Feb 25, 2025
1 parent 017e0f1 commit df7c06c
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 73 deletions.
2 changes: 1 addition & 1 deletion dotCMS/src/main/java/com/dotcms/analytics/AnalyticsAPIImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public AnalyticsAPIImpl() {

@Override
public void notify(final SystemTableUpdatedKeyEvent event) {
Logger.info(this, String.format("Received event with key [%s]", event.getKey()));
if (event.getKey().contains(ANALYTICS_IDP_URL_KEY)) {
analyticsIdpUrl.set(resolveAnalyticsIdpUrl());
} else if (event.getKey().contains(ANALYTICS_ACCESS_TOKEN_RENEW_TIMEOUT_KEY)) {
Expand Down Expand Up @@ -436,5 +437,4 @@ private CircuitBreakerUrl.Response<AnalyticsKey> requestAnalyticsKey(final Analy
private Map<String, String> analyticsKeyHeaders(final AccessToken accessToken) throws AnalyticsException {
return CircuitBreakerUrl.authHeaders(AnalyticsHelper.get().formatBearer(accessToken));
}

}
20 changes: 19 additions & 1 deletion dotcms-integration/src/test/java/com/dotcms/MainSuite1a.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,25 @@
Task240306MigrateLegacyLanguageVariablesTest.class,
EmailActionletTest.class,
OpenAIGenerateImageActionletTest.class,
RequestMatcherTest.class
RequestMatcherTest.class,
com.dotmarketing.portlets.rules.conditionlet.ConditionletOSGIFTest.class,
com.dotmarketing.portlets.rules.conditionlet.CurrentSessionLanguageConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.NumberOfTimesPreviouslyVisitedConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.UsersBrowserLanguageConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.UsersSiteVisitsConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.VisitorOperatingSystemConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.VisitedUrlConditionletTest.class,
com.dotmarketing.portlets.rules.business.RulesCacheFTest.class,
com.dotmarketing.portlets.templates.business.TemplateAPITest.class,
com.dotmarketing.portlets.containers.business.ContainerAPIImplTest.class,
com.dotmarketing.portlets.folders.business.FolderAPITest.class,
com.dotmarketing.portlets.containers.business.ContainerAPITest.class,
com.dotmarketing.portlets.containers.business.FileAssetContainerUtilTest.class,
com.dotmarketing.portlets.htmlpages.business.HTMLPageAPITest.class,
com.dotmarketing.portlets.structure.factories.StructureFactoryTest.class,
com.dotmarketing.portlets.structure.factories.FieldFactoryTest.class,
com.dotmarketing.portlets.structure.model.ContentletRelationshipsTest.class,
com.dotmarketing.portlets.structure.transform.ContentletRelationshipsTransformerTest.class,
})

public class MainSuite1a {
Expand Down
85 changes: 14 additions & 71 deletions dotcms-integration/src/test/java/com/dotcms/MainSuite2a.java
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
package com.dotcms;

import com.dotcms.ai.workflow.OpenAIAutoTagActionletTest;
import com.dotcms.content.elasticsearch.util.ESMappingUtilHelperTest;
import com.dotcms.contenttype.business.DotAssetBaseTypeToContentTypeStrategyImplTest;
import com.dotcms.contenttype.test.DotAssetAPITest;
import com.dotcms.dotpubsub.PostgresPubSubImplTest;
import com.dotcms.ema.EMAWebInterceptorTest;
import com.dotcms.enterprise.cluster.ClusterFactoryTest;
import com.dotcms.junit.MainBaseSuite;
import com.dotcms.mock.request.CachedParameterDecoratorTest;
import com.dotcms.publisher.bundle.business.BundleFactoryTest;
import com.dotcms.publisher.business.PublishAuditAPITest;
import com.dotcms.publisher.util.PushedAssetUtilTest;
import com.dotcms.publishing.PublisherFilterImplTest;
import com.dotcms.publishing.PushPublishFiltersInitializerTest;
import com.dotcms.rendering.velocity.directive.DotParseTest;
import com.dotcms.rendering.velocity.servlet.VelocityServletIntegrationTest;
import com.dotcms.rest.BundleResourceTest;
import com.dotcms.rest.api.v1.apps.AppsResourceTest;
import com.dotcms.rest.api.v1.folder.FolderResourceTest;
import com.dotcms.rest.api.v1.pushpublish.PushPublishFilterResourceTest;
import com.dotcms.rest.api.v1.user.UserResourceIntegrationTest;
import com.dotcms.saml.IdentityProviderConfigurationFactoryTest;
import com.dotcms.saml.SamlConfigurationServiceTest;
import com.dotcms.security.apps.AppsAPIImplTest;
import com.dotcms.security.apps.AppsCacheImplTest;
import com.dotcms.translate.GoogleTranslationServiceIntegrationTest;
import com.dotmarketing.image.focalpoint.FocalPointAPITest;
import com.dotmarketing.portlets.cmsmaintenance.factories.CMSMaintenanceFactoryTest;
import com.dotmarketing.portlets.containers.business.ContainerFactoryImplTest;
Expand All @@ -26,12 +36,12 @@
import com.dotmarketing.portlets.folders.model.FolderTest;
import com.dotmarketing.portlets.templates.business.TemplateFactoryImplTest;
import com.dotmarketing.portlets.workflows.actionlet.PushNowActionletTest;
import com.dotmarketing.portlets.workflows.model.TestWorkflowAction;
import com.dotmarketing.quartz.job.CleanUpFieldReferencesJobTest;
import com.dotmarketing.startup.runonce.Task05195CreatesDestroyActionAndAssignDestroyDefaultActionsToTheSystemWorkflowTest;
import com.dotmarketing.startup.runonce.Task05210CreateDefaultDotAssetTest;
import com.dotmarketing.startup.runonce.Task05225RemoveLoadRecordsToIndexTest;
import com.dotmarketing.startup.runonce.Task05305AddPushPublishFilterColumnTest;
import com.dotmarketing.startup.runonce.Task05350AddDotSaltClusterColumnTest;
import com.dotmarketing.startup.runonce.Task240131UpdateLanguageVariableContentTypeTest;
import com.dotmarketing.util.HashBuilderTest;
import com.dotmarketing.util.TestConfig;
import com.liferay.portal.language.LanguageUtilTest;
Expand Down Expand Up @@ -90,76 +100,9 @@
com.dotmarketing.portlets.personas.business.DeleteMultiTreeUsedPersonaTagJobTest.class,
com.dotmarketing.portlets.links.business.MenuLinkAPITest.class,
com.dotmarketing.portlets.links.factories.LinkFactoryTest.class,
com.dotmarketing.portlets.rules.conditionlet.ConditionletOSGIFTest.class,
com.dotmarketing.portlets.rules.conditionlet.CurrentSessionLanguageConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.NumberOfTimesPreviouslyVisitedConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.UsersBrowserLanguageConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.UsersSiteVisitsConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.VisitorOperatingSystemConditionletTest.class,
com.dotmarketing.portlets.rules.conditionlet.VisitedUrlConditionletTest.class,
com.dotmarketing.portlets.rules.business.RulesCacheFTest.class,
com.dotmarketing.portlets.templates.business.TemplateAPITest.class,
com.dotmarketing.portlets.containers.business.ContainerAPIImplTest.class,
com.dotmarketing.portlets.folders.business.FolderAPITest.class,
com.dotmarketing.portlets.containers.business.ContainerAPITest.class,
com.dotmarketing.portlets.containers.business.FileAssetContainerUtilTest.class,
com.dotmarketing.portlets.htmlpages.business.HTMLPageAPITest.class,
com.dotmarketing.portlets.structure.factories.StructureFactoryTest.class,
com.dotmarketing.portlets.structure.factories.FieldFactoryTest.class,
com.dotmarketing.portlets.structure.model.ContentletRelationshipsTest.class,
com.dotmarketing.portlets.structure.transform.ContentletRelationshipsTransformerTest.class,
com.dotmarketing.portlets.categories.business.CategoryAPITest.class,
com.dotmarketing.filters.FiltersTest.class,
com.dotmarketing.business.VersionableAPITest.class,
com.dotmarketing.business.UserAPITest.class,
com.dotmarketing.business.portal.PortletAPIImplTest.class,
com.dotmarketing.business.web.LanguageWebApiTest.class,
com.dotmarketing.business.IdentifierFactoryTest.class,
com.dotmarketing.business.IdentifierAPITest.class,
com.dotmarketing.business.CommitListenerCacheWrapperTest.class,
com.dotmarketing.business.RoleAPITest.class,
com.dotmarketing.business.IdentifierConsistencyIntegrationTest.class,
com.dotmarketing.business.LayoutAPITest.class,
com.dotmarketing.business.PermissionAPIIntegrationTest.class,
com.dotmarketing.business.PermissionAPITest.class,
com.dotmarketing.servlets.BinaryExporterServletTest.class,
com.dotmarketing.servlets.ShortyServletAndTitleImageTest.class,
com.dotmarketing.servlets.ajax.AjaxDirectorServletIntegrationTest.class,
com.dotmarketing.factories.MultiTreeAPITest.class,
FocalPointAPITest.class,
com.dotmarketing.tag.business.TagAPITest.class,
OSGIUtilTest.class,
CleanUpFieldReferencesJobTest.class,
CachedParameterDecoratorTest.class,
ContainerFactoryImplTest.class,
TemplateFactoryImplTest.class,
TestConfig.class,
FolderTest.class,
PublishAuditAPITest.class,
BundleFactoryTest.class,
com.dotcms.security.apps.SecretsStoreKeyStoreImplTest.class,
AppsAPIImplTest.class,
AppsResourceTest.class,
AppsCacheImplTest.class,
VelocityServletIntegrationTest.class,
DotAssetAPITest.class,
DotAssetBaseTypeToContentTypeStrategyImplTest.class,
FileAssetAPIImplIntegrationTest.class,
FileAssetFactoryIntegrationTest.class,
UserResourceIntegrationTest.class,
IntegrationResourceLinkTest.class,
HashBuilderTest.class,
LanguageUtilTest.class,
FolderResourceTest.class,
Task05225RemoveLoadRecordsToIndexTest.class,
PublisherFilterImplTest.class,
PushPublishFiltersInitializerTest.class,
PushPublishFilterResourceTest.class,
PushNowActionletTest.class,
Task05305AddPushPublishFilterColumnTest.class,
CMSMaintenanceFactoryTest.class,
Task05350AddDotSaltClusterColumnTest.class,
PostgresPubSubImplTest.class
com.dotmarketing.portlets.categories.business.CategoryAPITest.class,
com.dotmarketing.filters.FiltersTest.class
})
public class MainSuite2a {

Expand Down
67 changes: 67 additions & 0 deletions dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import com.dotcms.contenttype.test.DotAssetAPITest;
import com.dotcms.csspreproc.CSSCacheTest;
import com.dotcms.csspreproc.CSSPreProcessServletTest;
import com.dotcms.dotpubsub.PostgresPubSubImplTest;
import com.dotcms.dotpubsub.RedisPubSubImplTest;
import com.dotcms.ema.EMAWebInterceptorTest;
import com.dotcms.enterprise.cluster.ClusterFactoryTest;
Expand Down Expand Up @@ -70,11 +71,16 @@
import com.dotcms.jobs.business.api.JobQueueManagerAPITest;
import com.dotcms.junit.MainBaseSuite;
import com.dotcms.mail.MailAPIImplTest;
import com.dotcms.mock.request.CachedParameterDecoratorTest;
import com.dotcms.publisher.bundle.business.BundleAPITest;
import com.dotcms.publisher.bundle.business.BundleFactoryTest;
import com.dotcms.publisher.business.PublishAuditAPITest;
import com.dotcms.publisher.receiver.BundlePublisherTest;
import com.dotcms.publisher.util.DependencyManagerTest;
import com.dotcms.publisher.util.PushedAssetUtilTest;
import com.dotcms.publishing.BundlerUtilTest;
import com.dotcms.publishing.PublisherFilterImplTest;
import com.dotcms.publishing.PushPublishFiltersInitializerTest;
import com.dotcms.publishing.manifest.CSVManifestBuilderTest;
import com.dotcms.publishing.manifest.CSVManifestReaderTest;
import com.dotcms.publishing.manifest.ManifestReaderFactoryTest;
Expand All @@ -99,6 +105,7 @@
import com.dotcms.rest.api.v1.authentication.ResetPasswordTokenUtilTest;
import com.dotcms.rest.api.v1.folder.FolderResourceTest;
import com.dotcms.rest.api.v1.menu.MenuResourceTest;
import com.dotcms.rest.api.v1.pushpublish.PushPublishFilterResourceTest;
import com.dotcms.rest.api.v1.system.ConfigurationHelperTest;
import com.dotcms.rest.api.v1.taillog.TailLogResourceTest;
import com.dotcms.rest.api.v1.user.UserResourceIntegrationTest;
Expand Down Expand Up @@ -127,23 +134,30 @@
import com.dotmarketing.common.db.DBTimeZoneCheckTest;
import com.dotmarketing.filters.AutoLoginFilterTest;
import com.dotmarketing.filters.CMSUrlUtilIntegrationTest;
import com.dotmarketing.image.focalpoint.FocalPointAPITest;
import com.dotmarketing.osgi.GenericBundleActivatorIntegrationTest;
import com.dotmarketing.portlets.browser.BrowserUtilTest;
import com.dotmarketing.portlets.browser.ajax.BrowserAjaxTest;
import com.dotmarketing.portlets.categories.business.CategoryFactoryTest;
import com.dotmarketing.portlets.cmsmaintenance.factories.CMSMaintenanceFactoryTest;
import com.dotmarketing.portlets.containers.business.ContainerFactoryImplTest;
import com.dotmarketing.portlets.contentlet.business.ContentletCacheImplTest;
import com.dotmarketing.portlets.contentlet.model.ContentletDependenciesTest;
import com.dotmarketing.portlets.contentlet.model.IntegrationResourceLinkTest;
import com.dotmarketing.portlets.fileassets.business.FileAssetAPIImplIntegrationTest;
import com.dotmarketing.portlets.fileassets.business.FileAssetFactoryIntegrationTest;
import com.dotmarketing.portlets.folders.business.FolderFactoryImplTest;
import com.dotmarketing.portlets.folders.model.FolderTest;
import com.dotmarketing.portlets.htmlpages.business.render.HTMLPageAssetRenderedAPIImplIntegrationTest;
import com.dotmarketing.portlets.templates.business.FileAssetTemplateUtilTest;
import com.dotmarketing.portlets.templates.business.TemplateFactoryImplTest;
import com.dotmarketing.portlets.workflows.actionlet.MoveContentActionletTest;
import com.dotmarketing.portlets.workflows.actionlet.PushNowActionletTest;
import com.dotmarketing.portlets.workflows.actionlet.SaveContentAsDraftActionletIntegrationTest;
import com.dotmarketing.portlets.workflows.actionlet.VelocityScriptActionletAbortTest;
import com.dotmarketing.portlets.workflows.model.TestWorkflowAction;
import com.dotmarketing.quartz.DotStatefulJobTest;
import com.dotmarketing.quartz.job.CleanUpFieldReferencesJobTest;
import com.dotmarketing.quartz.job.DropOldContentVersionsJobTest;
import com.dotmarketing.quartz.job.IntegrityDataGenerationJobTest;
import com.dotmarketing.quartz.job.PopulateContentletAsJSONJobTest;
Expand All @@ -159,9 +173,11 @@
import com.dotmarketing.util.ITConfigTest;
import com.dotmarketing.util.MaintenanceUtilTest;
import com.dotmarketing.util.ResourceCollectorUtilTest;
import com.dotmarketing.util.TestConfig;
import com.dotmarketing.util.UtilMethodsITest;
import com.dotmarketing.util.contentlet.pagination.PaginatedContentletsIntegrationTest;
import com.liferay.portal.language.LanguageUtilTest;
import org.apache.felix.framework.OSGIUtilTest;
import org.apache.velocity.tools.view.tools.CookieToolTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
Expand Down Expand Up @@ -376,6 +392,36 @@
AsyncVanitiesCollectorTest.class,
HttpServletRequestImpersonatorTest.class,
Task250107RemoveEsReadOnlyMonitorJobTest.class,

com.dotmarketing.business.VersionableAPITest.class,
com.dotmarketing.business.UserAPITest.class,
com.dotmarketing.business.portal.PortletAPIImplTest.class,
com.dotmarketing.business.web.LanguageWebApiTest.class,
com.dotmarketing.business.IdentifierFactoryTest.class,
com.dotmarketing.business.IdentifierAPITest.class,
com.dotmarketing.business.CommitListenerCacheWrapperTest.class,
com.dotmarketing.business.RoleAPITest.class,
com.dotmarketing.business.IdentifierConsistencyIntegrationTest.class,
com.dotmarketing.business.LayoutAPITest.class,
com.dotmarketing.business.PermissionAPIIntegrationTest.class,
com.dotmarketing.business.PermissionAPITest.class,
com.dotmarketing.servlets.BinaryExporterServletTest.class,
com.dotmarketing.servlets.ShortyServletAndTitleImageTest.class,
com.dotmarketing.servlets.ajax.AjaxDirectorServletIntegrationTest.class,
FocalPointAPITest.class,
com.dotmarketing.tag.business.TagAPITest.class,

OSGIUtilTest.class,
CleanUpFieldReferencesJobTest.class,
CachedParameterDecoratorTest.class,
ContainerFactoryImplTest.class,
TemplateFactoryImplTest.class,
TestConfig.class,
FolderTest.class,
PublishAuditAPITest.class,
BundleFactoryTest.class,
com.dotcms.security.apps.SecretsStoreKeyStoreImplTest.class,

AppsAPIImplTest.class,
AppsResourceTest.class,
AppsCacheImplTest.class,
Expand Down Expand Up @@ -419,6 +465,27 @@
Task05195CreatesDestroyActionAndAssignDestroyDefaultActionsToTheSystemWorkflowTest.class,
Task05210CreateDefaultDotAssetTest.class,




DotAssetAPITest.class,
DotAssetBaseTypeToContentTypeStrategyImplTest.class,
FileAssetAPIImplIntegrationTest.class,
FileAssetFactoryIntegrationTest.class,
UserResourceIntegrationTest.class,
IntegrationResourceLinkTest.class,
HashBuilderTest.class,
LanguageUtilTest.class,
FolderResourceTest.class,
Task05225RemoveLoadRecordsToIndexTest.class,
PublisherFilterImplTest.class,
PushPublishFiltersInitializerTest.class,
PushPublishFilterResourceTest.class,
PushNowActionletTest.class,
Task05305AddPushPublishFilterColumnTest.class,
CMSMaintenanceFactoryTest.class,
Task05350AddDotSaltClusterColumnTest.class,
PostgresPubSubImplTest.class,
DotParseTest.class,
TestWorkflowAction.class,
SamlConfigurationServiceTest.class,
Expand Down

0 comments on commit df7c06c

Please sign in to comment.