diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenter.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenter.java index d59283652f5..29e0ae57986 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenter.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenter.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import com.google.gwt.dom.client.LIElement; -import com.google.gwt.dom.client.Style; import com.google.gwt.dom.client.UListElement; import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONObject; @@ -73,8 +72,6 @@ public class CollectionPresenter implements CollectionView.Presenter { protected CollectionView collectionView; - protected LIElement objectSeparatorLI; - @Override public void initListStructure(String key, Map simplePropertiesMap, Map> expandablePropertiesMap, CollectionView collectionView) { commonInit(key, collectionView); @@ -101,10 +98,22 @@ public void setValue(String jsonString) { return; } JSONValue jsonValue = getJSONValue(jsonString); + if (jsonValue instanceof JSONString) { + populateExpression(jsonValue); + } else { + populateCreateCollection(jsonValue); + } + } + + /** + * It populates the guided "Create Collection" editor + * @param value + */ + protected void populateCreateCollection(JSONValue value) { if (collectionView.isListWidget()) { - populateList(jsonValue); + populateList(value); } else { - populateMap(jsonValue); + populateMap(value); } } @@ -160,10 +169,10 @@ public void addMapItem(Map keyPropertiesValues, Map> simpleItemsProperties = listElementPresenter.getSimpleItemsProperties(); Map>> nestedItemsProperties = listElementPresenter.getExpandableItemsProperties(); @@ -317,8 +344,7 @@ protected Map> getExpandablePropertiesValues(JSONObj jsonObject.keySet().forEach(propertyName -> { final JSONValue jsonValue = jsonObject.get(propertyName); if (jsonValue.isObject() != null) { - final Map simplePropertiesMap = getSimplePropertiesMap(jsonValue.isObject()); - toReturn.put(propertyName, simplePropertiesMap); + toReturn.put(propertyName, getSimplePropertiesMap(jsonValue.isObject())); } }); return toReturn; @@ -327,7 +353,7 @@ protected Map> getExpandablePropertiesValues(JSONObj /** * @return */ - protected String getMapValue() throws IllegalStateException { + protected String getMapValue() { Map, Map> itemsProperties = mapElementPresenter.getItemsProperties(); JSONObject toReturnModel = new JSONObject(); itemsProperties.forEach((keyPropertiesValues, valuePropertiesMap) -> { diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionView.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionView.java index 4db69ae2253..402889562df 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionView.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionView.java @@ -19,10 +19,10 @@ import com.google.gwt.dom.client.ButtonElement; import com.google.gwt.dom.client.HeadingElement; -import com.google.gwt.dom.client.LIElement; import com.google.gwt.dom.client.SpanElement; import com.google.gwt.dom.client.Style; import com.google.gwt.dom.client.UListElement; +import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; /** * Interface defining the contract for actual implementations @@ -130,10 +130,9 @@ interface Presenter { String getValue(); /** - * @param listWidget set to true if the current instance will manage a List, - * false for a Map. + * Returns true if the current instance is managing an user defined expression. */ - void setListWidget(boolean listWidget); + boolean isExpressionWidget(); /** * Returns true if the current instance will manage a List, @@ -144,8 +143,6 @@ interface Presenter { UListElement getElementsContainer(); - LIElement getObjectSeparator(); - HeadingElement getEditorTitle(); SpanElement getPropertyTitle(); @@ -158,6 +155,10 @@ interface Presenter { ButtonElement getSaveButton(); + String getExpression(); + + void setExpression(String expressionValue); + void toggleRowExpansion(); /** @@ -183,10 +184,11 @@ interface Presenter { * Set the name of the property and the Map to be used to create the skeleton of the current CollectionViewImpl editor * showing a List of elements * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books) - * @param instancePropertyMap + * @param simplePropertiesMap * @param expandablePropertiesMap + * @param type */ - void initListStructure(String key, Map instancePropertyMap, Map> expandablePropertiesMap); + void initListStructure(String key, Map simplePropertiesMap, Map> expandablePropertiesMap, ScenarioSimulationModel.Type type); /** * Set the name of the property and the Maps to be used to create the skeleton of the current CollectionViewImpl editor @@ -194,8 +196,9 @@ interface Presenter { * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books) * @param keyPropertyMap * @param valuePropertyMap + * @param type */ - void initMapStructure(String key, Map keyPropertyMap, Map valuePropertyMap); + void initMapStructure(String key, Map keyPropertyMap, Map valuePropertyMap, ScenarioSimulationModel.Type type); void setFixedHeight(double value, Style.Unit px); diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.html b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.html index 525ff888040..0903de6ba37 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.html +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.html @@ -9,32 +9,58 @@

+
+
+ +
+ +
+
+ +
+
+
+ + +
-
-
    -
  • - - visitedcities -
    • -
+
+
    +
  • + + +
    • +
+
+
+ +
-
+
- - - - + + +
diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.java index 3c42bb06bb2..c9bc351e5bf 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImpl.java @@ -23,24 +23,33 @@ import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.HeadingElement; -import com.google.gwt.dom.client.LIElement; +import com.google.gwt.dom.client.InputElement; +import com.google.gwt.dom.client.LabelElement; import com.google.gwt.dom.client.SpanElement; import com.google.gwt.dom.client.Style; +import com.google.gwt.dom.client.TextAreaElement; import com.google.gwt.dom.client.UListElement; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.DomEvent; import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.FocusWidget; +import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; import org.drools.workbench.screens.scenariosimulation.client.events.CloseCompositeEvent; import org.drools.workbench.screens.scenariosimulation.client.events.SaveEditorEvent; import org.drools.workbench.screens.scenariosimulation.client.handlers.CloseCompositeEventHandler; import org.drools.workbench.screens.scenariosimulation.client.handlers.HasCloseCompositeHandler; import org.drools.workbench.screens.scenariosimulation.client.handlers.HasSaveEditorHandler; import org.drools.workbench.screens.scenariosimulation.client.handlers.SaveEditorEventHandler; +import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants; +import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder; +import org.drools.workbench.screens.scenariosimulation.client.utils.ExpressionUtils; import org.jboss.errai.ui.shared.api.annotations.DataField; import org.jboss.errai.ui.shared.api.annotations.EventHandler; import org.jboss.errai.ui.shared.api.annotations.Templated; +import static org.drools.scenariosimulation.api.model.ScenarioSimulationModel.Type.RULE; + /** * This class is used as Collection editor *

@@ -74,22 +83,28 @@ public class CollectionViewImpl extends FocusWidget implements HasCloseComposite protected UListElement elementsContainer = Document.get().createULElement(); @DataField("closeCollectionEditorButton") - protected ButtonElement closeCollectionEditorButton = Document.get().createButtonElement(); + protected ButtonElement closeCollectionEditorButton = Document.get().createPushButtonElement(); + + @DataField("addItemButtonContainer") + protected DivElement addItemButtonContainer = Document.get().createDivElement(); - @DataField("objectSeparator") - protected LIElement objectSeparator = Document.get().createLIElement(); + @DataField("createCollectionRadio") + protected InputElement createCollectionRadio = Document.get().createRadioInputElement("collectionRadio"); + + @DataField("defineCollectionRadio") + protected InputElement defineCollectionRadio = Document.get().createRadioInputElement("collectionRadio"); @DataField("cancelButton") - protected ButtonElement cancelButton = Document.get().createButtonElement(); + protected ButtonElement cancelButton = Document.get().createPushButtonElement(); @DataField("removeButton") - protected ButtonElement removeButton = Document.get().createButtonElement(); + protected ButtonElement removeButton = Document.get().createPushButtonElement(); @DataField("saveButton") - protected ButtonElement saveButton = Document.get().createButtonElement(); + protected ButtonElement saveButton = Document.get().createPushButtonElement(); @DataField("addItemButton") - protected ButtonElement addItemButton = Document.get().createButtonElement(); + protected ButtonElement addItemButton = Document.get().createPushButtonElement(); @DataField("editorTitle") protected HeadingElement editorTitle = Document.get().createHElement(4); @@ -100,11 +115,46 @@ public class CollectionViewImpl extends FocusWidget implements HasCloseComposite @DataField("propertyTitle") protected SpanElement propertyTitle = Document.get().createSpanElement(); + @DataField("defineCollectionContainer") + protected DivElement defineCollectionContainer = Document.get().createDivElement(); + + @DataField("createCollectionContainer") + protected DivElement createCollectionContainer = Document.get().createDivElement(); + + @DataField("addItemButtonLabel") + protected SpanElement addItemButtonLabel = Document.get().createSpanElement(); + + @DataField("createLabel") + protected LabelElement createLabel = Document.get().createLabelElement(); + + @DataField("collectionCreationModeLabel") + protected LabelElement collectionCreationModeLabel = Document.get().createLabelElement(); + + @DataField("collectionCreationCreateLabel") + protected SpanElement collectionCreationCreateLabel = Document.get().createSpanElement(); + + @DataField("collectionCreationCreateSpan") + protected SpanElement collectionCreationCreateSpan = Document.get().createSpanElement(); + + @DataField("collectionCreationDefineLabel") + protected SpanElement collectionCreationDefineLabel = Document.get().createSpanElement(); + + @DataField("collectionCreationDefineSpan") + protected SpanElement collectionCreationDefineSpan = Document.get().createSpanElement(); + + @DataField("expressionElement") + protected TextAreaElement expressionElement = Document.get().createTextAreaElement(); + /** * Flag to indicate if this CollectionEditorViewImpl will manage a List or a Map. */ protected boolean listWidget; + /** + * Flag to indicate if this CollectionEditorViewImpl is opened in DMN or RULE scenario + */ + protected ScenarioSimulationModel.Type scenarioType; + /** * The json representation of the values of this editor */ @@ -112,33 +162,29 @@ public class CollectionViewImpl extends FocusWidget implements HasCloseComposite protected double left; - protected Style.Unit leftUnit; - - - public CollectionViewImpl() { setElement(collectionEditor); addKeyDownHandler(DomEvent::stopPropagation); } - /** - * @param listWidget set to true if the current instance will manage a List, - * false for a Map. - */ - @Override - public void setListWidget(boolean listWidget) { - this.listWidget = listWidget; - } - /** * Set the name of the property and the Map to be used to create the skeleton of the current CollectionViewImpl editor * showing a List of elements * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books) * @param simplePropertiesMap * @param expandablePropertiesMap + * @param type */ @Override - public void initListStructure(String key, Map simplePropertiesMap, Map> expandablePropertiesMap) { + public void initListStructure(String key, Map simplePropertiesMap, Map> expandablePropertiesMap, ScenarioSimulationModel.Type type) { + listWidget = true; + commonInit(type); + createLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList()); + collectionCreationModeLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionListCreation()); + collectionCreationCreateLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList()); + collectionCreationCreateSpan.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelListDescription()); + collectionCreationDefineLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelList()); + collectionCreationDefineSpan.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelListDescription()); presenter.initListStructure(key, simplePropertiesMap, expandablePropertiesMap, this); } @@ -148,12 +194,46 @@ public void initListStructure(String key, Map simplePropertiesMa * @param key The key representing the property, i.e Classname#propertyname (e.g Author#books) * @param keyPropertyMap * @param valuePropertyMap + * @param type + * */ @Override - public void initMapStructure(String key, Map keyPropertyMap, Map valuePropertyMap) { + public void initMapStructure(String key, Map keyPropertyMap, Map valuePropertyMap, ScenarioSimulationModel.Type type) { + listWidget = false; + commonInit(type); + createLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap()); + collectionCreationModeLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionMapCreation()); + collectionCreationCreateLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap()); + collectionCreationCreateSpan.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMapDescription()); + collectionCreationDefineLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelMap()); + collectionCreationDefineSpan.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelMapDescription()); presenter.initMapStructure(key, keyPropertyMap, valuePropertyMap, this); } + protected void commonInit(ScenarioSimulationModel.Type type) { + scenarioType = type ; + saveButton.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.saveButton()); + cancelButton.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton()); + removeButton.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.removeButton()); + addItemButtonLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionEditorAddNewItem()); + enableCreateCollectionContainer(true); + if (RULE.equals(scenarioType)) { + initAndRegisterHandlerForExpressionTextArea(); + } + } + + /** + * It inits and registers the native "input" , which is not managed by GWT + */ + protected void initAndRegisterHandlerForExpressionTextArea() { + ensureExpressionSyntax(); + DOM.sinkBitlessEvent(expressionElement, ConstantHolder.INPUT); + DOM.setEventListener(expressionElement, event -> { + if (ConstantHolder.INPUT.contains(event.getType())) { + ensureExpressionSyntax();} + }); + } + @Override public HandlerRegistration addCloseCompositeEventHandler(CloseCompositeEventHandler handler) { return addDomHandler(handler, CloseCompositeEvent.getType()); @@ -174,6 +254,11 @@ public void setValue(String jsonString) { presenter.setValue(jsonString); } + @Override + public boolean isExpressionWidget() { + return defineCollectionRadio.isChecked(); + } + @Override public boolean isListWidget() { return listWidget; @@ -184,11 +269,6 @@ public UListElement getElementsContainer() { return elementsContainer; } - @Override - public LIElement getObjectSeparator() { - return objectSeparator; - } - @Override public HeadingElement getEditorTitle() { return editorTitle; @@ -219,6 +299,42 @@ public ButtonElement getSaveButton() { return saveButton; } + @Override + public String getExpression() { + return expressionElement.getValue(); + } + + @Override + public void setExpression(String expressionValue) { + enableCreateCollectionContainer(false); + expressionElement.setValue(expressionValue); + } + + @EventHandler("createCollectionRadio") + public void onCreateCollectionClick(ClickEvent clickEvent) { + enableCreateCollectionContainer(true); + clickEvent.stopPropagation(); + } + + @EventHandler("defineCollectionRadio") + public void onDefineCollectionClick(ClickEvent clickEvent) { + enableCreateCollectionContainer(false); + clickEvent.stopPropagation(); + } + + protected void enableCreateCollectionContainer(boolean toEnable) { + showCreateCollectionContainer(toEnable); + showDefineCollectionContainer(!toEnable); + showAddItemButtonContainer(toEnable); + createCollectionRadio.setChecked(toEnable); + defineCollectionRadio.setChecked(!toEnable); + if (listWidget) { + createLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList()); + } else { + createLabel.setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap()); + } + } + @EventHandler("collectionEditor") public void onCollectionEditorClick(ClickEvent clickEvent) { clickEvent.stopPropagation(); @@ -280,8 +396,8 @@ public void onPropertyTitleClick(ClickEvent clickEvent) { clickEvent.stopPropagation(); } - @EventHandler("objectSeparator") - public void onObjectSeparatorClick(ClickEvent clickEvent) { + @EventHandler("addItemButtonContainer") + public void onAddItemButtonContainerClick(ClickEvent clickEvent) { clickEvent.stopPropagation(); } @@ -318,4 +434,34 @@ protected boolean isShown() { protected void toggleRowExpansion(boolean toExpand) { CollectionEditorUtils.toggleRowExpansion(faAngleRight, toExpand); } + + protected void ensureExpressionSyntax() { + if (RULE.equals(scenarioType)) { + expressionElement.setValue(ExpressionUtils.ensureExpressionSyntax(expressionElement.getValue())); + } + } + + protected void showCreateCollectionContainer(boolean show) { + if (show) { + createCollectionContainer.getStyle().setDisplay(Style.Display.BLOCK); + } else { + createCollectionContainer.getStyle().setDisplay(Style.Display.NONE); + } + } + + protected void showDefineCollectionContainer(boolean show) { + if (show) { + defineCollectionContainer.getStyle().setDisplay(Style.Display.BLOCK); + } else { + defineCollectionContainer.getStyle().setDisplay(Style.Display.NONE); + } + } + + protected void showAddItemButtonContainer(boolean show) { + if (show) { + addItemButtonContainer.getStyle().setDisplay(Style.Display.BLOCK); + } else { + addItemButtonContainer.getStyle().setDisplay(Style.Display.NONE); + } + } } diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactory.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactory.java index dad2bd7594e..29d2ab52714 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactory.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactory.java @@ -24,6 +24,7 @@ import org.drools.scenariosimulation.api.model.AbstractScesimData; import org.drools.scenariosimulation.api.model.AbstractScesimModel; import org.drools.scenariosimulation.api.model.FactMapping; +import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils; import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionViewImpl; import org.drools.workbench.screens.scenariosimulation.client.commands.ScenarioSimulationContext; @@ -102,14 +103,13 @@ protected void setCollectionEditorStructureData(CollectionViewImpl collectionEdi } String key = className + "#" + propertyName; String genericTypeName0 = genericTypes.get(0); - boolean isRule = RULE.equals(scenarioSimulationContext.getSettings().getType()); - if (isRule && !isSimpleJavaType(genericTypeName0)) { + if (RULE.equals(scenarioSimulationContext.getSettings().getType()) && !isSimpleJavaType(genericTypeName0)) { genericTypeName0 = getRuleComplexType(genericTypeName0); } if (ScenarioSimulationSharedUtils.isList(propertyClass)) { - manageList(collectionEditorView, key, genericTypeName0); + manageList(collectionEditorView, key, genericTypeName0, scenarioSimulationContext.getSettings().getType()); } else { - manageMap(collectionEditorView, key, genericTypeName0, genericTypes.get(1), isRule); + manageMap(collectionEditorView, key, genericTypeName0, genericTypes.get(1), scenarioSimulationContext.getSettings().getType()); } } @@ -117,17 +117,15 @@ protected String getRuleComplexType(String genericTypeName0) { return genericTypeName0.substring(genericTypeName0.lastIndexOf('.') + 1); } - protected void manageList(CollectionViewImpl collectionEditorView, String key, String genericTypeName0) { - collectionEditorView.setListWidget(true); - collectionEditorView.initListStructure(key, getSimplePropertiesMap(genericTypeName0), getExpandablePropertiesMap(genericTypeName0)); + protected void manageList(CollectionViewImpl collectionEditorView, String key, String genericTypeName0, ScenarioSimulationModel.Type type) { + collectionEditorView.initListStructure(key, getSimplePropertiesMap(genericTypeName0), getExpandablePropertiesMap(genericTypeName0), type); } - protected void manageMap(CollectionViewImpl collectionEditorView, String key, String genericTypeName0, String genericTypeName1, boolean isRule) { - if (isRule && !isSimpleJavaType(genericTypeName1)) { + protected void manageMap(CollectionViewImpl collectionEditorView, String key, String genericTypeName0, String genericTypeName1, ScenarioSimulationModel.Type type) { + if (RULE.equals(type) && !isSimpleJavaType(genericTypeName1)) { genericTypeName1 = getRuleComplexType(genericTypeName1); } - collectionEditorView.setListWidget(false); - collectionEditorView.initMapStructure(key, getSimplePropertiesMap(genericTypeName0), getSimplePropertiesMap(genericTypeName1)); + collectionEditorView.initMapStructure(key, getSimplePropertiesMap(genericTypeName0), getSimplePropertiesMap(genericTypeName1), type); } @Override diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioExpressionCellTextAreaSingletonDOMElementFactory.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioExpressionCellTextAreaSingletonDOMElementFactory.java index f4271d1cbc3..6a6609e0325 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioExpressionCellTextAreaSingletonDOMElementFactory.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/factories/ScenarioExpressionCellTextAreaSingletonDOMElementFactory.java @@ -20,6 +20,8 @@ import com.google.gwt.user.client.DOM; import org.drools.workbench.screens.scenariosimulation.client.domelements.ScenarioCellTextAreaDOMElement; import org.drools.workbench.screens.scenariosimulation.client.events.ScenarioInputEvent; +import org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder; +import org.drools.workbench.screens.scenariosimulation.client.utils.ExpressionUtils; import org.gwtbootstrap3.client.ui.TextArea; import org.uberfire.ext.wires.core.grids.client.widget.dom.impl.BaseDOMElement; import org.uberfire.ext.wires.core.grids.client.widget.grid.GridWidget; @@ -27,7 +29,6 @@ import org.uberfire.ext.wires.core.grids.client.widget.layer.impl.GridLienzoPanel; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.MVEL_ESCAPE_SYMBOL; -import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.EXPRESSION_VALUE_PREFIX; public class ScenarioExpressionCellTextAreaSingletonDOMElementFactory extends AbstractTextBoxSingletonDOMElementFactory> { @@ -47,7 +48,7 @@ protected BaseDOMElement createDomElementInternal(final TextAr @Override public TextArea createWidget() { TextArea textArea = super.createWidget(); - DOM.sinkBitlessEvent(textArea.getElement(), "input"); + DOM.sinkBitlessEvent(textArea.getElement(), ConstantHolder.INPUT); textArea.addHandler(scenarioInputEvent -> checkExpressionSyntax(), ScenarioInputEvent.getType()); textArea.addFocusHandler(focusEvent -> checkExpressionSyntax()); textArea.addBlurHandler(blurEvent -> checkEmptyExpression()); @@ -56,16 +57,7 @@ public TextArea createWidget() { } protected void checkExpressionSyntax() { - final String value = getValue(); - if (!value.startsWith(EXPRESSION_VALUE_PREFIX)) { - if (value.startsWith(MVEL_ESCAPE_SYMBOL)) { - widget.setValue(value.replaceFirst(MVEL_ESCAPE_SYMBOL, EXPRESSION_VALUE_PREFIX)); - } else if (value.startsWith(" ")) { - widget.setValue(value.replaceFirst(" ", EXPRESSION_VALUE_PREFIX)); - } else { - widget.setValue(EXPRESSION_VALUE_PREFIX + value); - } - } + widget.setValue(ExpressionUtils.ensureExpressionSyntax(getValue())); } protected void checkEmptyExpression(KeyDownEvent event) { diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModel.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModel.java index 74d079f2da3..2b137e9727f 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModel.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/models/AbstractScesimGridModel.java @@ -405,21 +405,7 @@ public Range deleteCell(int rowIndex, int columnIndex) { * @param columnIndex * @return */ - public abstract Range getInstanceLimits(int columnIndex);/* { - final ScenarioGridColumn column = (ScenarioGridColumn) columns.get(columnIndex); - final String originalColumnGroup = column.getInformationHeaderMetaData().getColumnGroup(); - final ScenarioHeaderMetaData selectedInformationHeaderMetaData = column.getInformationHeaderMetaData(); - String originalColumnTitle = selectedInformationHeaderMetaData.getTitle(); - int leftPosition = columnIndex; - while (leftPosition > 1 && ((ScenarioGridColumn) columns.get(leftPosition - 1)).getInformationHeaderMetaData().getColumnGroup().equals(originalColumnGroup) && ((ScenarioGridColumn) columns.get(leftPosition - 1)).getInformationHeaderMetaData().getTitle().equals(originalColumnTitle)) { - leftPosition--; - } - int rightPosition = columnIndex; - while (rightPosition < columns.size() - 1 && ((ScenarioGridColumn) columns.get(rightPosition + 1)).getInformationHeaderMetaData().getColumnGroup().equals(originalColumnGroup) && ((ScenarioGridColumn) columns.get(rightPosition + 1)).getInformationHeaderMetaData().getTitle().equals(originalColumnTitle)) { - rightPosition++; - } - return new Range(leftPosition, rightPosition); - }*/ + public abstract Range getInstanceLimits(int columnIndex); /** * This methods returns the List<ScenarioGridColumn> of a single block of columns of the same instance/data object. diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRenderer.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRenderer.java index 23ea87dd962..1a608b9dfad 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRenderer.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRenderer.java @@ -22,6 +22,7 @@ import com.ait.lienzo.client.core.shape.Rectangle; import com.ait.lienzo.client.core.shape.Text; import com.google.gwt.json.client.JSONParser; +import com.google.gwt.json.client.JSONString; import com.google.gwt.json.client.JSONValue; import org.drools.workbench.screens.scenariosimulation.client.widgets.ScenarioGridCell; import org.uberfire.ext.wires.core.grids.client.model.GridCell; @@ -109,22 +110,26 @@ protected void applyBackgroundColor(ScenarioGridCell cell, } } - protected String getValueToShow(ScenarioGridCell scenarioGridCell){ + protected String getValueToShow(ScenarioGridCell scenarioGridCell) { String rawValue = scenarioGridCell.getValue() != null ? scenarioGridCell.getValue().getValue() : null; return (rawValue != null && (scenarioGridCell.isList() || scenarioGridCell.isMap())) ? getCollectionString(rawValue, scenarioGridCell.isList()) : rawValue; } protected String getCollectionString(String jsonString, boolean isList) { try { - int size = -1; - String toFormat = isList ? "List(%s)" : "Map(%s)"; JSONValue jsonValue = JSONParser.parseStrict(jsonString); - if (isList) { - size = jsonValue.isArray().size(); + if (jsonValue instanceof JSONString) { + return isList ? "List()" : "Map()"; } else { - size = jsonValue.isObject().keySet().size(); + String toFormat = isList ? "List(%s)" : "Map(%s)"; + int size = -1; + if (isList) { + size = jsonValue.isArray().size(); + } else { + size = jsonValue.isObject().keySet().size(); + } + return toFormat.replace("%s", String.valueOf(size)); } - return toFormat.replace("%s", String.valueOf(size)); } catch (Exception e) { return jsonString; } diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStylesCss.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStylesCss.java index 19006a1dfee..c80ecb64b9f 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStylesCss.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStylesCss.java @@ -114,4 +114,7 @@ public interface ScenarioSimulationEditorStylesCss extends CssResource { @ClassName("kie-coverage__dl-horizontal") String kieCoverageDlHorizontal(); + + @ClassName("collection-editor-expression_textarea") + String collectionEditorExpressionTextarea(); } diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.java index 735e8a31499..32178da5028 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.java @@ -363,4 +363,32 @@ public interface ScenarioSimulationEditorConstants String testToolClearSelection(); String commonCheatSheetBackground(String background, String model); + + String saveButton(); + + String removeButton(); + + String cancelButton(); + + String collectionEditorAddNewItem(); + + String createLabelList(); + + String createLabelMap(); + + String collectionListCreation(); + + String collectionMapCreation(); + + String createLabelListDescription(); + + String defineLabelList(); + + String defineLabelMap(); + + String defineLabelListDescription(); + + String createLabelMapDescription(); + + String defineLabelMapDescription(); } diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ConstantHolder.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ConstantHolder.java index 2e06465d8d0..3924fef57ae 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ConstantHolder.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ConstantHolder.java @@ -32,6 +32,7 @@ private ConstantHolder() { public static final String NODE_HIDDEN = "node-hidden"; public static final String DISABLED = "disabled"; public static final String SELECTED = "selected"; + public static final String INPUT = "input"; public static final String EXPRESSION = "expression"; public static final String EXPRESSION_INSTANCE_PLACEHOLDER = EXPRESSION + " "; diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtils.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtils.java new file mode 100644 index 00000000000..d38c5f90ca1 --- /dev/null +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtils.java @@ -0,0 +1,49 @@ +/* + * Copyright 2020 Red Hat, Inc. and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.drools.workbench.screens.scenariosimulation.client.utils; + +import static org.drools.scenariosimulation.api.utils.ConstantsHolder.MVEL_ESCAPE_SYMBOL; +import static org.drools.workbench.screens.scenariosimulation.client.utils.ConstantHolder.EXPRESSION_VALUE_PREFIX; + +/** + * This utils class holds all shared functions used by Expression handling, where expressions are + * used defined expression code put on GIVEN/EXPECTED data cells + */ +public class ExpressionUtils { + + private ExpressionUtils() { + // Not instantiable + } + + /** + * It ensures if the given string starts with EXPRESSION_VALUE_PREFIX. If TRUE, it simply returns + * the given string. Otherwise, it adds EXPRESSION_VALUE_PREFIX as prefix of the given string. + * @param expressionValue + * @return + */ + public static String ensureExpressionSyntax(String expressionValue) { + if (expressionValue != null && !expressionValue.startsWith(EXPRESSION_VALUE_PREFIX)) { + if (expressionValue.startsWith(MVEL_ESCAPE_SYMBOL)) { + return expressionValue.replaceFirst(MVEL_ESCAPE_SYMBOL, EXPRESSION_VALUE_PREFIX); + } + if (expressionValue.startsWith(" ")) { + return expressionValue.replaceFirst(" ", EXPRESSION_VALUE_PREFIX); + } + return EXPRESSION_VALUE_PREFIX + expressionValue; + } + return expressionValue; + } +} \ No newline at end of file diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridColumn.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridColumn.java index 7828b00d0c6..4c85da527db 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridColumn.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/java/org/drools/workbench/screens/scenariosimulation/client/widgets/ScenarioGridColumn.java @@ -173,6 +173,7 @@ public void setEditableHeaders(boolean editableHeaders) { this.editableHeaders = editableHeaders; } + @Override public void setPlaceHolder(String placeHolder) { this.placeHolder = placeHolder; } @@ -185,6 +186,7 @@ public ScenarioHeaderMetaData getPropertyHeaderMetaData() { return propertyHeaderMetaData; } + @Override public String getPlaceHolder() { return placeHolder; } diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css index 75003934cb8..b3703795ca3 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/css/ScenarioSimulationEditorStyles.css @@ -193,4 +193,10 @@ span.kie-list-view-pf-main-info__text { text-overflow: clip; white-space: normal; text-align: inherit; +} + +.collection-editor-expression_textarea { + height: 12em; + width: 100%; + font-size: 12px; } \ No newline at end of file diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.properties b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.properties index bbd512d7a27..50b40a33715 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.properties +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/main/resources/org/drools/workbench/screens/scenariosimulation/client/resources/i18n/ScenarioSimulationEditorConstants.properties @@ -192,3 +192,18 @@ backgroundTabTitle=Background backgroundErrorNotification=There are errors in Background data, please have a look ruleCheatSheet23=To specify a MVEL expression (or invoke a Java method) just put # at the beginning of the expression. In GIVEN section, return type of the expression has to be the same one of type of the column. In EXPECT section the type could also just a boolean with the result of the assertion and you can use actualValue identifier to access value to check. commonCheatSheetBackground=If the same GIVEN data is shared with the multiple test scenarios, you can use the {0} tab to define them only once. The way to create a column in the {0} tab is the same as of the {1} tab. + +saveButton=Save +removeButton=Remove +cancelButton=Cancel +collectionEditorAddNewItem=Add new item +createLabelList=Create List +createLabelMap=Create Map +defineLabelList=Define List +defineLabelMap=Define Map +collectionListCreation=Define the list values for this data object +collectionMapCreation=Define the map values for this data object +createLabelListDescription= - create a list using a guided form +defineLabelListDescription= - define a list using an expression +defineLabelMapDescription= - define a map using an expression +createLabelMapDescription= - create a map using a guided form \ No newline at end of file diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestProperties.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestProperties.java index 604ec380804..ff801b9bc13 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestProperties.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/TestProperties.java @@ -91,6 +91,7 @@ public class TestProperties { public static final Map TEST_VALUE_PROPERTYY_MAP = Collections.singletonMap("TEST-VALUE1", "TEST-VALUE2"); public static final String TEST_JSON = "TEST-JSON"; + public static final String TEST_JSON_STRING = "\"TEST-JSON\""; public static final String TEST_CLASSNAME = "TEST-CLASSNAME"; public static final String TEST_KEY = TEST_CLASSNAME + "#" + TEST_PROPERTYNAME; public static final int CHILD_COUNT = 3; @@ -179,6 +180,7 @@ public class TestProperties { public static final String PLACEHOLDER = "PLACEHOLDER"; public static final String LIST_VALUE = "[ \"Ford\", \"BMW\", \"Fiat\" ]"; public static final String MAP_VALUE = "{\"name\":\"myname\",\"age\":29}"; + public static final String EXPRESSION_VALUE = "\"[1, 2, 3]\""; public static final String SCENARIO_TYPE = "SCENARIO_TYPE"; public static final String FILE_NAME = "FILE_NAME"; diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenterTest.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenterTest.java index 9816650618d..d3de54a34c0 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenterTest.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionPresenterTest.java @@ -44,7 +44,7 @@ import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.ITEM_ID; import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.JSON_ARRAY_SIZE; import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.KEY_SET; -import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_JSON; +import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_JSON_STRING; import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_KEY; import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.TEST_PROPERTYNAME; import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.UPDATED_VALUE; @@ -66,8 +66,6 @@ @RunWith(GwtMockitoTestRunner.class) public class CollectionPresenterTest extends AbstractCollectionEditorTest { - - @Mock private ItemElementPresenter listElementPresenterMock; @@ -103,6 +101,9 @@ public class CollectionPresenterTest extends AbstractCollectionEditorTest { @Mock private Style styleMock; + @Mock + private JSONString jsonStringMock; + @Mock private JSONValue jsonValueMock; @@ -133,9 +134,6 @@ public class CollectionPresenterTest extends AbstractCollectionEditorTest { @Mock private JSONObject nestedValue2Mock; - @Mock - private LIElement objectSeparatorLIMock; - @Mock private HeadingElement editorTitleMock; @@ -160,7 +158,7 @@ public class CollectionPresenterTest extends AbstractCollectionEditorTest { @Mock private ConfirmPopupPresenter confirmPopupPresenterMock; - private CollectionPresenter collectionEditorPresenter; + private CollectionPresenter collectionEditorPresenterSpy; @Before public void setup() { @@ -169,12 +167,10 @@ public void setup() { when(collectionViewMock.getElementsContainer()).thenReturn(elementsContainerMock); when(collectionViewMock.getEditorTitle()).thenReturn(editorTitleMock); when(collectionViewMock.getPropertyTitle()).thenReturn(propertyTitleMock); - when(collectionViewMock.getObjectSeparator()).thenReturn(objectSeparatorLIMock); when(collectionViewMock.getAddItemButton()).thenReturn(addItemButtonMock); when(collectionViewMock.getCancelButton()).thenReturn(cancelButtonMock); when(collectionViewMock.getRemoveButton()).thenReturn(removeButtonMock); when(collectionViewMock.getSaveButton()).thenReturn(saveButtonMock); - when(objectSeparatorLIMock.getStyle()).thenReturn(styleMock); when(nestedValue1Mock.keySet()).thenReturn(KEY_SET); when(nestedValue1Mock.get(eq("prop1"))).thenReturn(jsonValueNeph1Mock); @@ -198,7 +194,8 @@ public void setup() { when(jsonArrayMock.get(anyInt())).thenReturn(jsonValueChildMock); when(jsonValueMock.isArray()).thenReturn(jsonArrayMock); when(jsonValueMock.isObject()).thenReturn(jsonObjectMock); - this.collectionEditorPresenter = spy(new CollectionPresenter() { + when(jsonValueMock.isString()).thenReturn(jsonStringMock); + this.collectionEditorPresenterSpy = spy(new CollectionPresenter() { { this.viewsProvider = viewsProviderMock; this.listElementPresenter = listElementPresenterMock; @@ -207,7 +204,6 @@ public void setup() { this.mapEditingBoxPresenter = mapEditingBoxPresenterMock; this.simplePropertiesMap = instancePropertiesMapLocal; this.collectionView = collectionViewMock; - this.objectSeparatorLI = objectSeparatorLIMock; this.scenarioConfirmationPopupPresenter = scenarioConfirmationPopupPresenterMock; this.confirmPopupPresenter = confirmPopupPresenterMock; } @@ -226,6 +222,11 @@ protected String getListValue() { protected String getMapValue() { return UPDATED_VALUE; } + + @Override + protected String getExpressionValue() { + return UPDATED_VALUE; + } }); instancePropertiesMapLocal.clear(); when(listElementPresenterMock.getItemContainer(anyString(), anyMap(), anyMap())).thenReturn(itemElementMock); @@ -236,40 +237,50 @@ protected String getMapValue() { @Test public void initListStructure() { - collectionEditorPresenter.initListStructure(TEST_KEY, propertyMapLocal, new HashMap<>(), collectionViewMock); - verify(collectionEditorPresenter, times(1)).commonInit(eq(TEST_KEY), eq(collectionViewMock)); + collectionEditorPresenterSpy.initListStructure(TEST_KEY, propertyMapLocal, new HashMap<>(), collectionViewMock); + verify(collectionEditorPresenterSpy, times(1)).commonInit(eq(TEST_KEY), eq(collectionViewMock)); assertTrue(instancePropertiesMapLocal.containsKey(TEST_KEY)); assertEquals(instancePropertiesMapLocal.get(TEST_KEY), propertyMapLocal); - verify(listEditingBoxPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenter)); - verify(listElementPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenter)); + verify(listEditingBoxPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenterSpy)); + verify(listElementPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenterSpy)); } @Test public void initMapStructure() { - collectionEditorPresenter.initMapStructure(TEST_KEY, keyPropertyMapLocal, propertyMapLocal, collectionViewMock); - verify(collectionEditorPresenter, times(1)).commonInit(eq(TEST_KEY), eq(collectionViewMock)); + collectionEditorPresenterSpy.initMapStructure(TEST_KEY, keyPropertyMapLocal, propertyMapLocal, collectionViewMock); + verify(collectionEditorPresenterSpy, times(1)).commonInit(eq(TEST_KEY), eq(collectionViewMock)); assertTrue(instancePropertiesMapLocal.containsKey(TEST_KEY + "#key")); assertEquals(instancePropertiesMapLocal.get(TEST_KEY + "#key"), keyPropertyMapLocal); assertTrue(instancePropertiesMapLocal.containsKey(TEST_KEY + "#value")); assertEquals(instancePropertiesMapLocal.get(TEST_KEY + "#value"), propertyMapLocal); - verify(mapEditingBoxPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenter)); - verify(mapElementPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenter)); + verify(mapEditingBoxPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenterSpy)); + verify(mapElementPresenterMock, times(1)).setCollectionEditorPresenter(eq(collectionEditorPresenterSpy)); } @Test public void setValueIsListWidgetTrue() { - commonSetValue(true); + commonSetValue(true, false); } @Test public void setValueIsListWidgetFalse() { - commonSetValue(false); + commonSetValue(false, false); + } + + @Test + public void setValueIsExpressionWidgetList() { + commonSetValue(true, true); + } + + @Test + public void setValueIsExpressionWidgetMap() { + commonSetValue(false, true); } @Test public void showEditingBoxIsListWidgetTrue() { when(collectionViewMock.isListWidget()).thenReturn(true); - collectionEditorPresenter.showEditingBox(); + collectionEditorPresenterSpy.showEditingBox(); verify(collectionViewMock, times(1)).getElementsContainer(); verify(listEditingBoxPresenterMock, times(1)).getEditingBox(eq(TEST_KEY), anyMap(), anyMap()); verify(elementsContainerMock, times(1)).appendChild(eq(listEditingBoxMock)); @@ -278,11 +289,11 @@ public void showEditingBoxIsListWidgetTrue() { @Test public void showEditingBoxIsListWidgetFalse() { when(collectionViewMock.isListWidget()).thenReturn(false); - collectionEditorPresenter.showEditingBox(); + collectionEditorPresenterSpy.showEditingBox(); verify(collectionViewMock, times(1)).getElementsContainer(); verify(mapEditingBoxPresenterMock, times(1)).getEditingBox(eq(TEST_KEY), anyMap(), anyMap()); verify(elementsContainerMock, times(1)).appendChild(eq(mapEditingBoxMock)); - verify(collectionEditorPresenter, times(1)).toggleEditingStatus(eq(true)); + verify(collectionEditorPresenterSpy, times(1)).toggleEditingStatus(eq(true)); verify(listElementPresenterMock, times(1)).toggleEditingStatus(eq(true)); verify(mapElementPresenterMock, times(1)).toggleEditingStatus(eq(true)); } @@ -301,34 +312,42 @@ public void onToggleRowExpansionIsShownFalse() { @Test public void addListItem() { - collectionEditorPresenter.addListItem(propertyMapLocal, new HashMap<>()); + collectionEditorPresenterSpy.addListItem(propertyMapLocal, new HashMap<>()); verify(collectionViewMock, times(1)).getElementsContainer(); verify(elementsContainerMock, times(1)).getChildCount(); verify(listElementPresenterMock, times(1)).getItemContainer(eq(ITEM_ID), eq(propertyMapLocal), anyMap()); verify(elementsContainerMock, times(1)).appendChild(eq(itemElementMock)); - verify(collectionEditorPresenter, times(1)).toggleEditingStatus(eq(false)); + verify(collectionEditorPresenterSpy, times(1)).toggleEditingStatus(eq(false)); } @Test public void addMapItem() { - collectionEditorPresenter.addMapItem(keyPropertyMapLocal, propertyMapLocal); + collectionEditorPresenterSpy.addMapItem(keyPropertyMapLocal, propertyMapLocal); verify(collectionViewMock, times(1)).getElementsContainer(); verify(elementsContainerMock, times(1)).getChildCount(); verify(mapElementPresenterMock, times(1)).getKeyValueContainer(eq(ITEM_ID), eq(keyPropertyMapLocal), eq(propertyMapLocal)); verify(elementsContainerMock, times(1)).appendChild(eq(itemElementMock)); - verify(collectionEditorPresenter, times(1)).toggleEditingStatus(eq(false)); + verify(collectionEditorPresenterSpy, times(1)).toggleEditingStatus(eq(false)); } @Test public void saveIsListWidgetTrue() { - commonSave(true, false); - commonSave(true, true); + commonSave(true, false,false); + commonSave(true, false,true); } @Test public void saveIsListWidgetFalse() { - commonSave(false, false); - commonSave(false, true); + commonSave(false, false,false); + commonSave(false, false,true); + } + + @Test + public void saveIsExpressionWidget() { + commonSave(false, true,false); + commonSave(false, true,true); + commonSave(true, true,false); + commonSave(true, true,true); } @Test @@ -353,35 +372,33 @@ public void okRemoveCommandMethodIsListWidgetFalse() { @Test public void commonInit() { - collectionEditorPresenter.collectionView = null; - collectionEditorPresenter.objectSeparatorLI = null; - collectionEditorPresenter.commonInit(TEST_KEY, collectionViewMock); - assertEquals(collectionEditorPresenter.collectionView, collectionViewMock); + collectionEditorPresenterSpy.collectionView = null; + collectionEditorPresenterSpy.commonInit(TEST_KEY, collectionViewMock); + assertEquals(collectionEditorPresenterSpy.collectionView, collectionViewMock); verify(editorTitleMock, times(1)).setInnerText(TEST_KEY); verify(propertyTitleMock, times(1)).setInnerText(TEST_PROPERTYNAME); - assertEquals(collectionEditorPresenter.objectSeparatorLI, objectSeparatorLIMock); } @Test public void populateList() { - collectionEditorPresenter.populateList(jsonValueMock); + collectionEditorPresenterSpy.populateList(jsonValueMock); for (int i = 0; i < JSON_ARRAY_SIZE; i++) { verify(jsonArrayMock, times(1)).get(eq(i)); } - verify(collectionEditorPresenter, times(JSON_ARRAY_SIZE * 3)).getSimplePropertiesMap(any()); // Multiply x 3 because getSimplePropertiesMap is called by getExpandablePropertiesValues - verify(collectionEditorPresenter, times(JSON_ARRAY_SIZE)).getExpandablePropertiesValues(any()); - verify(collectionEditorPresenter, times(JSON_ARRAY_SIZE)).addListItem(anyMap(), anyMap()); + verify(collectionEditorPresenterSpy, times(JSON_ARRAY_SIZE * 3)).getSimplePropertiesMap(any()); // Multiply x 3 because getSimplePropertiesMap is called by getExpandablePropertiesValues + verify(collectionEditorPresenterSpy, times(JSON_ARRAY_SIZE)).getExpandablePropertiesValues(any()); + verify(collectionEditorPresenterSpy, times(JSON_ARRAY_SIZE)).addListItem(anyMap(), anyMap()); } @Test public void populateMap() { - collectionEditorPresenter.populateMap(jsonValueMock); - verify(collectionEditorPresenter, times(JSON_ARRAY_SIZE)).addMapItem(anyMap(), anyMap()); + collectionEditorPresenterSpy.populateMap(jsonValueMock); + verify(collectionEditorPresenterSpy, times(JSON_ARRAY_SIZE)).addMapItem(anyMap(), anyMap()); } @Test public void toggleEditingStatusToDisableTrue() { - collectionEditorPresenter.toggleEditingStatus(true); + collectionEditorPresenterSpy.toggleEditingStatus(true); verify(collectionViewMock, times(1)).getAddItemButton(); verify(addItemButtonMock, times(1)).setDisabled(eq(true)); verify(cancelButtonMock, times(1)).setDisabled(eq(true)); @@ -393,7 +410,7 @@ public void toggleEditingStatusToDisableTrue() { @Test public void toggleEditingStatusToDisableFalse() { - collectionEditorPresenter.toggleEditingStatus(false); + collectionEditorPresenterSpy.toggleEditingStatus(false); verify(collectionViewMock, times(1)).getAddItemButton(); verify(addItemButtonMock, times(1)).setDisabled(eq(false)); verify(cancelButtonMock, times(1)).setDisabled(eq(false)); @@ -405,7 +422,7 @@ public void toggleEditingStatusToDisableFalse() { private void commonRemove(boolean isWidget) { when(collectionViewMock.isListWidget()).thenReturn(isWidget); - collectionEditorPresenter.remove(); + collectionEditorPresenterSpy.remove(); verify(scenarioConfirmationPopupPresenterMock, times(1)).show( eq(ScenarioSimulationEditorConstants.INSTANCE.removeCollectionMainTitle()), eq(ScenarioSimulationEditorConstants.INSTANCE.removeCollectionMainQuestion()), @@ -420,7 +437,7 @@ private void commonRemove(boolean isWidget) { private void commonOkRemoveCommandMethod(boolean isListWidget) { when(collectionViewMock.isListWidget()).thenReturn(isListWidget); - collectionEditorPresenter.okRemoveCommandMethod(); + collectionEditorPresenterSpy.okRemoveCommandMethod(); if (isListWidget) { verify(listElementPresenterMock, times(1)).remove(); verify(mapElementPresenterMock, never()).remove(); @@ -432,27 +449,36 @@ private void commonOkRemoveCommandMethod(boolean isListWidget) { verify(collectionViewMock, times(1)).close(); } - private void commonSetValue(boolean isListWidget) { - collectionEditorPresenter.setValue(null); - verify(collectionEditorPresenter, never()).getJSONValue(anyString()); - reset(collectionEditorPresenter); - collectionEditorPresenter.setValue(""); - verify(collectionEditorPresenter, never()).getJSONValue(anyString()); - reset(collectionEditorPresenter); + private void commonSetValue(boolean isListWidget, boolean isExpressionList) { + collectionEditorPresenterSpy.setValue(null); + verify(collectionEditorPresenterSpy, never()).getJSONValue(anyString()); + reset(collectionEditorPresenterSpy); + collectionEditorPresenterSpy.setValue(""); + verify(collectionEditorPresenterSpy, never()).getJSONValue(anyString()); + reset(collectionEditorPresenterSpy); when(collectionViewMock.isListWidget()).thenReturn(isListWidget); - collectionEditorPresenter.setValue(TEST_JSON); - if (isListWidget) { - verify(collectionEditorPresenter, times(1)).populateList(isA(JSONValue.class)); - verify(collectionEditorPresenter, never()).populateMap(isA(JSONValue.class)); + when(collectionViewMock.isExpressionWidget()).thenReturn(isExpressionList); + if (isExpressionList) { + when(collectionEditorPresenterSpy.getJSONValue(TEST_JSON_STRING)).thenReturn(new JSONString(TEST_JSON_STRING)); + } + collectionEditorPresenterSpy.setValue(TEST_JSON_STRING); + if (isExpressionList) { + verify(collectionEditorPresenterSpy, times(1)).populateExpression(isA(JSONValue.class)); + verify(collectionEditorPresenterSpy, never()).populateCreateCollection(any()); } else { - verify(collectionEditorPresenter, times(1)).populateMap(isA(JSONValue.class)); - verify(collectionEditorPresenter, never()).populateList(isA(JSONValue.class)); + if (isListWidget) { + verify(collectionEditorPresenterSpy, times(1)).populateCreateCollection(isA(JSONValue.class)); + verify(collectionEditorPresenterSpy, never()).populateExpression(any()); + } else { + verify(collectionEditorPresenterSpy, times(1)).populateCreateCollection(isA(JSONValue.class)); + verify(collectionEditorPresenterSpy, never()).populateExpression(any()); + } } } private void commonOnToggleRowExpansionIsShown(boolean isShown, boolean isListWidget) { when(collectionViewMock.isListWidget()).thenReturn(isListWidget); - collectionEditorPresenter.onToggleRowExpansion(isShown); + collectionEditorPresenterSpy.onToggleRowExpansion(isShown); verify(collectionViewMock, times(1)).toggleRowExpansion(); if (isListWidget) { verify(listElementPresenterMock, times(1)).onToggleRowExpansion(eq(isShown)); @@ -464,20 +490,32 @@ private void commonOnToggleRowExpansionIsShown(boolean isShown, boolean isListWi reset(mapElementPresenterMock); } - private void commonSave(boolean isListWidget, boolean throwException) { + private void commonSave(boolean isListWidget, boolean isExpressionWidget, boolean throwException) { when(collectionViewMock.isListWidget()).thenReturn(isListWidget); + when(collectionViewMock.isExpressionWidget()).thenReturn(isExpressionWidget); if (throwException) { - if (isListWidget) { - when(collectionEditorPresenter.getListValue()).thenThrow(IllegalStateException.class); + if(isExpressionWidget) { + when(collectionEditorPresenterSpy.getExpressionValue()).thenThrow(IllegalStateException.class); } else { - when(collectionEditorPresenter.getMapValue()).thenThrow(IllegalStateException.class); + if (isListWidget) { + when(collectionEditorPresenterSpy.getListValue()).thenThrow(IllegalStateException.class); + } else { + when(collectionEditorPresenterSpy.getMapValue()).thenThrow(IllegalStateException.class); + } } } - collectionEditorPresenter.save(); - if (isListWidget) { - verify(collectionEditorPresenter, times(1)).getListValue(); + collectionEditorPresenterSpy.save(); + if (isExpressionWidget) { + verify(collectionEditorPresenterSpy, times(1)).getExpressionValue(); + verify(collectionEditorPresenterSpy, never()).getValueFromCreateCollection(); } else { - verify(collectionEditorPresenter, times(1)).getMapValue(); + if (isListWidget) { + verify(collectionEditorPresenterSpy, times(1)).getValueFromCreateCollection(); + verify(collectionEditorPresenterSpy, never()).getExpressionValue(); + } else { + verify(collectionEditorPresenterSpy, times(1)).getValueFromCreateCollection(); + verify(collectionEditorPresenterSpy, never()).getExpressionValue(); + } } if (throwException) { verify(confirmPopupPresenterMock, times(1)).show(eq(ScenarioSimulationEditorConstants.INSTANCE.collectionError()), anyString()); @@ -488,6 +526,13 @@ private void commonSave(boolean isListWidget, boolean throwException) { } reset(confirmPopupPresenterMock); reset(collectionViewMock); - reset(collectionEditorPresenter); + reset(collectionEditorPresenterSpy); + } + + @Test + public void populateExpression() { + when(jsonStringMock.stringValue()).thenReturn("test-string"); + collectionEditorPresenterSpy.populateExpression(jsonValueMock); + verify(collectionViewMock, times(1)).setExpression("test-string"); } } diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImplTest.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImplTest.java index 29b017127f0..57d0ade113b 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImplTest.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/collectioneditor/CollectionViewImplTest.java @@ -15,19 +15,33 @@ */ package org.drools.workbench.screens.scenariosimulation.client.collectioneditor; +import java.util.Collections; + +import com.google.gwt.dom.client.ButtonElement; import com.google.gwt.dom.client.DivElement; +import com.google.gwt.dom.client.LabelElement; +import com.google.gwt.dom.client.SpanElement; import com.google.gwt.dom.client.Style; +import com.google.gwt.dom.client.TextAreaElement; import com.google.gwtmockito.GwtMockitoTestRunner; +import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; import org.drools.workbench.screens.scenariosimulation.client.events.CloseCompositeEvent; import org.drools.workbench.screens.scenariosimulation.client.events.SaveEditorEvent; +import org.drools.workbench.screens.scenariosimulation.client.resources.i18n.ScenarioSimulationEditorConstants; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -37,106 +51,295 @@ @RunWith(GwtMockitoTestRunner.class) public class CollectionViewImplTest extends AbstractCollectionEditorTest { - private CollectionViewImpl collectionEditorViewImpl; + private CollectionViewImpl collectionEditorViewImplSpy; @Mock - protected DivElement collectionEditorModalBodyMock; + private DivElement collectionEditorModalBodyMock; + @Mock + private LabelElement createLabelMock; + @Mock + private LabelElement collectionCreationModeLabelMock; + @Mock + private SpanElement collectionCreationCreateLabelMock; + @Mock + private SpanElement collectionCreationCreateSpanMock; + @Mock + private SpanElement collectionCreationDefineLabelMock; + @Mock + private SpanElement collectionCreationDefineSpanMock; + @Mock + private ButtonElement saveButtonMock; + @Mock + private ButtonElement cancelButtonMock; + @Mock + private ButtonElement removeButtonMock; + @Mock + private SpanElement addItemButtonLabelMock; + @Mock + private DivElement createCollectionContainerMock; + @Mock + private Style createCollectionContainerStyleMock; + @Mock + private DivElement defineCollectionContainerMock; + @Mock + private Style defineCollectionContainerStyleMock; + @Mock + private DivElement addItemButtonContainerMock; + @Mock + private Style addItemButtonContainerStyleMock; + @Mock + private TextAreaElement expressionElementMock; @Before public void setup() { when(collectionEditorModalBodyMock.getStyle()).thenReturn(styleMock); - this.collectionEditorViewImpl = spy(new CollectionViewImpl() { + when(createCollectionContainerMock.getStyle()).thenReturn(createCollectionContainerStyleMock); + when(defineCollectionContainerMock.getStyle()).thenReturn(defineCollectionContainerStyleMock); + when(addItemButtonContainerMock.getStyle()).thenReturn(addItemButtonContainerStyleMock); + this.collectionEditorViewImplSpy = spy(new CollectionViewImpl() { { this.presenter = collectionPresenterMock; this.collectionEditorModalBody = collectionEditorModalBodyMock; + this.createLabel = createLabelMock; + this.collectionCreationModeLabel = collectionCreationModeLabelMock; + this.collectionCreationCreateLabel = collectionCreationCreateLabelMock; + this.collectionCreationCreateSpan = collectionCreationCreateSpanMock; + this.collectionCreationDefineLabel = collectionCreationDefineLabelMock; + this.collectionCreationDefineSpan = collectionCreationDefineSpanMock; + this.createCollectionContainer = createCollectionContainerMock; + this.defineCollectionContainer = defineCollectionContainerMock; + this.addItemButtonContainer = addItemButtonContainerMock; + this.expressionElement = expressionElementMock; + this.saveButton = saveButtonMock; + this.cancelButton = cancelButtonMock; + this.removeButton = removeButtonMock; + this.addItemButtonLabel = addItemButtonLabelMock; } }); } + @Test + public void initListStructure() { + collectionEditorViewImplSpy.initListStructure("key", Collections.EMPTY_MAP, Collections.EMPTY_MAP, ScenarioSimulationModel.Type.DMN); + verify(collectionEditorViewImplSpy, times(1)).commonInit(eq(ScenarioSimulationModel.Type.DMN)); + verify(createLabelMock, atLeast(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList()); + verify(collectionCreationModeLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionListCreation()); + verify(collectionCreationCreateLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelList()); + verify(collectionCreationCreateSpanMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelListDescription()); + verify(collectionCreationDefineLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelList()); + verify(collectionCreationDefineSpanMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelListDescription()); + verify(collectionPresenterMock, times(1)).initListStructure(eq("key"), eq(Collections.EMPTY_MAP), eq(Collections.EMPTY_MAP), eq(collectionEditorViewImplSpy)); + assertTrue(collectionEditorViewImplSpy.listWidget); + } + + @Test + public void initMapStructure() { + collectionEditorViewImplSpy.initMapStructure("key", Collections.EMPTY_MAP, Collections.EMPTY_MAP, ScenarioSimulationModel.Type.DMN); + verify(collectionEditorViewImplSpy, times(1)).commonInit(eq(ScenarioSimulationModel.Type.DMN)); + verify(createLabelMock, atLeast(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap()); + verify(collectionCreationModeLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionMapCreation()); + verify(collectionCreationCreateLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap()); + verify(collectionCreationCreateSpanMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.createLabelMapDescription()); + verify(collectionCreationDefineLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelMap()); + verify(collectionCreationDefineSpanMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.defineLabelMapDescription()); + verify(collectionPresenterMock, times(1)).initMapStructure(eq("key"), eq(Collections.EMPTY_MAP), eq(Collections.EMPTY_MAP), eq(collectionEditorViewImplSpy)); + assertFalse(collectionEditorViewImplSpy.listWidget); + } + + @Test + public void commonInit_RuleScenario() { + collectionEditorViewImplSpy.commonInit(ScenarioSimulationModel.Type.RULE); + assertEquals(ScenarioSimulationModel.Type.RULE, collectionEditorViewImplSpy.scenarioType); + verify(saveButtonMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.saveButton()); + verify(cancelButtonMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton()); + verify(removeButtonMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.removeButton()); + verify(addItemButtonLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionEditorAddNewItem()); + verify(collectionEditorViewImplSpy, times(1)).enableCreateCollectionContainer(eq(true)); + verify(collectionEditorViewImplSpy, times(1)).initAndRegisterHandlerForExpressionTextArea(); + } + + @Test + public void commonInit_DMNScenario() { + collectionEditorViewImplSpy.commonInit(ScenarioSimulationModel.Type.DMN); + assertEquals(ScenarioSimulationModel.Type.DMN, collectionEditorViewImplSpy.scenarioType); + verify(saveButtonMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.saveButton()); + verify(cancelButtonMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.cancelButton()); + verify(removeButtonMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.removeButton()); + verify(addItemButtonLabelMock, times(1)).setInnerText(ScenarioSimulationEditorConstants.INSTANCE.collectionEditorAddNewItem()); + verify(collectionEditorViewImplSpy, times(1)).enableCreateCollectionContainer(eq(true)); + verify(collectionEditorViewImplSpy, never()).initAndRegisterHandlerForExpressionTextArea(); + } + @Test public void setValue() { String testValue = "TEST-JSON"; - collectionEditorViewImpl.setValue(testValue); + collectionEditorViewImplSpy.setValue(testValue); verify(collectionPresenterMock, times(1)).setValue(eq(testValue)); } @Test public void onCloseCollectionEditorButtonClick() { - collectionEditorViewImpl.onCloseCollectionEditorButtonClick(clickEventMock); - verify(collectionEditorViewImpl, times(1)).fireEvent(isA(CloseCompositeEvent.class)); + collectionEditorViewImplSpy.onCloseCollectionEditorButtonClick(clickEventMock); + verify(collectionEditorViewImplSpy, times(1)).fireEvent(isA(CloseCompositeEvent.class)); verify(clickEventMock, times(1)).stopPropagation(); } @Test public void onCancelButtonClick() { - collectionEditorViewImpl.onCancelButtonClick(clickEventMock); - verify(collectionEditorViewImpl, times(1)).close(); + collectionEditorViewImplSpy.onCancelButtonClick(clickEventMock); + verify(collectionEditorViewImplSpy, times(1)).close(); verify(clickEventMock, times(1)).stopPropagation(); } @Test public void onRemoveButtonClick() { - collectionEditorViewImpl.onRemoveButtonClick(clickEventMock); + collectionEditorViewImplSpy.onRemoveButtonClick(clickEventMock); verify(collectionPresenterMock, times(1)).remove(); verify(clickEventMock, times(1)).stopPropagation(); } @Test public void onSaveButtonClick() { - collectionEditorViewImpl.onSaveButtonClick(clickEventMock); + collectionEditorViewImplSpy.onSaveButtonClick(clickEventMock); verify(collectionPresenterMock, times(1)).save(); verify(clickEventMock, times(1)).stopPropagation(); } @Test public void onAddItemButton() { - collectionEditorViewImpl.onAddItemButton(clickEventMock); + collectionEditorViewImplSpy.onAddItemButton(clickEventMock); verify(collectionPresenterMock, times(1)).showEditingBox(); verify(clickEventMock, times(1)).stopPropagation(); } @Test public void onFaAngleRightClick() { - doReturn(true).when(collectionEditorViewImpl).isShown(); - collectionEditorViewImpl.onFaAngleRightClick(clickEventMock); + doReturn(true).when(collectionEditorViewImplSpy).isShown(); + collectionEditorViewImplSpy.onFaAngleRightClick(clickEventMock); verify(collectionPresenterMock, times(1)).onToggleRowExpansion(eq(true)); verify(clickEventMock, times(1)).stopPropagation(); reset(collectionPresenterMock); reset(clickEventMock); - doReturn(false).when(collectionEditorViewImpl).isShown(); - collectionEditorViewImpl.onFaAngleRightClick(clickEventMock); + doReturn(false).when(collectionEditorViewImplSpy).isShown(); + collectionEditorViewImplSpy.onFaAngleRightClick(clickEventMock); verify(collectionPresenterMock, times(1)).onToggleRowExpansion(eq(false)); verify(clickEventMock, times(1)).stopPropagation(); } @Test public void toggleRowExpansion() { - doReturn(true).when(collectionEditorViewImpl).isShown(); - collectionEditorViewImpl.toggleRowExpansion(); - verify(collectionEditorViewImpl, times(1)).toggleRowExpansion(false); - reset(collectionEditorViewImpl); - doReturn(false).when(collectionEditorViewImpl).isShown(); - collectionEditorViewImpl.toggleRowExpansion(); - verify(collectionEditorViewImpl, times(1)).toggleRowExpansion(true); + doReturn(true).when(collectionEditorViewImplSpy).isShown(); + collectionEditorViewImplSpy.toggleRowExpansion(); + verify(collectionEditorViewImplSpy, times(1)).toggleRowExpansion(false); + reset(collectionEditorViewImplSpy); + doReturn(false).when(collectionEditorViewImplSpy).isShown(); + collectionEditorViewImplSpy.toggleRowExpansion(); + verify(collectionEditorViewImplSpy, times(1)).toggleRowExpansion(true); } @Test public void updateValue() { - collectionEditorViewImpl.updateValue("TEST_VALUE"); - verify(collectionEditorViewImpl, times(1)).fireEvent(isA(SaveEditorEvent.class)); + collectionEditorViewImplSpy.updateValue("TEST_VALUE"); + verify(collectionEditorViewImplSpy, times(1)).fireEvent(isA(SaveEditorEvent.class)); } @Test public void close() { - collectionEditorViewImpl.close(); - verify(collectionEditorViewImpl, times(1)).fireEvent(isA(CloseCompositeEvent.class)); + collectionEditorViewImplSpy.close(); + verify(collectionEditorViewImplSpy, times(1)).fireEvent(isA(CloseCompositeEvent.class)); } @Test public void setFixedHeight() { double value = 23.0; Style.Unit unit = Style.Unit.PX; - collectionEditorViewImpl.setFixedHeight(value, unit); + collectionEditorViewImplSpy.setFixedHeight(value, unit); verify(styleMock, times(1)).setHeight(eq(value), eq(unit)); } + + @Test + public void enableCreateCollectionContainer_CreateList() { + enableCreateCollectionContainer(true, true); + } + + @Test + public void enableCreateCollectionContainer_CreateMap() { + enableCreateCollectionContainer(true, false); + } + + @Test + public void enableCreateCollectionContainer_DefineList() { + enableCreateCollectionContainer(false, true); + } + + @Test + public void enableCreateCollectionContainer_DefineMap() { + enableCreateCollectionContainer(false, false); + } + + private void enableCreateCollectionContainer(boolean toEnable, boolean isList) { + collectionEditorViewImplSpy.listWidget = isList; + collectionEditorViewImplSpy.enableCreateCollectionContainer(toEnable); + verify(collectionEditorViewImplSpy, times(1)).showCreateCollectionContainer(eq(toEnable)); + verify(collectionEditorViewImplSpy, times(1)).showDefineCollectionContainer(eq(!toEnable)); + verify(collectionEditorViewImplSpy, times(1)).showAddItemButtonContainer(eq(toEnable)); + if (isList) { + verify(createLabelMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.createLabelList())); + } else { + verify(createLabelMock, times(1)).setInnerText(eq(ScenarioSimulationEditorConstants.INSTANCE.createLabelMap())); + } + } + + @Test + public void checkExpressionSyntax_Rule() { + collectionEditorViewImplSpy.scenarioType = ScenarioSimulationModel.Type.RULE; + collectionEditorViewImplSpy.ensureExpressionSyntax(); + verify(expressionElementMock, times(1)).setValue(anyString()); + } + + @Test + public void checkExpressionSyntax_DMN() { + collectionEditorViewImplSpy.scenarioType = ScenarioSimulationModel.Type.DMN; + collectionEditorViewImplSpy.ensureExpressionSyntax(); + verify(expressionElementMock, never()).setValue(anyString()); + } + + @Test + public void setExpression() { + collectionEditorViewImplSpy.setExpression("test"); + verify(collectionEditorViewImplSpy, times(1)).enableCreateCollectionContainer(eq(false)); + verify(expressionElementMock, times(1)).setValue(eq("test")); + } + + @Test + public void showCreateCollectionContainer() { + collectionEditorViewImplSpy.showCreateCollectionContainer(false); + checkStyleDisplay(createCollectionContainerStyleMock, false); + collectionEditorViewImplSpy.showCreateCollectionContainer(true); + checkStyleDisplay(createCollectionContainerStyleMock, true); + } + + @Test + public void showDefineCollectionContainer() { + collectionEditorViewImplSpy.showDefineCollectionContainer(false); + checkStyleDisplay(defineCollectionContainerStyleMock, false); + collectionEditorViewImplSpy.showDefineCollectionContainer(true); + checkStyleDisplay(defineCollectionContainerStyleMock, true); + } + + @Test + public void showAddItemButtonContainer() { + collectionEditorViewImplSpy.showAddItemButtonContainer(false); + checkStyleDisplay(addItemButtonContainerStyleMock, false); + collectionEditorViewImplSpy.showAddItemButtonContainer(true); + checkStyleDisplay(addItemButtonContainerStyleMock, true); + } + + private void checkStyleDisplay(Style styleElement, boolean show) { + if (show) { + verify(styleElement, times(1)).setDisplay(Style.Display.BLOCK); + } else { + verify(styleElement, times(1)).setDisplay(Style.Display.NONE); + } + } } diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactoryTest.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactoryTest.java index 90f9d1b307d..08af2a5a6b7 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactoryTest.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/factories/CollectionEditorSingletonDOMElementFactoryTest.java @@ -21,9 +21,13 @@ import com.ait.lienzo.test.LienzoMockitoTestRunner; import com.google.gwt.dom.client.DivElement; +import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; import org.drools.scenariosimulation.api.utils.ScenarioSimulationSharedUtils; import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionPresenter; import org.drools.workbench.screens.scenariosimulation.client.collectioneditor.CollectionViewImpl; +import org.drools.workbench.screens.scenariosimulation.client.domelements.CollectionEditorDOMElement; +import org.drools.workbench.screens.scenariosimulation.client.handlers.CloseCompositeEventHandler; +import org.drools.workbench.screens.scenariosimulation.client.handlers.SaveEditorEventHandler; import org.drools.workbench.screens.scenariosimulation.model.typedescriptor.FactModelTree; import org.junit.Before; import org.junit.Test; @@ -51,6 +55,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -59,7 +64,7 @@ @RunWith(LienzoMockitoTestRunner.class) public class CollectionEditorSingletonDOMElementFactoryTest extends AbstractFactoriesTest { - protected CollectionEditorSingletonDOMElementFactory collectionEditorSingletonDOMElementFactoryMock; + protected CollectionEditorSingletonDOMElementFactory collectionEditorSingletonDOMElementFactorySpy; protected CollectionViewImpl collectionEditorViewImpl; @Mock @@ -90,7 +95,7 @@ public void setup() { } }); - this.collectionEditorSingletonDOMElementFactoryMock = spy(new CollectionEditorSingletonDOMElementFactory(scenarioGridPanelMock, + this.collectionEditorSingletonDOMElementFactorySpy = spy(new CollectionEditorSingletonDOMElementFactory(scenarioGridPanelMock, scenarioGridLayerMock, scenarioGridMock, scenarioSimulationContextLocal, @@ -122,17 +127,16 @@ public void setup() { @Test public void manageList() { String key = FULL_CLASS_NAME + "#" + LIST_CLASS_NAME; - collectionEditorSingletonDOMElementFactoryMock.manageList(collectionEditorViewImpl, key, STRING_CLASS_NAME); - verify(collectionEditorViewImpl, times(1)).setListWidget(true); + collectionEditorSingletonDOMElementFactorySpy.manageList(collectionEditorViewImpl, key, STRING_CLASS_NAME, ScenarioSimulationModel.Type.RULE); Map expectedMap1 = new HashMap<>(); expectedMap1.put(LOWER_CASE_VALUE, STRING_CLASS_NAME); - verify(collectionEditorViewImpl, times(1)).initListStructure(eq(key), eq(expectedMap1), isA(Map.class)); - verify(collectionEditorSingletonDOMElementFactoryMock, times(1)).getExpandablePropertiesMap(eq(STRING_CLASS_NAME)); + verify(collectionEditorViewImpl, times(1)).initListStructure(eq(key), eq(expectedMap1), isA(Map.class), eq(ScenarioSimulationModel.Type.RULE)); + verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).getExpandablePropertiesMap(eq(STRING_CLASS_NAME)); } @Test public void getExpandableProperties_SimpleType() { - Map> resultMap = collectionEditorSingletonDOMElementFactoryMock.getExpandablePropertiesMap(STRING_CLASS_NAME); + Map> resultMap = collectionEditorSingletonDOMElementFactorySpy.getExpandablePropertiesMap(STRING_CLASS_NAME); assertTrue(resultMap.isEmpty()); } @@ -140,7 +144,7 @@ public void getExpandableProperties_SimpleType() { public void getExpandableProperties_NotSimpleType() { Map> expectedResult = new HashMap<>(); expectedResult.put("a", EXPECTED_MAP_FOR_NOT_SIMPLE_TYPE_2); - Map> resultMap = collectionEditorSingletonDOMElementFactoryMock.getExpandablePropertiesMap(FULL_FACT_CLASSNAME); + Map> resultMap = collectionEditorSingletonDOMElementFactorySpy.getExpandablePropertiesMap(FULL_FACT_CLASSNAME); assertEquals(resultMap, expectedResult); } @@ -148,33 +152,30 @@ public void getExpandableProperties_NotSimpleType() { public void manageMap_RuleSimpleType() { Map expectedMap1 = new HashMap<>(); expectedMap1.put(LOWER_CASE_VALUE, NUMBER_CLASS_NAME); - manageMap(NUMBER_CLASS_NAME, true, expectedMap1); + manageMap(NUMBER_CLASS_NAME, RULE, expectedMap1); } @Test public void manageMap_NotRuleSimpleType() { Map expectedMap1 = new HashMap<>(); expectedMap1.put(LOWER_CASE_VALUE, NUMBER_CLASS_NAME); - manageMap(NUMBER_CLASS_NAME, false, expectedMap1); + manageMap(NUMBER_CLASS_NAME, DMN, expectedMap1); } @Test public void manageMap_NotRuleNotSimpleType() { - manageMap(FULL_CLASS_NAME, false, EXPECTED_MAP_FOR_NOT_SIMPLE_TYPE); + manageMap(FULL_CLASS_NAME, DMN, EXPECTED_MAP_FOR_NOT_SIMPLE_TYPE); } - private void manageMap(String genericType1, boolean isRule, Map expectedMap1) { + private void manageMap(String genericType1, ScenarioSimulationModel.Type type, Map expectedMap1) { String key = FULL_CLASS_NAME + "#" + LIST_CLASS_NAME; Map expectedMap0 = new HashMap<>(); - - doReturn(expectedMap0).when(collectionEditorSingletonDOMElementFactoryMock).getSimplePropertiesMap(eq(STRING_CLASS_NAME)); - doReturn(expectedMap1).when(collectionEditorSingletonDOMElementFactoryMock).getSimplePropertiesMap(eq(genericType1)); - collectionEditorSingletonDOMElementFactoryMock.manageMap(collectionEditorViewImpl, key, STRING_CLASS_NAME, genericType1, isRule); - verify(collectionEditorSingletonDOMElementFactoryMock, times(1)).getSimplePropertiesMap(STRING_CLASS_NAME); - verify(collectionEditorSingletonDOMElementFactoryMock, times(1)).getSimplePropertiesMap(genericType1); - - verify(collectionEditorViewImpl, times(1)).setListWidget(false); - verify(collectionEditorViewImpl, times(1)).initMapStructure(eq(key), eq(expectedMap0), eq(expectedMap1)); + doReturn(expectedMap0).when(collectionEditorSingletonDOMElementFactorySpy).getSimplePropertiesMap(eq(STRING_CLASS_NAME)); + doReturn(expectedMap1).when(collectionEditorSingletonDOMElementFactorySpy).getSimplePropertiesMap(eq(genericType1)); + collectionEditorSingletonDOMElementFactorySpy.manageMap(collectionEditorViewImpl, key, STRING_CLASS_NAME, genericType1, type); + verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).getSimplePropertiesMap(STRING_CLASS_NAME); + verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).getSimplePropertiesMap(genericType1); + verify(collectionEditorViewImpl, times(1)).initMapStructure(eq(key), eq(expectedMap0), eq(expectedMap1), eq(type)); } @Test(expected = IllegalStateException.class) @@ -231,21 +232,29 @@ public void setCollectionEditorStructureData_ManageListDMN() { } private void setCollectionEditorStructureData() { - collectionEditorSingletonDOMElementFactoryMock.setCollectionEditorStructureData(collectionEditorViewImpl, factMappingMock); + collectionEditorSingletonDOMElementFactorySpy.setCollectionEditorStructureData(collectionEditorViewImpl, factMappingMock); boolean isRule = RULE.equals(settingsLocal.getType()); String genericTypeName0 = factMappingMock.getGenericTypes().get(0); String genericTypeName1 = factMappingMock.getGenericTypes().get(1); if (isRule && !isSimpleJavaType(genericTypeName0)) { - verify(collectionEditorSingletonDOMElementFactoryMock, times(1)).getRuleComplexType(eq(genericTypeName0)); + verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).getRuleComplexType(eq(genericTypeName0)); genericTypeName0 = genericTypeName0.substring(genericTypeName0.lastIndexOf(".") + 1); } String key = factMappingMock.getFactAlias() + "#" + factMappingMock.getExpressionAlias(); if (ScenarioSimulationSharedUtils.isList(factMappingMock.getExpressionAlias())) { - verify(collectionEditorSingletonDOMElementFactoryMock, times(1)).manageList( - eq(collectionEditorViewImpl), eq(key), eq(genericTypeName0)); + verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).manageList( + eq(collectionEditorViewImpl), eq(key), eq(genericTypeName0), eq(settingsLocal.getType())); } else { - verify(collectionEditorSingletonDOMElementFactoryMock, times(1)).manageMap( - eq(collectionEditorViewImpl), eq(key), eq(genericTypeName0), eq(genericTypeName1), eq(isRule)); + verify(collectionEditorSingletonDOMElementFactorySpy, times(1)).manageMap( + eq(collectionEditorViewImpl), eq(key), eq(genericTypeName0), eq(genericTypeName1), eq(settingsLocal.getType())); } } + + @Test + public void registerHandlers() { + CollectionEditorDOMElement collectionEditorDOMElementMock = mock(CollectionEditorDOMElement.class); + collectionEditorSingletonDOMElementFactorySpy.registerHandlers(collectionEditorViewImpl, collectionEditorDOMElementMock); + verify(collectionEditorViewImpl, times(1)).addCloseCompositeEventHandler(isA(CloseCompositeEventHandler.class)); + verify(collectionEditorViewImpl, times(1)).addSaveEditorEventHandler(isA(SaveEditorEventHandler.class)); + } } \ No newline at end of file diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRendererTest.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRendererTest.java index ef4c3514b95..fdde0381c43 100644 --- a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRendererTest.java +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/renderers/ScenarioGridColumnRendererTest.java @@ -32,6 +32,7 @@ import org.uberfire.ext.wires.core.grids.client.widget.context.GridBodyCellRenderContext; import org.uberfire.ext.wires.core.grids.client.widget.grid.renderers.grids.GridRenderer; +import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.EXPRESSION_VALUE; import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.LIST_VALUE; import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MAP_VALUE; import static org.drools.workbench.screens.scenariosimulation.client.TestProperties.MULTIPART_VALUE; @@ -154,6 +155,23 @@ public void renderCell() { verify(scenarioGridColumnRenderer, times(1)).getCollectionString(eq(MAP_VALUE), eq(false)); reset(scenarioGridColumnRenderer); + cell = new ScenarioGridCell(new ScenarioGridCellValue(EXPRESSION_VALUE)); + ((ScenarioGridCell) cell).setListMap(true); + retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock); + assertNotNull(retrieved); + verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(EXPRESSION_VALUE)); + verify(scenarioGridColumnRenderer, times(1)).getCollectionString(eq(EXPRESSION_VALUE), eq(true)); + reset(scenarioGridColumnRenderer); + + cell = new ScenarioGridCell(new ScenarioGridCellValue(EXPRESSION_VALUE)); + ((ScenarioGridCell) cell).setListMap(false); + retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock); + assertNotNull(retrieved); + verify(scenarioGridColumnRenderer, times(1)).internalRenderCell(any(), eq(contextMock), eq(textMock), eq(EXPRESSION_VALUE)); + verify(scenarioGridColumnRenderer, times(1)).getCollectionString(eq(EXPRESSION_VALUE), eq(false)); + reset(scenarioGridColumnRenderer); + + cell = new ScenarioGridCell(new ScenarioGridCellValue(MULTIPART_VALUE)); ((ScenarioGridCell) cell).setErrorMode(true); retrieved = scenarioGridColumnRenderer.renderCell(cell, contextMock); @@ -201,6 +219,12 @@ public void getValueToShow(){ cell = new ScenarioGridCell(new ScenarioGridCellValue(MAP_VALUE)); cell.setListMap(false); commonGetValueToShow(cell, false, MAP_VALUE, false); + cell = new ScenarioGridCell(new ScenarioGridCellValue(EXPRESSION_VALUE)); + cell.setListMap(true); + commonGetValueToShow(cell, false, EXPRESSION_VALUE, true); + cell = new ScenarioGridCell(new ScenarioGridCellValue(EXPRESSION_VALUE)); + cell.setListMap(false); + commonGetValueToShow(cell, false, EXPRESSION_VALUE, false); } private void commonGetValueToShow(ScenarioGridCell scenarioGridCell, boolean expectedNull, String jsonString, boolean isList) { diff --git a/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtilsTest.java b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtilsTest.java new file mode 100644 index 00000000000..f041544f29f --- /dev/null +++ b/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-client/src/test/java/org/drools/workbench/screens/scenariosimulation/client/utils/ExpressionUtilsTest.java @@ -0,0 +1,55 @@ +/* + * Copyright 2020 Red Hat, Inc. and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.drools.workbench.screens.scenariosimulation.client.utils; + +import org.drools.scenariosimulation.api.utils.ConstantsHolder; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +public class ExpressionUtilsTest { + + @Test + public void checkExpressionSyntax_Null() { + assertNull(ExpressionUtils.ensureExpressionSyntax(null)); + } + + @Test + public void checkExpressionSyntax_Empty() { + assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX, ExpressionUtils.ensureExpressionSyntax("")); + } + + @Test + public void checkExpressionSyntax_StringWithNoPrefix() { + assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test", ExpressionUtils.ensureExpressionSyntax("Test")); + } + + @Test + public void checkExpressionSyntax_StringWithSpacePrefix() { + assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test", ExpressionUtils.ensureExpressionSyntax(" Test")); + } + + @Test + public void checkExpressionSyntax_StringWithMVelPrefix() { + assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test", ExpressionUtils.ensureExpressionSyntax(ConstantsHolder.MVEL_ESCAPE_SYMBOL + "Test")); + } + + @Test + public void checkExpressionSyntax_StringWithExpressionValuePrefix() { + assertEquals(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test", ExpressionUtils.ensureExpressionSyntax(ConstantHolder.EXPRESSION_VALUE_PREFIX + "Test")); + } +} \ No newline at end of file