diff --git a/imixs-archive-api/src/test/java/org/imixs/archive/core/TestOptional.java b/imixs-archive-api/src/test/java/org/imixs/archive/core/TestOptional.java deleted file mode 100644 index e2144a56..00000000 --- a/imixs-archive-api/src/test/java/org/imixs/archive/core/TestOptional.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.imixs.archive.core; - -import java.util.Optional; - -import org.junit.Assert; -import org.junit.Test; - -/** - * Test the Optional expression - * - * @author rsoika - * - */ -public class TestOptional { - - /** - * Test different szenarios - * - */ - @Test - public void testOptional() { - String name = "a"; - Optional opt = Optional.of(name); - Assert.assertTrue(opt.isPresent()); - - name = ""; - opt = Optional.of(name); - Assert.assertTrue(opt.isPresent()); - - - Assert.assertFalse(opt.isPresent() && !opt.get().isEmpty()); - } - -} diff --git a/imixs-archive-api/src/test/java/org/imixs/archive/core/TestSnapshotService.java b/imixs-archive-api/src/test/java/org/imixs/archive/core/TestSnapshotService.java index 5b167295..a0564325 100644 --- a/imixs-archive-api/src/test/java/org/imixs/archive/core/TestSnapshotService.java +++ b/imixs-archive-api/src/test/java/org/imixs/archive/core/TestSnapshotService.java @@ -96,7 +96,7 @@ public void testOnSave() throws AccessDeniedException, ProcessingErrorException, assertTrue(snapshotID.startsWith("W0000-00001")); // load the snapshot workitem - ItemCollection snapshotworkitem = workflowEnvironment.getDatabase().get(snapshotID); + ItemCollection snapshotworkitem = workflowEnvironment.getDocumentService().load(snapshotID); assertNotNull(snapshotworkitem); } @@ -142,7 +142,7 @@ public void testOnSaveVersion() assertTrue(snapshotID.startsWith("W0000-00001")); // load the snapshot workitem - ItemCollection snapshotworkitem = workflowEnvironment.getDatabase().get(snapshotID); + ItemCollection snapshotworkitem = workflowEnvironment.getDocumentService().load(snapshotID); assertNotNull(snapshotworkitem); // test the file content @@ -170,7 +170,7 @@ public void testOnSaveVersion() // now lets check the version.... String versionID = workitem.getItemValueString("$uniqueIdVersions"); - ItemCollection version = workflowEnvironment.getDatabase().get(versionID); + ItemCollection version = workflowEnvironment.getDocumentService().load(versionID); assertNotNull(version); // simulate snaptshot cdi event @@ -185,7 +185,7 @@ public void testOnSaveVersion() assertFalse(snapshotID.equals(versionSnapshot)); // we load the snapshot version and we expect again the fail content.... - ItemCollection snapshotworkitemVersion = workflowEnvironment.getDatabase().get(versionSnapshot); + ItemCollection snapshotworkitemVersion = workflowEnvironment.getDocumentService().load(versionSnapshot); assertNotNull(snapshotworkitemVersion); // test the file content @@ -239,7 +239,7 @@ public void testFileDataAndDMSEntries() assertTrue(snapshotID.startsWith("W0000-00001")); // load the snapshot workitem - ItemCollection snapshotworkitem = workflowEnvironment.getDatabase().get(snapshotID); + ItemCollection snapshotworkitem = workflowEnvironment.getDocumentService().load(snapshotID); assertNotNull(snapshotworkitem); // test the file data of workitem diff --git a/imixs-archive-documents/src/test/java/org/imixs/workflow/documents/PDFXMLExtractorPluginTest.java b/imixs-archive-documents/src/test/java/org/imixs/workflow/documents/PDFXMLExtractorPluginTest.java index 282273eb..203335e8 100644 --- a/imixs-archive-documents/src/test/java/org/imixs/workflow/documents/PDFXMLExtractorPluginTest.java +++ b/imixs-archive-documents/src/test/java/org/imixs/workflow/documents/PDFXMLExtractorPluginTest.java @@ -1,5 +1,8 @@ package org.imixs.workflow.documents; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.when; import java.io.IOException; @@ -8,15 +11,14 @@ import java.util.regex.Pattern; import org.imixs.archive.documents.PDFXMLExtractorPlugin; +import org.imixs.workflow.FileData; import org.imixs.workflow.ItemCollection; import org.imixs.workflow.engine.WorkflowMockEnvironment; import org.imixs.workflow.exceptions.ModelException; import org.imixs.workflow.exceptions.PluginException; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** @@ -38,13 +40,12 @@ public class PDFXMLExtractorPluginTest { */ WorkflowMockEnvironment workflowMockEnvironment; - @Before + @BeforeEach public void setup() throws PluginException, ModelException { workflowMockEnvironment = new WorkflowMockEnvironment(); - workflowMockEnvironment.setModelPath("/bpmn/TestZUGFeRD.bpmn"); - - workflowMockEnvironment.setup(); + workflowMockEnvironment.setUp(); + workflowMockEnvironment.loadBPMNModel("/bpmn/TestZUGFeRD.bpmn"); // mock abstract plugin class for the plitAndJoinPlugin plugin = Mockito.mock(PDFXMLExtractorPlugin.class, Mockito.CALLS_REAL_METHODS); @@ -59,11 +60,6 @@ public void setup() throws PluginException, ModelException { } - @After - public void teardown() { - - } - /** * Test extracting an embedded xml file from a PDF file using the pdfBox * library. @@ -73,81 +69,78 @@ public void teardown() { public void testPDFXMLExtractor() { ItemCollection workitem = null; try { - event = workflowMockEnvironment.getModel().getEvent(100, 10); + // Build a Document.... workitem = new ItemCollection(); + workitem.model("1.0.0").task(100).event(10); + event = workflowMockEnvironment.getModelService().getModelManager().loadEvent(workitem); // load the example pdf .. String fileName = "ZUGFeRD/20160504_MX16124-000005_001-001_Muster.pdf"; InputStream inputStream = getClass().getResourceAsStream("/" + fileName); byte[] fileData = PDFXMLExtractorPlugin.streamToByteArray(inputStream); - workitem.addFile(fileData, fileName, ""); + workitem.addFileData(new FileData(fileName, fileData, "", null)); byte[] xmldata = PDFXMLExtractorPlugin.getXMLFile(workitem, ".pdf"); - Assert.assertNotNull(xmldata); - + assertNotNull(xmldata); + // show first 100 characters from xml..... - String xml=new String(xmldata); + String xml = new String(xmldata); logger.info(xml.substring(0, 100) + "..."); } catch (PluginException | ModelException | IOException e) { e.printStackTrace(); - Assert.fail(); + fail(); } - Assert.assertNotNull(workitem); + assertNotNull(workitem); } - - - + /** - * Test extracting an embedded xml file from a PDF file, converting the xml into a XMLDocument - * and merging the data into the current document. + * Test extracting an embedded xml file from a PDF file, converting the xml into + * a XMLDocument + * and merging the data into the current document. * */ @Test - @Ignore + @Disabled public void testMergeXMLData() { ItemCollection workitem = null; try { - event = workflowMockEnvironment.getModel().getEvent(100, 10); // Build a Document.... workitem = new ItemCollection(); + workitem.model("1.0.0").task(100).event(10); + event = workflowMockEnvironment.getModelService().getModelManager().loadEvent(workitem); + // load the example pdf .. String fileName = "ZUGFeRD/20160504_MX16124-000005_001-001_Muster.pdf"; InputStream inputStream = getClass().getResourceAsStream("/" + fileName); byte[] fileData = PDFXMLExtractorPlugin.streamToByteArray(inputStream); - workitem.addFile(fileData, fileName, ""); + workitem.addFileData(new FileData(fileName, fileData, "", null)); - - workitem=plugin.run(workitem, event); + workitem = plugin.run(workitem, event); - Assert.assertNotNull(workitem); - + assertNotNull(workitem); } catch (PluginException | ModelException | IOException e) { e.printStackTrace(); - Assert.fail(); + fail(); } - Assert.assertNotNull(workitem); + assertNotNull(workitem); } - - - - /** * Test the regex for pdf file names. */ @Test public void testRegex() { - Assert.assertTrue(Pattern.compile(".pdf").matcher("sample.pdf").find()); - Assert.assertTrue(Pattern.compile(".[pP][dD][fF]").matcher("sample.PDF").find()); + assertTrue(Pattern.compile(".pdf").matcher("sample.pdf").find()); + assertTrue(Pattern.compile(".[pP][dD][fF]").matcher("sample.PDF").find()); } } diff --git a/imixs-archive-documents/src/test/java/org/imixs/workflow/engine/WorkflowMockEnvironment.java b/imixs-archive-documents/src/test/java/org/imixs/workflow/engine/WorkflowMockEnvironment.java deleted file mode 100644 index fdccddb4..00000000 --- a/imixs-archive-documents/src/test/java/org/imixs/workflow/engine/WorkflowMockEnvironment.java +++ /dev/null @@ -1,332 +0,0 @@ -package org.imixs.workflow.engine; - -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.io.InputStream; -import java.security.Principal; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -import jakarta.ejb.SessionContext; -import javax.xml.parsers.ParserConfigurationException; - -import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.Model; -import org.imixs.workflow.ModelManager; -import org.imixs.workflow.WorkflowContext; -import org.imixs.workflow.WorkflowKernel; -import org.imixs.workflow.bpmn.BPMNModel; -import org.imixs.workflow.bpmn.BPMNParser; -import org.imixs.workflow.exceptions.AccessDeniedException; -import org.imixs.workflow.exceptions.ModelException; -import org.imixs.workflow.exceptions.PluginException; -import org.imixs.workflow.exceptions.ProcessingErrorException; -import org.junit.Before; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; -import org.mockito.Spy; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; -import org.xml.sax.SAXException; - -/** - * The WorkflowMockEnvironment provides a mocked database environment for jUnit - * tests. The WorkflowMockEnvironment can be used to test the WorkflowService. - * - * This test class mocks a complete workflow environment without the class - * WorkflowService - * - * The test class generates a test database with process entities and activity - * entities which can be accessed from a plug-in or the workflowKernel. - * - * A JUnit Test can save, load and process workitems. - * - * JUnit tests can also manipulate the model by changing entities through - * calling the methods: - * - * getActivityEntity,setActivityEntity,getProcessEntity,setProcessEntity - * - * - * @version 2.0 - * @see AbstractPluginTest, TestWorkflowService, ModelPluginMock - * @author rsoika - */ -public class WorkflowMockEnvironment { - private final static Logger logger = Logger.getLogger(WorkflowMockEnvironment.class.getName()); - public static final String DEFAULT_MODEL_VERSION = "1.0.0"; - - Map database = null; - protected DocumentService documentService; - protected WorkflowService workflowService; - - @Spy - protected ModelService modelService; - protected SessionContext ctx; - - protected WorkflowContext workflowContext; - private BPMNModel model = null; - - private String modelPath = null;// "/bpmn/plugin-test.bpmn"; - - public String getModelPath() { - return modelPath; - } - - public void setModelPath(String modelPath) { - this.modelPath = modelPath; - } - - public WorkflowContext getWorkflowContext() { - return workflowContext; - } - - public WorkflowService getWorkflowService() { - return workflowService; - } - - public ModelService getModelService() { - return modelService; - } - - public DocumentService getDocumentService() { - return documentService; - } - - @Before - public void setup() throws PluginException, ModelException { - MockitoAnnotations.initMocks(this); - // setup db - createTestDatabase(); - - // mock session context - ctx = Mockito.mock(SessionContext.class); - // simulate SessionContext ctx.getCallerPrincipal().getName() - Principal principal = Mockito.mock(Principal.class); - when(principal.getName()).thenReturn("manfred"); - when(ctx.getCallerPrincipal()).thenReturn(principal); - - // mock Entity service - documentService = Mockito.mock(DocumentService.class); - // Simulate fineProfile("1.0.0") -> entityService.load()... - when(documentService.load(Mockito.anyString())).thenAnswer(new Answer() { - @Override - public ItemCollection answer(InvocationOnMock invocation) throws Throwable { - Object[] args = invocation.getArguments(); - String id = (String) args[0]; - ItemCollection result = database.get(id); - if (result != null) { - // set author access=true - result.replaceItemValue(DocumentService.ISAUTHOR, true); - } - return result; - } - }); - - // simulate save() method - when(documentService.save(Mockito.any(ItemCollection.class))).thenAnswer(new Answer() { - @Override - public ItemCollection answer(InvocationOnMock invocation) throws Throwable { - Object[] args = invocation.getArguments(); - ItemCollection entity = (ItemCollection) args[0]; - // test if uniqueid is available - if (entity.getUniqueID().isEmpty()) { - entity.replaceItemValue(WorkflowKernel.UNIQUEID, WorkflowKernel.generateUniqueID()); - } - database.put(entity.getItemValueString(WorkflowKernel.UNIQUEID), entity); - return entity; - } - }); - - // Mock modelService (using the @spy) annotation - Mockito.doNothing().when(modelService).init(); - - // load model - loadModel(); - - // Mock modelManager - ModelManager modelManager = Mockito.mock(ModelManager.class); - try { - when(modelManager.getModel(Mockito.anyString())).thenReturn(this.getModel()); - when(modelManager.getModelByWorkitem(Mockito.any(ItemCollection.class))).thenReturn(this.getModel()); - } catch (ModelException e) { - e.printStackTrace(); - } - - // Mock context - workflowContext = Mockito.mock(WorkflowContext.class); - when(workflowContext.getModelManager()).thenReturn(modelManager); - - // Mock WorkflowService - workflowService = Mockito.mock(WorkflowService.class); - workflowService.documentService = documentService; - workflowService.ctx = ctx; - - workflowService.modelService = modelService; - when(workflowService.getModelManager()).thenReturn(modelService); - when(workflowService.getWorkListByRef(Mockito.anyString())).thenAnswer(new Answer>() { - @Override - public List answer(InvocationOnMock invocation) throws Throwable { - - List result = new ArrayList<>(); - Object[] args = invocation.getArguments(); - String id = (String) args[0]; - - // iterate over all data and return matching workitems. - Collection allEntities = database.values(); - for (ItemCollection aentity : allEntities) { - if (aentity.getItemValueString(WorkflowService.UNIQUEIDREF).equals(id)) { - result.add(aentity); - } - } - - return result; - } - }); - - - // AdaptText - when(workflowService.adaptText(Mockito.anyString(),Mockito.any(ItemCollection.class))).thenAnswer(new Answer(){ - @Override - public String answer(InvocationOnMock invocation) throws Throwable, PluginException { - - Object[] args = invocation.getArguments(); - String text=(String) args[0]; - ItemCollection document = (ItemCollection) args[1]; - - TextEvent textEvent=new TextEvent(text, document); - - TextItemValueAdapter tiva=new TextItemValueAdapter(); - tiva.onEvent(textEvent); - - - return textEvent.getText(); - } - }); - - - // AdaptText - when(workflowService.adaptTextList(Mockito.anyString(),Mockito.any(ItemCollection.class))).thenAnswer(new Answer>(){ - @Override - public List answer(InvocationOnMock invocation) throws Throwable, PluginException { - - Object[] args = invocation.getArguments(); - String text=(String) args[0]; - ItemCollection document = (ItemCollection) args[1]; - - TextEvent textEvent=new TextEvent(text, document); - - TextItemValueAdapter tiva=new TextItemValueAdapter(); - tiva.onEvent(textEvent); - - - return textEvent.getTextList(); - } - }); - - - - - when(workflowService.evalNextTask(Mockito.any(ItemCollection.class))).thenCallRealMethod(); - when(workflowService.evalWorkflowResult(Mockito.any(ItemCollection.class),Mockito.any(ItemCollection.class))).thenCallRealMethod(); - when(workflowService.evalWorkflowResult(Mockito.any(ItemCollection.class),Mockito.any(ItemCollection.class),Mockito.anyBoolean())).thenCallRealMethod(); - when(workflowService.processWorkItem(Mockito.any(ItemCollection.class))).thenCallRealMethod(); - when(workflowService.getUserName()).thenCallRealMethod(); - when(workflowService.getWorkItem(Mockito.anyString())).thenCallRealMethod(); - - try { - when(workflowService.getEvents(Mockito.any(ItemCollection.class))).thenCallRealMethod(); - } catch (ModelException e) { - - e.printStackTrace(); - } - - } - - - /** - * Create a test database with some workItems and a simple model - */ - protected void createTestDatabase() { - - database = new HashMap(); - - ItemCollection entity = null; - - logger.info("createSimpleDatabase...."); - - // create workitems - for (int i = 1; i < 6; i++) { - entity = new ItemCollection(); - entity.replaceItemValue("type", "workitem"); - entity.replaceItemValue(WorkflowKernel.UNIQUEID, "W0000-0000" + i); - entity.replaceItemValue("txtName", "Workitem " + i); - entity.setModelVersion("1.0.0"); - entity.setTaskID(100); - entity.setEventID(10); - entity.replaceItemValue(DocumentService.ISAUTHOR, true); - database.put(entity.getItemValueString(WorkflowKernel.UNIQUEID), entity); - } - - } - - public Model getModel() { - return model; - } - - /** - * loads a model from the given path - * - * @param modelPath - */ - public void loadModel(String modelPath) { - setModelPath(modelPath); - loadModel(); - } - - /** - * loads the current model - */ - public void loadModel() { - if (this.modelPath != null) { - long lLoadTime = System.currentTimeMillis(); - InputStream inputStream = WorkflowMockEnvironment.class.getResourceAsStream(this.modelPath); - try { - logger.info("loading model: " + this.modelPath + "...."); - model = BPMNParser.parseModel(inputStream, "UTF-8"); - - this.modelService.addModel(model); - logger.fine("...loadModel processing time=" + (System.currentTimeMillis() - lLoadTime) + "ms"); - } catch (ModelException | ParseException | ParserConfigurationException | SAXException | IOException e) { - e.printStackTrace(); - } - - } - - } - - public Map getDatabase() { - return database; - } - - /** - * Mocks a processing life cycle - * - * @param workitem - * @return - * @throws ModelException - * @throws PluginException - * @throws ProcessingErrorException - * @throws AccessDeniedException - */ - public ItemCollection processWorkItem(ItemCollection workitem) - throws AccessDeniedException, ProcessingErrorException, PluginException, ModelException { - workitem = workflowService.processWorkItem(workitem); - return workitem; - } -} diff --git a/imixs-archive-exporter/src/test/java/org/imixs/archive/exporter/TestFilter.java b/imixs-archive-exporter/src/test/java/org/imixs/archive/exporter/TestFilter.java index 1834cd73..504119f4 100644 --- a/imixs-archive-exporter/src/test/java/org/imixs/archive/exporter/TestFilter.java +++ b/imixs-archive-exporter/src/test/java/org/imixs/archive/exporter/TestFilter.java @@ -1,10 +1,11 @@ package org.imixs.archive.exporter; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test the Optional expression @@ -28,10 +29,10 @@ public void testOptional() { Matcher matcher = pattern.matcher(name); if (!matcher.find()) { - Assert.fail(); + fail(); } - // Assert.assertTrue(name.matches(filter)); + // assertTrue(name.matches(filter)); } diff --git a/imixs-archive-importer/src/test/java/org/imixs/archive/importer/mail/TestContentType.java b/imixs-archive-importer/src/test/java/org/imixs/archive/importer/mail/TestContentType.java index c03b5444..b77fedfd 100644 --- a/imixs-archive-importer/src/test/java/org/imixs/archive/importer/mail/TestContentType.java +++ b/imixs-archive-importer/src/test/java/org/imixs/archive/importer/mail/TestContentType.java @@ -1,9 +1,10 @@ package org.imixs.archive.importer.mail; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.logging.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test strip contenttype @@ -22,7 +23,7 @@ public void testConverter() { } logger.info("'" + contentType + "'"); - Assert.assertEquals("text/html", contentType); + assertEquals("text/html", contentType); } } diff --git a/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestClusterNative.java b/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestClusterNative.java index f1d9ce8a..33e9937b 100644 --- a/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestClusterNative.java +++ b/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestClusterNative.java @@ -1,14 +1,14 @@ package org.imixs.workflow.archive.cassandra; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.stream.Collectors; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.ResultSet; @@ -30,25 +30,25 @@ public class TestClusterNative { /** * Test the local connection */ - @Ignore + @Disabled @Test public void testCluster() { Cluster cluster = Cluster.builder().addContactPoint(CONNACT_POINT).build(); - Assert.assertNotNull(cluster); + assertNotNull(cluster); cluster.init(); Session session = cluster.connect(); - Assert.assertNotNull(session); + assertNotNull(session); } /** * Test createKeyspace if not exists... */ - @Ignore + @Disabled @Test public void createKeyspace() { Cluster cluster = Cluster.builder().addContactPoint(CONNACT_POINT).build(); @@ -64,11 +64,12 @@ public void createKeyspace() { /** * Test createKeyspace if not exists... */ - @Ignore + @Disabled @Test public void createTable() { Session session = connect(); -// String statement = "CREATE TABLE IF NOT EXISTS imixs_test (id uuid PRIMARY KEY, title text, subject text);"; + // String statement = "CREATE TABLE IF NOT EXISTS imixs_test (id uuid PRIMARY + // KEY, title text, subject text);"; String statement = "CREATE TABLE IF NOT EXISTS document (id text PRIMARY KEY, type text, created timestamp, modified timestamp, data text);"; session.execute(statement); @@ -91,7 +92,7 @@ private Session connect() { Cluster cluster = Cluster.builder().addContactPoint(CONNACT_POINT).build(); cluster.init(); Session session = cluster.connect(KEYSPACE); - Assert.assertNotNull(session); + assertNotNull(session); return session; } } diff --git a/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestRegexOptions.java b/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestRegexOptions.java index fb30fd01..254949e1 100644 --- a/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestRegexOptions.java +++ b/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestRegexOptions.java @@ -1,9 +1,11 @@ package org.imixs.workflow.archive.cassandra; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.regex.Pattern; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test class for testing the regex options for restore @@ -24,13 +26,13 @@ public void testType() { Pattern regexPattern = Pattern.compile(regex); value = "snapshot-process"; - Assert.assertTrue(regexPattern.matcher(value).find()); + assertTrue(regexPattern.matcher(value).find()); value = "snapshot-processx"; - Assert.assertFalse(regexPattern.matcher(value).find()); + assertFalse(regexPattern.matcher(value).find()); value = "process"; - Assert.assertTrue(regexPattern.matcher(value).find()); + assertTrue(regexPattern.matcher(value).find()); } @@ -43,18 +45,16 @@ public void testTypeMulti() { Pattern regexPattern = Pattern.compile(regex); value = "snapshot-process"; - Assert.assertTrue(regexPattern.matcher(value).find()); + assertTrue(regexPattern.matcher(value).find()); value = "snapshot-processx"; - Assert.assertFalse(regexPattern.matcher(value).find()); + assertFalse(regexPattern.matcher(value).find()); value = "process"; - Assert.assertTrue(regexPattern.matcher(value).find()); - - - value = "snapshot-space"; - Assert.assertTrue(regexPattern.matcher(value).find()); + assertTrue(regexPattern.matcher(value).find()); + value = "snapshot-space"; + assertTrue(regexPattern.matcher(value).find()); } diff --git a/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestRestAPI.java b/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestRestAPI.java index 5f0f4817..1a20da79 100644 --- a/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestRestAPI.java +++ b/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestRestAPI.java @@ -1,13 +1,16 @@ package org.imixs.workflow.archive.cassandra; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.List; import org.imixs.melman.DocumentClient; import org.imixs.melman.FormAuthenticator; import org.imixs.workflow.ItemCollection; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * This class makes a test agains a running instance of office workflow to test @@ -21,7 +24,7 @@ public class TestRestAPI { * This various snaphsot id patterns * */ - @Ignore + @Disabled @Test public void simpleApiTest() { @@ -35,13 +38,13 @@ public void simpleApiTest() { List result = documentClient.getCustomResource(apiURL + "/snapshot/syncpoint/0"); - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); + assertNotNull(result); + assertEquals(1, result.size()); } catch (Exception e) { e.printStackTrace(); - Assert.fail(); + fail(); } } diff --git a/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestWorkitemFactory.java b/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestWorkitemFactory.java index 204573f1..08c9b19e 100644 --- a/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestWorkitemFactory.java +++ b/imixs-archive-service/src/test/java/org/imixs/workflow/archive/cassandra/TestWorkitemFactory.java @@ -1,9 +1,11 @@ package org.imixs.workflow.archive.cassandra; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.imixs.workflow.FileData; import org.imixs.workflow.ItemCollection; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test class for the WorkitemFactory @@ -18,31 +20,27 @@ public class TestWorkitemFactory { */ @Test public void testSimple() { - ItemCollection workitem=WorkitemFactory.createWorkitem(); - Assert.assertNotNull(workitem); + ItemCollection workitem = WorkitemFactory.createWorkitem(); + assertNotNull(workitem); // validate data - Assert.assertEquals(47, workitem.getItemValueInteger("_some_amount")); - Assert.assertEquals("Hello World", workitem.getItemValueString("_some_text")); + assertEquals(47, workitem.getItemValueInteger("_some_amount")); + assertEquals("Hello World", workitem.getItemValueString("_some_text")); } - - + /** * Test create workitem by factory with file */ @Test public void testSimpleFile() { - ItemCollection workitem=WorkitemFactory.createWorkitem(); - - WorkitemFactory.addFile(workitem, "test",1); - Assert.assertNotNull(workitem); - - - FileData fileData=workitem.getFileData("test"); - - Assert.assertNotNull(fileData); - Assert.assertEquals(1024, fileData.getContent().length); + ItemCollection workitem = WorkitemFactory.createWorkitem(); + + WorkitemFactory.addFile(workitem, "test", 1); + assertNotNull(workitem); + + FileData fileData = workitem.getFileData("test"); + + assertNotNull(fileData); + assertEquals(1024, fileData.getContent().length); } - - - + } diff --git a/pom.xml b/pom.xml index ca967a20..b21557c6 100644 --- a/pom.xml +++ b/pom.xml @@ -87,13 +87,13 @@ 10.0.0 6.1.0-SNAPSHOT 2.1.0-SNAPSHOT - 6.1.0-SNAPSHOT 2.0.21 6.0 4.0 5.9.2 5.8.0 + 6.1.0-SNAPSHOT @@ -119,6 +119,13 @@ 11 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + org.apache.maven.plugins