From cafe62473fddefb4c94df5a62d3c0d93e8fe6f68 Mon Sep 17 00:00:00 2001 From: jdotcms Date: Tue, 19 Jul 2022 17:53:49 +0200 Subject: [PATCH] #20840 refactoring the unit test --- .../workflows/business/WorkflowAPITest.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/portlets/workflows/business/WorkflowAPITest.java b/dotCMS/src/integration-test/java/com/dotmarketing/portlets/workflows/business/WorkflowAPITest.java index e0d50dc1c05a..95602ffbd654 100644 --- a/dotCMS/src/integration-test/java/com/dotmarketing/portlets/workflows/business/WorkflowAPITest.java +++ b/dotCMS/src/integration-test/java/com/dotmarketing/portlets/workflows/business/WorkflowAPITest.java @@ -10,6 +10,7 @@ import static org.junit.Assert.fail; import com.dotcms.IntegrationTestBase; +import com.dotcms.business.WrapInTransaction; import com.dotcms.content.elasticsearch.business.event.ContentletCheckinEvent; import com.dotcms.contenttype.business.ContentTypeAPIImpl; import com.dotcms.contenttype.business.FieldAPI; @@ -1459,11 +1460,10 @@ public void findAvailableActions() throws Exception { final Contentlet testContentleti = testContentlet; runNoLicense(()-> { - CacheLocator.getWorkFlowCache().clearCache(); - List foundActions_ = APILocator.getWorkflowAPI() - .findAvailableActions(testContentleti, joeContributor); - Assert.assertFalse(foundActions_.isEmpty()); - Assert.assertEquals(WorkflowAPI.SYSTEM_WORKFLOW_ID, foundActions_.get(0).getSchemeId()); + final List steps = getSteps(testContentleti); + + Assert.assertFalse(steps.isEmpty()); + Assert.assertEquals(WorkflowAPI.SYSTEM_WORKFLOW_ID, steps.get(0).getSchemeId()); }); } finally { contentletAPI.destroy(testContentlet, user, false); @@ -1471,6 +1471,16 @@ public void findAvailableActions() throws Exception { } + @WrapInTransaction + private List getSteps (final Contentlet testContentleti) throws DotDataException { + + final WorkFlowFactory workFlowFactory = FactoryLocator.getWorkFlowFactory(); + final List schemes = Arrays.asList(workFlowFactory.findSystemWorkflow()) ; + CacheLocator.getWorkFlowCache().clearCache(); + List steps = FactoryLocator.getWorkFlowFactory().findStepsByContentlet(testContentleti, schemes); + return steps; + } + /** * Test the find findAvailableActions methods */