diff options
| author |   YuanHu <yuan.hu1@zte.com.cn> | 2018-03-15 16:17:00 +0800 |
|---|---|---|
| committer | YuanHu <yuan.hu1@zte.com.cn> | 2018-03-16 09:07:21 +0800 |
| commit | 0246959aeb2bd4cb04e00649a0378a846116fbf9 (patch) | |
| tree | 9d5a26ff5e3203a81b72f231197ee0d63f41c87a /sdc-workflow-designer-server/src/test | |
| parent | 9d5b872a75cdfcad2a97a702e56a46730a653734 (diff) | |
Generate bpmn for extend activities
Modify BPMN Convertor to support conversion of extend activities.
Change copyright year from 2017 to 2017-2018
Issue-ID: SDC-679
Change-Id: I835fee3901302d53a948e50d2c2a03736f524e4b
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
Diffstat (limited to 'sdc-workflow-designer-server/src/test')
3 files changed, 52 insertions, 48 deletions
diff --git a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParserTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParserTest.java index 1f56efbf..318301d2 100644 --- a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParserTest.java +++ b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParserTest.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2017 ZTE Corporation.
+ * Copyright (c) 2017-2018 ZTE Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the Apache License, Version 2.0
* and the Eclipse Public License v1.0 which both accompany this distribution,
@@ -23,10 +23,10 @@ import java.util.List; import org.junit.Test;
import org.onap.sdc.workflowdesigner.model.Element;
-import org.onap.sdc.workflowdesigner.model.EndEvent;
+import org.onap.sdc.workflowdesigner.model.Position;
import org.onap.sdc.workflowdesigner.model.Process;
+import org.onap.sdc.workflowdesigner.model.ScriptTask;
import org.onap.sdc.workflowdesigner.model.SequenceFlow;
-import org.onap.sdc.workflowdesigner.model.StartEvent;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
@@ -112,24 +112,17 @@ public class Bpmn4ToscaJsonParserTest { private static Process createReferenceProcess() {
Process process = new Process(PROCESS_NAME);
-
- StartEvent startEvent = new StartEvent();
- startEvent.setDocumentation("");
- startEvent.setId("node0");
- startEvent.setName("startEvent");
- process.getElementList().add(startEvent);
-
- EndEvent endEvent = new EndEvent();
- endEvent.setDocumentation("");
- endEvent.setId("node1");
- endEvent.setName("endEvent");
- process.getElementList().add(endEvent);
-
- SequenceFlow flow2 = new SequenceFlow();
- flow2.setId("node0node1");
- flow2.setSourceRef("node0");
- flow2.setTargetRef("node1");
- process.getSequenceFlowList().add(flow2);
+
+ ScriptTask scriptTask = new ScriptTask();
+ scriptTask.setId("scriptTask");
+ scriptTask.setName("Script Task");
+ Position position = new Position();
+ position.setLeft(328);
+ position.setTop(134);
+ scriptTask.setPosition(position);
+ scriptTask.setScript("");
+ scriptTask.setScriptFormat("JavaScript");
+ process.getElementList().add(scriptTask);
return process;
}
diff --git a/sdc-workflow-designer-server/src/test/resources/workflow/template-test.bpmn20.xml b/sdc-workflow-designer-server/src/test/resources/workflow/template-test.bpmn20.xml index 589ab715..5c022a2e 100644 --- a/sdc-workflow-designer-server/src/test/resources/workflow/template-test.bpmn20.xml +++ b/sdc-workflow-designer-server/src/test/resources/workflow/template-test.bpmn20.xml @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
- xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
- typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"
- targetNamespace="http://www.activiti.org/test">
- <process id="templateTest" isExecutable="true">
- <!-- dataObjects -->
-
- <!-- Perform bpmn elements -->
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn"
+ xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
+ xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema"
+ expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
+ <process id="templateTest" isExecutable="true">
+ <!-- dataObjects -->
+
+ <!-- Perform bpmn elements -->
+
<!-- Perform bpmn sequence flow -->
- </process>
-</definitions>
+ </process>
+</definitions>
diff --git a/sdc-workflow-designer-server/src/test/resources/workflow/workflow.json b/sdc-workflow-designer-server/src/test/resources/workflow/workflow.json index 2042810f..1fa3d10e 100644 --- a/sdc-workflow-designer-server/src/test/resources/workflow/workflow.json +++ b/sdc-workflow-designer-server/src/test/resources/workflow/workflow.json @@ -1,16 +1,28 @@ -{"nodes":[
- {
- "sequenceFlows":[
- {"condition":"","sourceRef":"node0","targetRef":"node1"}
- ],
- "parameters":[],"id":"node0","name":"startEvent","type":"startEvent","parentId":"root",
- "position":{"width":30,"height":30,"left":468,"top":55}
- },
- {
- "sequenceFlows":[],
- "input":[],"output":[],"template":{},"id":"node1","name":"endEvent",
- "type":"endEvent","parentId":"root",
- "position":{"width":252.08334350585938,"height":46.66666793823242,"left":432,"top":167}
- }],
-"configs":{"restConfigs":[]}
+{
+ "id":"id12345",
+ "name":"test",
+ "scene":"abcd",
+ "data":{
+ "nodes":[
+ {
+ "id":"scriptTask",
+ "type":"scriptTask",
+ "typeId":"apds_script",
+ "icon":"apds_script",
+ "name":"Script Task",
+ "parentId":"root",
+ "position":{
+ "left":328,
+ "top":134,
+ "width":56,
+ "height":56
+ },
+ "connection":[
+
+ ],
+ "scriptFormat":"JavaScript",
+ "script":""
+ }
+ ]
+ }
}
\ No newline at end of file |