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>

1 files changed, 14 insertions, 21 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;

     }