Merge pull request #265 from bonitasoft/fix/BS-14264-lefacyFormPreviewKoDueToIterator

BS-14264: handle the case of not defined Iterator Expression in order to

bundles/plugins/org.bonitasoft.studio.engine/src-test/java/org/bonitasoft/studio/engine/export/builder/EngineFlowElementBuilderTest.java

@@ -22,6 +22,7 @@ import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -213,6 +214,22 @@ public class EngineFlowElementBuilderTest {
         assertThat(argument.getValue().getExpressionType()).isEqualTo(ExpressionType.TYPE_BUSINESS_DATA_REFERENCE.name());
     }
 
+    @Test
+    public void testAddIteratorToContext_robustnessWithNullValue() {
+        final Data collectionDataToMultiInstantiate = BusinessObjectDataBuilder.aBusinessData().withName("bData").withClassname("classname").build();
+
+        final TaskBuilder taskB = TaskBuilder.aTask().havingCollectionDataToMultiInstantiate(collectionDataToMultiInstantiate)
+                .havingData(collectionDataToMultiInstantiate);
+
+        final Pool pool = PoolBuilder.aPool().havingElements(taskB).build();
+        final MainProcess mainProcess = MainProcessBuilder.aMainProcess().build();
+        mainProcess.getElements().add(pool);
+        mainProcess.getDatatypes().add(BusinessObjectDataTypeBuilder.aBusinessObjectDataType().withName("classname").build());
+        flowElementSwitch.addContext(taskBuilder, (Task) pool.getElements().get(0));
+
+        verify(taskBuilder, times(0)).addContextEntry(anyString(), any(Expression.class));
+    }
+
     @Test
     public void testAddInputMappingAssignedToData() {
         final Pool pool = PoolBuilder.aPool()

bundles/plugins/org.bonitasoft.studio.engine/src/org/bonitasoft/studio/engine/export/builder/AbstractProcessBuilder.java

@@ -272,17 +272,17 @@ public abstract class AbstractProcessBuilder extends ProcessSwitch<Element> {
     protected void addContext(final Object contextBuilder, final Task task) {
         final Pool pool = ModelHelper.getParentPool(task);
         addContext(contextBuilder, pool);
-        final org.bonitasoft.studio.model.expression.Expression iteratorExpression = task.getIteratorExpression();
-        addIteratorToContext(contextBuilder, task, iteratorExpression);
+        addIteratorToContext(contextBuilder, task);
     }
 
     /**
      * @param contextBuilder
      * @param task
-     * @param iteratorExpression
      */
-    protected void addIteratorToContext(final Object contextBuilder, final Task task, final org.bonitasoft.studio.model.expression.Expression iteratorExpression) {
-        if (ExpressionConstants.MULTIINSTANCE_ITERATOR_TYPE.equals(iteratorExpression.getType())
+    protected void addIteratorToContext(final Object contextBuilder, final Task task) {
+        final org.bonitasoft.studio.model.expression.Expression iteratorExpression = task.getIteratorExpression();
+        if (iteratorExpression != null &&
+                ExpressionConstants.MULTIINSTANCE_ITERATOR_TYPE.equals(iteratorExpression.getType())
                 && iteratorExpression.getName() != null
                 && !iteratorExpression.getName().isEmpty()
                 && task instanceof DataAware) {