[jboss-svn-commits] JBL Code SVN: r35797 - in labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa: testscenarios and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 29 09:17:01 EDT 2010
Author: Rikkola
Date: 2010-10-29 09:17:00 -0400 (Fri, 29 Oct 2010)
New Revision: 35797
Modified:
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFactWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyRulesFiredWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ActivateRuleFlowWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/AddExecuteButton.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ConfigWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/DataInputWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExpectPanel.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExpectationButton.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FactWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FieldDataConstraintEditor.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GivenLabelButton.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GivenPanel.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalButton.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalFactWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalPanel.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ModifyFactWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/NewDataButton.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/RetractWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestRunnerWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestScenarioButton.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/VerifyFactsPanel.java
Log:
BRMS-373 : Test scenario ignores any edits made after it has been run and cannot be saved.
BRMS-372 : Test scenarios imported from 5.0.x repositories display 'Show rules fired' button, which doesn't work anymore
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFactWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFactWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFactWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -25,6 +25,7 @@
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.common.ValueChanged;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.qa.testscenarios.ScenarioWidget;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
@@ -43,15 +44,15 @@
private boolean showResults;
private String type;
private SuggestionCompletionEngine sce;
- private Scenario scenario;
private ExecutionTrace executionTrace;
private Constants constants = ((Constants) GWT.create( Constants.class ));
+ private final ScenarioWidget scenarioWidget;
public VerifyFactWidget(final VerifyFact vf,
- final Scenario sc,
final SuggestionCompletionEngine sce,
ExecutionTrace executionTrace,
- boolean showResults) {
+ boolean showResults,
+ ScenarioWidget scenarioWidget) {
outer = new Grid( 2,
1 );
outer.getCellFormatter().setStyleName( 0,
@@ -63,11 +64,11 @@
HasVerticalAlignment.ALIGN_MIDDLE );
outer.setStyleName( "modeller-fact-pattern-Widget" ); //NON-NLS
this.sce = sce;
- this.scenario = sc;
+ this.scenarioWidget = scenarioWidget;
this.executionTrace = executionTrace;
HorizontalPanel ab = new HorizontalPanel();
if ( !vf.anonymous ) {
- type = (String) sc.getVariableTypes().get( vf.name );
+ type = (String) scenarioWidget.getScenario().getVariableTypes().get( vf.name );
ab.add( new SmallLabel( Format.format( constants.scenarioFactTypeHasValues(),
type,
vf.name ) ) );
@@ -164,7 +165,7 @@
},
fld,
sce,
- this.scenario,
+ this.scenarioWidget,
this.executionTrace );
data.setWidget( i,
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -37,12 +37,12 @@
import org.drools.guvnor.client.modeldriven.ui.ActionValueEditor;
import org.drools.guvnor.client.modeldriven.ui.DatePickerTextBox;
import org.drools.guvnor.client.modeldriven.ui.EnumDropDown;
+import org.drools.guvnor.client.qa.testscenarios.ScenarioWidget;
import org.drools.ide.common.client.modeldriven.DropDownData;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FactData;
import org.drools.ide.common.client.modeldriven.testing.FieldData;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import org.drools.ide.common.client.modeldriven.testing.VerifyField;
import com.google.gwt.core.client.GWT;
@@ -68,7 +68,7 @@
private String factType;
private VerifyField field;
private final Panel panel;
- private Scenario scenario;
+ private ScenarioWidget scenarioWidget;
private SuggestionCompletionEngine sce;
private ValueChanged callback;
private Constants constants = ((Constants) GWT.create( Constants.class ));
@@ -78,13 +78,13 @@
ValueChanged callback,
VerifyField field,
SuggestionCompletionEngine sce,
- Scenario scenario,
+ ScenarioWidget scenarioWidget,
ExecutionTrace executionTrace) {
this.field = field;
this.sce = sce;
this.factType = factType;
this.callback = callback;
- this.scenario = scenario;
+ this.scenarioWidget = scenarioWidget;
this.executionTrace = executionTrace;
panel = new SimplePanel();
refreshEditor();
@@ -111,18 +111,18 @@
}
},
DropDownData.create( c ) ) );
- } else if (flType != null && flType.equals(SuggestionCompletionEngine.TYPE_DATE)) {
+ } else if ( flType != null && flType.equals( SuggestionCompletionEngine.TYPE_DATE ) ) {
final DatePickerTextBox datePicker = new DatePickerTextBox( field.expected );
- String m = Format.format(((Constants) GWT.create(Constants.class)).ValueFor0(),
- field.fieldName);
- datePicker.setTitle(m);
- datePicker.addValueChanged(new ValueChanged() {
+ String m = Format.format( ((Constants) GWT.create( Constants.class )).ValueFor0(),
+ field.fieldName );
+ datePicker.setTitle( m );
+ datePicker.addValueChanged( new ValueChanged() {
public void valueChanged(String newValue) {
- field.expected = newValue;
+ field.expected = newValue;
}
- });
+ } );
- panel.add(datePicker);
+ panel.add( datePicker );
} else {
String[] enums = sce.getDataEnumList( key );
if ( enums != null ) {
@@ -167,8 +167,8 @@
private Widget variableEditor() {
// sce.
- List vars = this.scenario.getFactNamesInScope( this.executionTrace,
- true );
+ List vars = this.scenarioWidget.getScenario().getFactNamesInScope( this.executionTrace,
+ true );
final ListBox box = new ListBox();
@@ -178,8 +178,8 @@
int j = 0;
for ( int i = 0; i < vars.size(); i++ ) {
String var = (String) vars.get( i );
- Map m = this.scenario.getVariableTypes();
- FactData f = (FactData) scenario.getFactTypes().get( var );
+ Map m = this.scenarioWidget.getScenario().getVariableTypes();
+ FactData f = (FactData) scenarioWidget.getScenario().getFactTypes().get( var );
String fieldType = sce.getFieldType( this.factType,
field.fieldName );
if ( f.type.equals( fieldType ) ) {
@@ -263,13 +263,13 @@
private boolean isThereABoundVariableToSet() {
boolean retour = false;
- List vars = this.scenario.getFactNamesInScope( executionTrace,
- true );
+ List vars = this.scenarioWidget.getScenario().getFactNamesInScope( executionTrace,
+ true );
if ( vars.size() > 0 ) {
for ( int i = 0; i < vars.size(); i++ ) {
String var = (String) vars.get( i );
- Map m = this.scenario.getVariableTypes();
- FactData f = (FactData) scenario.getFactTypes().get( var );
+ Map m = this.scenarioWidget.getScenario().getVariableTypes();
+ FactData f = (FactData) scenarioWidget.getScenario().getFactTypes().get( var );
String fieldType = sce.getFieldType( this.factType,
field.fieldName );
if ( f.type.equals( fieldType ) ) {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyRulesFiredWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyRulesFiredWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyRulesFiredWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -22,6 +22,7 @@
import org.drools.guvnor.client.common.ImageButton;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.qa.testscenarios.ScenarioWidget;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
import org.drools.ide.common.client.modeldriven.testing.VerifyRuleFired;
@@ -51,122 +52,167 @@
* To change this template use File | Settings | File Templates.
*/
public class VerifyRulesFiredWidget extends Composite {
- private Grid outer;
- private boolean showResults;
- private Constants constants = ((Constants) GWT.create(Constants.class));
+ private Grid outer;
+ private boolean showResults;
+ private Constants constants = ((Constants) GWT.create( Constants.class ));
/**
* @param rfl List<VeryfyRuleFired>
* @param scenario = the scenario to add/remove from
*/
- public VerifyRulesFiredWidget(final List rfl, final Scenario scenario, boolean showResults) {
- outer = new Grid(2, 1);
+ public VerifyRulesFiredWidget(final List rfl,
+ final ScenarioWidget scenarioWidget,
+ boolean showResults) {
+ outer = new Grid( 2,
+ 1 );
this.showResults = showResults;
- outer.getCellFormatter().setStyleName(0, 0, "modeller-fact-TypeHeader"); //NON-NLS
- outer.getCellFormatter().setAlignment(0, 0, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_MIDDLE );
- outer.setStyleName("modeller-fact-pattern-Widget"); //NON-NLS
+ outer.getCellFormatter().setStyleName( 0,
+ 0,
+ "modeller-fact-TypeHeader" ); //NON-NLS
+ outer.getCellFormatter().setAlignment( 0,
+ 0,
+ HasHorizontalAlignment.ALIGN_CENTER,
+ HasVerticalAlignment.ALIGN_MIDDLE );
+ outer.setStyleName( "modeller-fact-pattern-Widget" ); //NON-NLS
- outer.setWidget(0, 0, new SmallLabel(constants.ExpectRules()));
- initWidget(outer);
+ outer.setWidget( 0,
+ 0,
+ new SmallLabel( constants.ExpectRules() ) );
+ initWidget( outer );
- FlexTable data = render(rfl, scenario);
- outer.setWidget(1, 0, data);
+ FlexTable data = render( rfl,
+ scenarioWidget );
+ outer.setWidget( 1,
+ 0,
+ data );
}
+ private FlexTable render(final List rfl,
+ final ScenarioWidget scenarioWidget) {
+ FlexTable data = new DirtyableFlexTable();
+ for ( int i = 0; i < rfl.size(); i++ ) {
+ final VerifyRuleFired v = (VerifyRuleFired) rfl.get( i );
- private FlexTable render(final List rfl, final Scenario sc) {
- FlexTable data = new DirtyableFlexTable();
+ if ( showResults && v.successResult != null ) {
+ if ( !v.successResult.booleanValue() ) {
+ data.setWidget( i,
+ 0,
+ new Image( "images/warning.gif" ) ); //NON-NLS
+ data.setWidget( i,
+ 4,
+ new HTML( Format.format( constants.ActualResult(),
+ v.actualResult ) ) );
+ data.getCellFormatter().addStyleName( i,
+ 4,
+ "testErrorValue" ); //NON-NLS
- for (int i = 0; i < rfl.size(); i++) {
- final VerifyRuleFired v = (VerifyRuleFired) rfl.get(i);
+ } else {
+ data.setWidget( i,
+ 0,
+ new Image( "images/test_passed.png" ) ); //NON-NLS
+ }
- if (showResults && v.successResult != null) {
- if (!v.successResult.booleanValue()) {
- data.setWidget(i, 0, new Image("images/warning.gif")); //NON-NLS
- data.setWidget(i, 4, new HTML(Format.format(constants.ActualResult(), v.actualResult)));
-
- data.getCellFormatter().addStyleName(i, 4, "testErrorValue"); //NON-NLS
-
- } else {
- data.setWidget(i, 0, new Image("images/test_passed.png")); //NON-NLS
- }
-
}
- data.setWidget(i, 1, new SmallLabel(v.ruleName + ":"));
- data.getFlexCellFormatter().setAlignment(i, 1, HasHorizontalAlignment.ALIGN_RIGHT, HasVerticalAlignment.ALIGN_MIDDLE);
+ data.setWidget( i,
+ 1,
+ new SmallLabel( v.ruleName + ":" ) );
+ data.getFlexCellFormatter().setAlignment( i,
+ 1,
+ HasHorizontalAlignment.ALIGN_RIGHT,
+ HasVerticalAlignment.ALIGN_MIDDLE );
-
final ListBox b = new ListBox();
- b.addItem(constants.firedAtLeastOnce(), "y");
- b.addItem(constants.didNotFire(), "n");
- b.addItem(constants.firedThisManyTimes(), "e");
+ b.addItem( constants.firedAtLeastOnce(),
+ "y" );
+ b.addItem( constants.didNotFire(),
+ "n" );
+ b.addItem( constants.firedThisManyTimes(),
+ "e" );
final TextBox num = new TextBox();
- num.setVisibleLength(5);
+ num.setVisibleLength( 5 );
- if (v.expectedFire != null ) {
- b.setSelectedIndex((v.expectedFire.booleanValue()) ? 0 : 1);
- num.setVisible(false);
+ if ( v.expectedFire != null ) {
+ b.setSelectedIndex( (v.expectedFire.booleanValue()) ? 0 : 1 );
+ num.setVisible( false );
} else {
- b.setSelectedIndex(2);
- String xc = (v.expectedCount != null)? "" + v.expectedCount.intValue() : "0";
- num.setText(xc);
+ b.setSelectedIndex( 2 );
+ String xc = (v.expectedCount != null) ? "" + v.expectedCount.intValue() : "0";
+ num.setText( xc );
}
- b.addChangeListener(new ChangeListener() {
+ b.addChangeListener( new ChangeListener() {
public void onChange(Widget w) {
- String s = b.getValue(b.getSelectedIndex());
- if (s.equals("y") || s.equals("n")) {
- num.setVisible(false);
- v.expectedFire = (s.equals("y")) ? Boolean.TRUE : Boolean.FALSE;
+ String s = b.getValue( b.getSelectedIndex() );
+ if ( s.equals( "y" ) || s.equals( "n" ) ) {
+ num.setVisible( false );
+ v.expectedFire = (s.equals( "y" )) ? Boolean.TRUE : Boolean.FALSE;
v.expectedCount = null;
} else {
- num.setVisible(true);
+ num.setVisible( true );
v.expectedFire = null;
- num.setText("1"); v.expectedCount = new Integer(1);
+ num.setText( "1" );
+ v.expectedCount = new Integer( 1 );
}
}
- });
+ } );
- b.addItem(constants.ChooseDotDotDot());
+ b.addItem( constants.ChooseDotDotDot() );
- num.addChangeListener(new ChangeListener() {
+ num.addChangeListener( new ChangeListener() {
public void onChange(Widget w) {
- v.expectedCount = new Integer(num.getText());
+ v.expectedCount = new Integer( num.getText() );
}
- });
+ } );
HorizontalPanel h = new HorizontalPanel();
- h.add(b); h.add(num);
- data.setWidget(i, 2, h);
+ h.add( b );
+ h.add( num );
+ data.setWidget( i,
+ 2,
+ h );
- Image del = new ImageButton("images/delete_item_small.gif", constants.RemoveThisRuleExpectation(), new ClickListener() {
- public void onClick(Widget w) {
- if (Window.confirm(constants.AreYouSureYouWantToRemoveThisRuleExpectation())) {
- rfl.remove(v);
- sc.removeFixture(v);
- outer.setWidget(1, 0, render(rfl, sc));
- }
- }
- });
+ Image del = new ImageButton( "images/delete_item_small.gif",
+ constants.RemoveThisRuleExpectation(),
+ new ClickListener() {
+ public void onClick(Widget w) {
+ if ( Window.confirm( constants.AreYouSureYouWantToRemoveThisRuleExpectation() ) ) {
+ rfl.remove( v );
+ scenarioWidget.getScenario().removeFixture( v );
+ outer.setWidget( 1,
+ 0,
+ render( rfl,
+ scenarioWidget ) );
+ }
+ }
+ } );
- data.setWidget(i, 3, del);
+ data.setWidget( i,
+ 3,
+ del );
+ //we only want numbers here...
+ num.addKeyboardListener( new KeyboardListener() {
+ public void onKeyDown(Widget arg0,
+ char arg1,
+ int arg2) {
+ }
+ public void onKeyPress(Widget w,
+ char c,
+ int i) {
+ if ( Character.isLetter( c ) ) {
+ ((TextBox) w).cancelKey();
+ }
+ }
- //we only want numbers here...
- num.addKeyboardListener(new KeyboardListener() {
- public void onKeyDown(Widget arg0, char arg1, int arg2) {}
- public void onKeyPress(Widget w, char c, int i) {
- if (Character.isLetter( c ) ) {
- ((TextBox) w).cancelKey();
- }
- }
- public void onKeyUp(Widget arg0, char arg1, int arg2) {}
- } );
+ public void onKeyUp(Widget arg0,
+ char arg1,
+ int arg2) {
+ }
+ } );
}
- return data;
- }
+ return data;
+ }
}
-
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ActivateRuleFlowWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ActivateRuleFlowWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ActivateRuleFlowWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -47,21 +47,17 @@
private final ScenarioWidget parent;
public ActivateRuleFlowWidget(List retList,
- Scenario sc,
ScenarioWidget parent) {
FlexTable outer = new FlexTable();
+ this.parent = parent;
render( retList,
- outer,
- sc );
+ outer );
- this.parent = parent;
-
initWidget( outer );
}
private void render(final List retList,
- final FlexTable outer,
- final Scenario sc) {
+ final FlexTable outer) {
outer.clear();
outer.getCellFormatter().setStyleName( 0,
0,
@@ -89,10 +85,9 @@
new ClickListener() {
public void onClick(Widget w) {
retList.remove( acticateRuleFlowGroup );
- sc.fixtures.remove( acticateRuleFlowGroup );
+ parent.getScenario().fixtures.remove( acticateRuleFlowGroup );
render( retList,
- outer,
- sc );
+ outer );
parent.renderEditor();
}
} );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/AddExecuteButton.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/AddExecuteButton.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/AddExecuteButton.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -18,7 +18,6 @@
import org.drools.guvnor.client.messages.Constants;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -34,8 +33,7 @@
private final static Constants constants = ((Constants) GWT.create( Constants.class ));
- public AddExecuteButton(final Scenario scenario,
- final ScenarioWidget parent) {
+ public AddExecuteButton(final ScenarioWidget parent) {
super( constants.MoreDotDot() );
setTitle( constants.AddAnotherSectionOfDataAndExpectations() );
@@ -43,7 +41,7 @@
addClickHandler( new ClickHandler() {
public void onClick(ClickEvent event) {
- scenario.fixtures.add( new ExecutionTrace() );
+ parent.getScenario().fixtures.add( new ExecutionTrace() );
parent.renderEditor();
}
} );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ConfigWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ConfigWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ConfigWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -36,14 +36,13 @@
public class ConfigWidget extends Composite {
private final Constants constants = ((Constants) GWT.create( Constants.class ));
- public ConfigWidget(final Scenario sc,
- final String packageName,
+ public ConfigWidget(final String packageName,
final ScenarioWidget scWidget) {
final ListBox box = new ListBox( true );
- for ( int i = 0; i < sc.rules.size(); i++ ) {
- box.addItem( (String) sc.rules.get( i ) );
+ for ( int i = 0; i < scWidget.getScenario().rules.size(); i++ ) {
+ box.addItem( (String) scWidget.getScenario().rules.get( i ) );
}
HorizontalPanel filter = new HorizontalPanel();
@@ -54,7 +53,7 @@
showRulePopup( w,
box,
packageName,
- sc.rules,
+ scWidget.getScenario().rules,
scWidget );
}
} );
@@ -67,7 +66,7 @@
Window.alert( constants.PleaseChooseARuleToRemove() );
} else {
String r = box.getItemText( box.getSelectedIndex() );
- sc.rules.remove( r );
+ scWidget.getScenario().rules.remove( r );
box.removeItem( box.getSelectedIndex() );
}
}
@@ -86,17 +85,17 @@
public void onChange(Widget w) {
String s = drop.getValue( drop.getSelectedIndex() );
if ( s.equals( "inc" ) ) { //NON-NLS
- sc.inclusive = true;
+ scWidget.getScenario().inclusive = true;
add.setVisible( true );
remove.setVisible( true );
box.setVisible( true );
} else if ( s.equals( "exc" ) ) { //NON-NLS
- sc.inclusive = false;
+ scWidget.getScenario().inclusive = false;
add.setVisible( true );
remove.setVisible( true );
box.setVisible( true );
} else {
- sc.rules.clear();
+ scWidget.getScenario().rules.clear();
box.clear();
box.setVisible( false );
add.setVisible( false );
@@ -105,8 +104,8 @@
}
} );
- if ( sc.rules.size() > 0 ) {
- drop.setSelectedIndex( (sc.inclusive) ? 0 : 1 );
+ if ( scWidget.getScenario().rules.size() > 0 ) {
+ drop.setSelectedIndex( (scWidget.getScenario().inclusive) ? 0 : 1 );
} else {
drop.setSelectedIndex( 2 );
box.setVisible( false );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/DataInputWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/DataInputWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/DataInputWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -33,7 +33,6 @@
import org.drools.ide.common.client.modeldriven.testing.FieldData;
import org.drools.ide.common.client.modeldriven.testing.Fixture;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -56,7 +55,6 @@
*/
public class DataInputWidget extends DirtyableFlexTable {
- private final Scenario scenario;
private final SuggestionCompletionEngine suggestionCompletionEngine;
protected final String type;
private final ScenarioWidget parent;
@@ -68,12 +66,10 @@
public DataInputWidget(String factType,
FixtureList definitionList,
- Scenario sc,
ScenarioWidget parent,
ExecutionTrace executionTrace,
String headerText) {
- scenario = sc;
this.suggestionCompletionEngine = parent.suggestionCompletionEngine;
this.type = factType;
@@ -273,8 +269,8 @@
fd,
factData,
suggestionCompletionEngine,
- scenario,
- executionTrace );
+ executionTrace,
+ parent );
}
class DeleteFactColumnButton extends ImageButton {
@@ -286,12 +282,12 @@
addClickHandler( new ClickHandler() {
public void onClick(ClickEvent event) {
- if ( scenario.isFactNameUsed( factData ) ) {
+ if ( parent.getScenario().isFactNameUsed( factData ) ) {
Window.alert( Format.format( constants.CanTRemoveThisColumnAsTheName0IsBeingUsed(),
factData.name ) );
} else if ( Window.confirm( Format.format( constants.AreYouSureYouWantToRemoveColumn0(),
factData.name ) ) ) {
- scenario.removeFixture( factData );
+ parent.getScenario().removeFixture( factData );
definitionList.remove( factData );
render();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExpectPanel.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExpectPanel.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExpectPanel.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -20,7 +20,6 @@
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -37,21 +36,17 @@
private Constants constants = ((Constants) GWT.create( Constants.class ));
- protected final Scenario scenario;
protected final ScenarioWidget parent;
protected final ExecutionTrace previousEx;
public ExpectPanel(String packageName,
ExecutionTrace previousEx,
- final Scenario scenario,
final ScenarioWidget parent) {
- this.scenario = scenario;
this.parent = parent;
this.previousEx = previousEx;
add( new ExpectationButton( packageName,
previousEx,
- scenario,
parent ) );
add( new SmallLabel( constants.EXPECT() ) );
add( new DeleteButton() );
@@ -65,7 +60,7 @@
public void onClick(ClickEvent event) {
if ( Window.confirm( constants.AreYouSureYouWantToRemoveThisItem() ) ) {
- scenario.removeExecutionTrace( previousEx );
+ parent.getScenario().removeExecutionTrace( previousEx );
parent.renderEditor();
}
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExpectationButton.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExpectationButton.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExpectationButton.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -20,7 +20,6 @@
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.Fixture;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import org.drools.ide.common.client.modeldriven.testing.VerifyFact;
import org.drools.ide.common.client.modeldriven.testing.VerifyField;
import org.drools.ide.common.client.modeldriven.testing.VerifyRuleFired;
@@ -38,12 +37,10 @@
public ExpectationButton(final String packageName,
final ExecutionTrace previousEx,
- final Scenario scenario,
ScenarioWidget scenarioWidget) {
super( "images/new_item.gif",
constants.AddANewExpectation(),
previousEx,
- scenario,
scenarioWidget );
this.packageName = packageName;
@@ -66,8 +63,8 @@
VerifyRuleFired verifyRuleFired = new VerifyRuleFired( name,
null,
new Boolean( true ) );
- scenario.insertBetween( previousEx,
- verifyRuleFired );
+ parent.getScenario().insertBetween( previousEx,
+ verifyRuleFired );
parent.renderEditor();
hide();
}
@@ -102,8 +99,8 @@
class FactsPanel extends ListBoxBasePanel {
public FactsPanel() {
- super( scenario.getFactNamesInScope( previousEx,
- true ) );
+ super( parent.getScenario().getFactNamesInScope( previousEx,
+ true ) );
}
@Override
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FactWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FactWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FactWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -20,7 +20,6 @@
import org.drools.guvnor.client.messages.Constants;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -38,22 +37,18 @@
protected static Constants constants = ((Constants) GWT.create( Constants.class ));
protected final ScenarioWidget parent;
- protected final Scenario scenario;
protected final FixtureList definitionList;
public FactWidget(String factType,
FixtureList definitionList,
- Scenario scenario,
ScenarioWidget parent,
ExecutionTrace executionTrace,
String headerText) {
this.parent = parent;
- this.scenario = scenario;
this.definitionList = definitionList;
add( new DataInputWidget( factType,
definitionList,
- scenario,
parent,
executionTrace,
headerText ) );
@@ -62,7 +57,7 @@
protected void onDelete() {
if ( Window.confirm( constants.AreYouSureYouWantToRemoveThisBlockOfData() ) ) {
- scenario.removeFixture( definitionList );
+ parent.getScenario().removeFixture( definitionList );
parent.renderEditor();
}
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FieldDataConstraintEditor.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FieldDataConstraintEditor.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FieldDataConstraintEditor.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -29,7 +29,6 @@
import org.drools.guvnor.client.common.ValueChanged;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.modeldriven.ui.ActionValueEditor;
-import org.drools.guvnor.client.modeldriven.ui.DatePickerLabel;
import org.drools.guvnor.client.modeldriven.ui.DatePickerTextBox;
import org.drools.guvnor.client.modeldriven.ui.EnumDropDown;
import org.drools.ide.common.client.modeldriven.DropDownData;
@@ -37,7 +36,6 @@
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FactData;
import org.drools.ide.common.client.modeldriven.testing.FieldData;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Button;
@@ -62,108 +60,107 @@
public class FieldDataConstraintEditor extends DirtyableComposite {
- private String factType;
- private FieldData field;
- private FactData givenFact;
- private final Panel panel;
- private Scenario scenario;
- private ExecutionTrace executionTrace;
+ private String factType;
+ private FieldData field;
+ private FactData givenFact;
+ private final Panel panel;
+ private ExecutionTrace executionTrace;
private SuggestionCompletionEngine sce;
- private ValueChanged callback;
- private Constants constants = ((Constants) GWT.create(Constants.class));
+ private ValueChanged callback;
+ private Constants constants = ((Constants) GWT.create( Constants.class ));
+ private ScenarioWidget parent;
public FieldDataConstraintEditor(String factType,
ValueChanged callback,
FieldData field,
FactData givenFact,
SuggestionCompletionEngine sce,
- Scenario scenario,
- ExecutionTrace exec) {
+ ExecutionTrace exec,
+ ScenarioWidget scenarioWidget) {
+ this.parent = scenarioWidget;
this.field = field;
this.sce = sce;
this.factType = factType;
this.callback = callback;
- this.scenario = scenario;
this.executionTrace = exec;
this.givenFact = givenFact;
panel = new SimplePanel();
refreshEditor();
- initWidget(panel);
+ initWidget( panel );
}
private void refreshEditor() {
String key = factType + "." + field.name;
- String flType = sce.getFieldType(key);
+ String flType = sce.getFieldType( key );
panel.clear();
- if (flType != null && flType.equals(SuggestionCompletionEngine.TYPE_NUMERIC)) {
- final TextBox box = editableTextBox(callback,
- field.name,
- field.value);
- box.addKeyboardListener(ActionValueEditor.getNumericFilter(box));
- panel.add(box);
- } else if (flType != null && flType.equals(SuggestionCompletionEngine.TYPE_BOOLEAN)) {
+ if ( flType != null && flType.equals( SuggestionCompletionEngine.TYPE_NUMERIC ) ) {
+ final TextBox box = editableTextBox( callback,
+ field.name,
+ field.value );
+ box.addKeyboardListener( ActionValueEditor.getNumericFilter( box ) );
+ panel.add( box );
+ } else if ( flType != null && flType.equals( SuggestionCompletionEngine.TYPE_BOOLEAN ) ) {
String[] c = new String[]{"true", "false"};
- panel.add(new EnumDropDown(field.value,
- new DropDownValueChanged() {
- public void valueChanged(String newText,
- String newValue) {
- callback.valueChanged(newValue);
- }
- },
- DropDownData.create(c)));
- } else if (flType != null && flType.equals(SuggestionCompletionEngine.TYPE_DATE)) {
+ panel.add( new EnumDropDown( field.value,
+ new DropDownValueChanged() {
+ public void valueChanged(String newText,
+ String newValue) {
+ callback.valueChanged( newValue );
+ }
+ },
+ DropDownData.create( c ) ) );
+ } else if ( flType != null && flType.equals( SuggestionCompletionEngine.TYPE_DATE ) ) {
final DatePickerTextBox datePicker = new DatePickerTextBox( field.value );
- String m = Format.format(((Constants) GWT.create(Constants.class)).ValueFor0(),
- field.name);
- datePicker.setTitle(m);
- datePicker.addValueChanged(new ValueChanged() {
+ String m = Format.format( ((Constants) GWT.create( Constants.class )).ValueFor0(),
+ field.name );
+ datePicker.setTitle( m );
+ datePicker.addValueChanged( new ValueChanged() {
public void valueChanged(String newValue) {
field.value = newValue;
}
- });
+ } );
- panel.add(datePicker);
+ panel.add( datePicker );
} else {
- String[] enums = sce.getDataEnumList(key);
- if (enums != null) {
- panel.add(new EnumDropDown(field.value,
- new DropDownValueChanged() {
- public void valueChanged(String newText,
- String newValue) {
- callback.valueChanged(newValue);
- }
- },
- DropDownData.create(enums)));
+ String[] enums = sce.getDataEnumList( key );
+ if ( enums != null ) {
+ panel.add( new EnumDropDown( field.value,
+ new DropDownValueChanged() {
+ public void valueChanged(String newText,
+ String newValue) {
+ callback.valueChanged( newValue );
+ }
+ },
+ DropDownData.create( enums ) ) );
} else {
- if (field.value != null && field.value.length() > 0 && field.nature == FieldData.TYPE_UNDEFINED) {
+ if ( field.value != null && field.value.length() > 0 && field.nature == FieldData.TYPE_UNDEFINED ) {
// GUVNOR-337
- if (field.value.length() > 1 && field.value.charAt(1) == '[' && field.value.charAt(0) == '=') {
+ if ( field.value.length() > 1 && field.value.charAt( 1 ) == '[' && field.value.charAt( 0 ) == '=' ) {
field.nature = FieldData.TYPE_LITERAL;
- } else if (field.value.charAt(0) == '=') {
+ } else if ( field.value.charAt( 0 ) == '=' ) {
field.nature = FieldData.TYPE_VARIABLE;
} else {
field.nature = FieldData.TYPE_LITERAL;
}
}
- if (field.nature == FieldData.TYPE_UNDEFINED &&
- (isThereABoundVariableToSet() == true || isItAList() == true)) {
- Image clickme = new Image("images/edit.gif"); // NON-NLS
- clickme.addClickListener(new ClickListener() {
+ if ( field.nature == FieldData.TYPE_UNDEFINED && (isThereABoundVariableToSet() == true || isItAList() == true) ) {
+ Image clickme = new Image( "images/edit.gif" ); // NON-NLS
+ clickme.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- showTypeChoice(w,
- field);
+ showTypeChoice( w,
+ field );
}
- });
- panel.add(clickme);
- } else if (field.nature == FieldData.TYPE_VARIABLE) {
- panel.add(variableEditor(callback));
- } else if (field.nature == FieldData.TYPE_COLLECTION) {
- panel.add(listEditor(callback));
+ } );
+ panel.add( clickme );
+ } else if ( field.nature == FieldData.TYPE_VARIABLE ) {
+ panel.add( variableEditor( callback ) );
+ } else if ( field.nature == FieldData.TYPE_COLLECTION ) {
+ panel.add( listEditor( callback ) );
} else {
- panel.add(editableTextBox(callback,
- field.name,
- field.value));
+ panel.add( editableTextBox( callback,
+ field.name,
+ field.value ) );
}
}
}
@@ -175,62 +172,62 @@
String initialValue) {
// Fixme nheron
final TextBox tb = new TextBox();
- tb.setText(initialValue);
- String m = Format.format(((Constants) GWT.create(Constants.class)).ValueFor0(),
- fieldName);
- tb.setTitle(m);
- tb.addChangeListener(new ChangeListener() {
+ tb.setText( initialValue );
+ String m = Format.format( ((Constants) GWT.create( Constants.class )).ValueFor0(),
+ fieldName );
+ tb.setTitle( m );
+ tb.addChangeListener( new ChangeListener() {
public void onChange(Widget w) {
- changed.valueChanged(tb.getText());
+ changed.valueChanged( tb.getText() );
}
- });
+ } );
return tb;
}
private Widget variableEditor(final ValueChanged changed) {
// sce.
- List vars = this.scenario.getFactNamesInScope(this.executionTrace,
- true);
+ List vars = this.parent.getScenario().getFactNamesInScope( this.executionTrace,
+ true );
final ListBox box = new ListBox();
- if (this.field.value == null) {
- box.addItem(constants.Choose());
+ if ( this.field.value == null ) {
+ box.addItem( constants.Choose() );
}
int j = 0;
- for (int i = 0; i < vars.size(); i++) {
- String var = (String) vars.get(i);
- Map m = this.scenario.getVariableTypes();
- FactData f = (FactData) this.scenario.getFactTypes().get(var);
+ for ( int i = 0; i < vars.size(); i++ ) {
+ String var = (String) vars.get( i );
+ Map m = this.parent.getScenario().getVariableTypes();
+ FactData f = (FactData) this.parent.getScenario().getFactTypes().get( var );
String fieldType = null;
- if (field.collectionType == null) {
- fieldType = sce.getFieldType(this.factType,
- field.name);
+ if ( field.collectionType == null ) {
+ fieldType = sce.getFieldType( this.factType,
+ field.name );
} else {
fieldType = field.collectionType;
}
- if (f.type.equals(fieldType)) {
- if (box.getItemCount() == 0) {
- box.addItem("...");
+ if ( f.type.equals( fieldType ) ) {
+ if ( box.getItemCount() == 0 ) {
+ box.addItem( "..." );
j++;
}
- box.addItem("=" + var);
- if (this.field.value != null && this.field.value.equals("=" + var)) {
- box.setSelectedIndex(j);
+ box.addItem( "=" + var );
+ if ( this.field.value != null && this.field.value.equals( "=" + var ) ) {
+ box.setSelectedIndex( j );
}
j++;
}
}
- box.addChangeListener(new ChangeListener() {
+ box.addChangeListener( new ChangeListener() {
public void onChange(Widget w) {
- field.value = box.getItemText(box.getSelectedIndex());
- changed.valueChanged(field.value);
+ field.value = box.getItemText( box.getSelectedIndex() );
+ changed.valueChanged( field.value );
}
- });
+ } );
return box;
}
@@ -239,181 +236,198 @@
Panel panel = new VerticalPanel();
//nheron
int i = 0;
- for (final FieldData f : this.field.collectionFieldList) {
+ for ( final FieldData f : this.field.collectionFieldList ) {
DirtyableHorizontalPane hpanel = new DirtyableHorizontalPane();
- FieldDataConstraintEditor fieldElement = new FieldDataConstraintEditor(f.collectionType, new ValueChanged() {
- public void valueChanged(String newValue) {
- f.value = newValue ;
- calculateValueFromList();
- makeDirty();
- }
- }, f, givenFact, sce, scenario, executionTrace);
- hpanel.add(fieldElement);
+ FieldDataConstraintEditor fieldElement = new FieldDataConstraintEditor( f.collectionType,
+ new ValueChanged() {
+ public void valueChanged(String newValue) {
+ f.value = newValue;
+ calculateValueFromList();
+ makeDirty();
+ }
+ },
+ f,
+ givenFact,
+ sce,
+ executionTrace,
+ parent );
+ hpanel.add( fieldElement );
final int index = i;
- Image del = new ImageButton("images/delete_item_small.gif", Format.format(constants.AElementToDelInCollectionList(), "tt"), new ClickListener() {
- public void onClick(Widget w) {
- field.collectionFieldList.remove(index);
- calculateValueFromList();
- refreshEditor();
- }
- });
+ Image del = new ImageButton( "images/delete_item_small.gif",
+ Format.format( constants.AElementToDelInCollectionList(),
+ "tt" ),
+ new ClickListener() {
+ public void onClick(Widget w) {
+ field.collectionFieldList.remove( index );
+ calculateValueFromList();
+ refreshEditor();
+ }
+ } );
- hpanel.add(del);
+ hpanel.add( del );
- Image addPattern = new ImageButton("images/new_item_below.png");
- addPattern.setTitle(constants.AddElementBelow());
+ Image addPattern = new ImageButton( "images/new_item_below.png" );
+ addPattern.setTitle( constants.AddElementBelow() );
-
- addPattern.addClickListener(new ClickListener(){
+ addPattern.addClickListener( new ClickListener() {
public void onClick(Widget sender) {
- FieldData newFieldData = new FieldData();
- newFieldData.name = field.name;
- newFieldData.collectionType = field.collectionType;
- field.collectionFieldList.add(index+1,newFieldData);
- calculateValueFromList();
- refreshEditor();
+ FieldData newFieldData = new FieldData();
+ newFieldData.name = field.name;
+ newFieldData.collectionType = field.collectionType;
+ field.collectionFieldList.add( index + 1,
+ newFieldData );
+ calculateValueFromList();
+ refreshEditor();
}
- });
- hpanel.add(addPattern);
- Image moveDown = new ImageButton("images/shuffle_down.gif");
- moveDown.setTitle(constants.MoveDownListMove());
- moveDown.addClickListener(new ClickListener(){
+ } );
+ hpanel.add( addPattern );
+ Image moveDown = new ImageButton( "images/shuffle_down.gif" );
+ moveDown.setTitle( constants.MoveDownListMove() );
+ moveDown.addClickListener( new ClickListener() {
public void onClick(Widget sender) {
- if (index <field.collectionFieldList.size()-1){
- FieldData onMyLine =field.collectionFieldList.get(index);
- FieldData onDown =field.collectionFieldList.get(index+1);
- field.collectionFieldList.set(index+1,onMyLine);
- field.collectionFieldList.set(index,onDown);
- calculateValueFromList();
- refreshEditor();
- }
+ if ( index < field.collectionFieldList.size() - 1 ) {
+ FieldData onMyLine = field.collectionFieldList.get( index );
+ FieldData onDown = field.collectionFieldList.get( index + 1 );
+ field.collectionFieldList.set( index + 1,
+ onMyLine );
+ field.collectionFieldList.set( index,
+ onDown );
+ calculateValueFromList();
+ refreshEditor();
+ }
}
- });
- hpanel.add(moveDown);
+ } );
+ hpanel.add( moveDown );
- Image moveUp = new ImageButton("images/shuffle_up.gif");
- moveUp.setTitle(constants.MoveUpList());
- moveUp.addClickListener(new ClickListener(){
+ Image moveUp = new ImageButton( "images/shuffle_up.gif" );
+ moveUp.setTitle( constants.MoveUpList() );
+ moveUp.addClickListener( new ClickListener() {
public void onClick(Widget sender) {
- if (index >0){
- FieldData oneUp =field.collectionFieldList.get(index-1);
- FieldData onMyLine =field.collectionFieldList.get(index);
- field.collectionFieldList.set(index,oneUp);
- field.collectionFieldList.set(index-1,onMyLine);
- calculateValueFromList();
- refreshEditor();
- }
+ if ( index > 0 ) {
+ FieldData oneUp = field.collectionFieldList.get( index - 1 );
+ FieldData onMyLine = field.collectionFieldList.get( index );
+ field.collectionFieldList.set( index,
+ oneUp );
+ field.collectionFieldList.set( index - 1,
+ onMyLine );
+ calculateValueFromList();
+ refreshEditor();
+ }
}
- });
- hpanel.add(moveUp);
- panel.add(hpanel);
- i++;
+ } );
+ hpanel.add( moveUp );
+ panel.add( hpanel );
+ i++;
}
-
- if (this.field.collectionFieldList.size()==0){
- Image add = new ImageButton("images/new_item.gif", Format.format(constants.AElementToAddInCollectionList(), "tt"), new ClickListener() {
- public void onClick(Widget w) {
- FieldData newFieldData = new FieldData();
- newFieldData.name = field.name;
- newFieldData.collectionType = field.collectionType;
- field.collectionFieldList.add(newFieldData);
- calculateValueFromList();
- refreshEditor();
- }
- });
- panel.add(add);
+ if ( this.field.collectionFieldList.size() == 0 ) {
+ Image add = new ImageButton( "images/new_item.gif",
+ Format.format( constants.AElementToAddInCollectionList(),
+ "tt" ),
+ new ClickListener() {
+ public void onClick(Widget w) {
+ FieldData newFieldData = new FieldData();
+ newFieldData.name = field.name;
+ newFieldData.collectionType = field.collectionType;
+ field.collectionFieldList.add( newFieldData );
+ calculateValueFromList();
+ refreshEditor();
+ }
+ } );
+ panel.add( add );
}
return panel;
}
private void calculateValueFromList() {
- if (this.field.collectionFieldList == null || this.field.collectionFieldList.isEmpty()) {
+ if ( this.field.collectionFieldList == null || this.field.collectionFieldList.isEmpty() ) {
this.field.value = "=[]";
return;
}
StringBuffer listContent = new StringBuffer();
- for (final FieldData f : this.field.collectionFieldList) {
- listContent.append(',');
- if (f.value != null) {
- listContent.append(f.value.substring(1));
+ for ( final FieldData f : this.field.collectionFieldList ) {
+ listContent.append( ',' );
+ if ( f.value != null ) {
+ listContent.append( f.value.substring( 1 ) );
}
}
- this.field.value = "=[" + listContent.substring(1) + "]";
+ this.field.value = "=[" + listContent.substring( 1 ) + "]";
}
private void showTypeChoice(Widget w,
final FieldData con) {
- final FormStylePopup form = new FormStylePopup("images/newex_wiz.gif",
- constants.FieldValue());
+ final FormStylePopup form = new FormStylePopup( "images/newex_wiz.gif",
+ constants.FieldValue() );
- Button lit = new Button(constants.LiteralValue());
- lit.addClickListener(new ClickListener() {
+ Button lit = new Button( constants.LiteralValue() );
+ lit.addClickListener( new ClickListener() {
public void onClick(Widget w) {
con.nature = FieldData.TYPE_LITERAL;
- doTypeChosen(form);
+ doTypeChosen( form );
}
- });
- form.addAttribute(constants.LiteralValue() + ":",
- widgets(lit,
- new InfoPopup(constants.LiteralValue(),
- constants.LiteralValTip())));
+ } );
+ form.addAttribute( constants.LiteralValue() + ":",
+ widgets( lit,
+ new InfoPopup( constants.LiteralValue(),
+ constants.LiteralValTip() ) ) );
- form.addRow(new HTML("<hr/>"));
- form.addRow(new SmallLabel(constants.AdvancedOptions()));
+ form.addRow( new HTML( "<hr/>" ) );
+ form.addRow( new SmallLabel( constants.AdvancedOptions() ) );
// If we are here, then there must be a bound variable compatible with
// me
- if (isThereABoundVariableToSet() == true) {
- Button variable = new Button(constants.BoundVariable());
- variable.addClickListener(new ClickListener() {
+ if ( isThereABoundVariableToSet() == true ) {
+ Button variable = new Button( constants.BoundVariable() );
+ variable.addClickListener( new ClickListener() {
public void onClick(Widget w) {
con.nature = FieldData.TYPE_VARIABLE;
- doTypeChosen(form);
+ doTypeChosen( form );
}
- });
- form.addAttribute(constants.AVariable(),
- widgets(variable,
- new InfoPopup(constants.ABoundVariable(),
- constants.BoundVariableTip())));
+ } );
+ form.addAttribute( constants.AVariable(),
+ widgets( variable,
+ new InfoPopup( constants.ABoundVariable(),
+ constants.BoundVariableTip() ) ) );
}
- if (isItAList() == true) {
- Button variable = new Button(constants.GuidedList());
- variable.addClickListener(new ClickListener() {
+ if ( isItAList() == true ) {
+ Button variable = new Button( constants.GuidedList() );
+ variable.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- String factCollectionType = sce.getParametricFieldType(factType, field.name);
- con.setNature(FieldData.TYPE_COLLECTION, factCollectionType);
- doTypeChosen(form);
+ String factCollectionType = sce.getParametricFieldType( factType,
+ field.name );
+ con.setNature( FieldData.TYPE_COLLECTION,
+ factCollectionType );
+ doTypeChosen( form );
}
- });
- form.addAttribute(constants.AVariable(),
- widgets(variable,
- new InfoPopup(constants.AGuidedList(),
- constants.AGuidedListTip())));
+ } );
+ form.addAttribute( constants.AVariable(),
+ widgets( variable,
+ new InfoPopup( constants.AGuidedList(),
+ constants.AGuidedListTip() ) ) );
}
form.show();
}
private boolean isThereABoundVariableToSet() {
boolean retour = false;
- List vars = scenario.getFactNamesInScope(this.executionTrace,
- true);
- if (vars.size() > 0) {
- for (int i = 0; i < vars.size(); i++) {
- String var = (String) vars.get(i);
- Map m = this.scenario.getVariableTypes();
- FactData f = (FactData) scenario.getFactTypes().get(var);
+ List vars = parent.getScenario().getFactNamesInScope( this.executionTrace,
+ true );
+ if ( vars.size() > 0 ) {
+ for ( int i = 0; i < vars.size(); i++ ) {
+ String var = (String) vars.get( i );
+ Map m = this.parent.getScenario().getVariableTypes();
+ FactData f = (FactData) parent.getScenario().getFactTypes().get( var );
String fieldType = null;
- if (field.collectionType == null) {
- fieldType = sce.getFieldType(this.factType,
- field.name);
+ if ( field.collectionType == null ) {
+ fieldType = sce.getFieldType( this.factType,
+ field.name );
} else {
fieldType = field.collectionType;
}
- if (f.type.equals(fieldType)) {
+ if ( f.type.equals( fieldType ) ) {
retour = true;
break;
}
@@ -424,8 +438,9 @@
private boolean isItAList() {
boolean retour = false;
- String fieldType = sce.getFieldType(this.factType, field.name);
- if (fieldType != null && fieldType.equals("Collection")) {
+ String fieldType = sce.getFieldType( this.factType,
+ field.name );
+ if ( fieldType != null && fieldType.equals( "Collection" ) ) {
retour = true;
}
return retour;
@@ -439,9 +454,9 @@
private Panel widgets(Widget left,
Widget right) {
HorizontalPanel panel = new HorizontalPanel();
- panel.add(left);
- panel.add(right);
- panel.setWidth("100%");
+ panel.add( left );
+ panel.add( right );
+ panel.setWidth( "100%" );
return panel;
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GivenLabelButton.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GivenLabelButton.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GivenLabelButton.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -19,7 +19,6 @@
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -34,12 +33,10 @@
private Constants constants = ((Constants) GWT.create( Constants.class ));
public GivenLabelButton(ExecutionTrace previousEx,
- Scenario scenario,
- ExecutionTrace executionTrace,
- ScenarioWidget scenarioWidget) {
+ ExecutionTrace executionTrace,
+ ScenarioWidget scenarioWidget) {
add( new NewDataButton( previousEx,
- scenario,
executionTrace,
scenarioWidget ) );
add( new SmallLabel( constants.GIVEN() ) );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GivenPanel.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GivenPanel.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GivenPanel.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -23,7 +23,6 @@
import org.drools.ide.common.client.modeldriven.testing.FactData;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
import org.drools.ide.common.client.modeldriven.testing.FixturesMap;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -36,31 +35,26 @@
public GivenPanel(List<ExecutionTrace> listExecutionTrace,
int executionTraceLine,
FixturesMap given,
- final Scenario scenario,
final ScenarioWidget parent) {
for ( Map.Entry<String, FixtureList> e : given.entrySet() ) {
FixtureList itemList = given.get( e.getKey() );
if ( e.getKey().equals( ScenarioHelper.RETRACT_KEY ) ) {
add( new RetractWidget( itemList,
- scenario,
parent ) );
} else if ( e.getKey().equals( ScenarioHelper.ACTIVATE_RULE_FLOW_GROUP ) ) {
add( new ActivateRuleFlowWidget( itemList,
- scenario,
parent ) );
} else {
FactData first = (FactData) itemList.get( 0 );
if ( first.isModify ) {
add( new ModifyFactWidget( e.getKey(),
itemList,
- scenario,
parent,
listExecutionTrace.get( executionTraceLine ) ) );
} else {
add( new InsertFactWidget( e.getKey(),
itemList,
- scenario,
parent,
listExecutionTrace.get( executionTraceLine ) ) );
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalButton.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalButton.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalButton.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -21,7 +21,6 @@
import org.drools.guvnor.client.messages.Constants;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.FactData;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -41,17 +40,14 @@
private static Constants constants = ((Constants) GWT.create( Constants.class ));
- private final Scenario scenario;
private final ScenarioWidget parent;
private final SuggestionCompletionEngine suggestionCompletionEngine;
- public GlobalButton(final Scenario scenario,
- final ScenarioWidget parent) {
+ public GlobalButton(final ScenarioWidget parent) {
super( "images/new_item.gif",
constants.AddANewGlobalToThisScenario() );
- this.scenario = scenario;
this.parent = parent;
this.suggestionCompletionEngine = parent.suggestionCompletionEngine;
@@ -107,14 +103,14 @@
public void onClick(ClickEvent event) {
String text = factTypes.getItemText( factTypes.getSelectedIndex() );
- if ( scenario.isFactNameExisting( text ) ) {
+ if ( parent.getScenario().isFactNameExisting( text ) ) {
Window.alert( Format.format( constants.TheName0IsAlreadyInUsePleaseChooseAnotherName(),
text ) );
} else {
FactData factData = new FactData( suggestionCompletionEngine.getGlobalVariable( text ),
text,
false );
- scenario.globals.add( factData );
+ parent.getScenario().globals.add( factData );
parent.renderEditor();
hide();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalFactWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalFactWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalFactWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -18,7 +18,6 @@
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.gwtext.client.util.Format;
@@ -31,12 +30,10 @@
public GlobalFactWidget(String factType,
FixtureList definitionList,
- Scenario sc,
ScenarioWidget parent,
ExecutionTrace executionTrace) {
super( factType,
definitionList,
- sc,
parent,
executionTrace,
Format.format( constants.globalForScenario(),
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalPanel.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalPanel.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalPanel.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -20,19 +20,16 @@
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.user.client.ui.VerticalPanel;
public class GlobalPanel extends VerticalPanel {
public GlobalPanel(Map<String, FixtureList> globals,
- Scenario scenario,
ExecutionTrace previousEx,
ScenarioWidget scenarioWidget) {
for ( Map.Entry<String, FixtureList> e : globals.entrySet() ) {
add( new GlobalFactWidget( e.getKey(),
globals.get( e.getKey() ),
- scenario,
scenarioWidget,
previousEx ) );
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -21,7 +21,6 @@
import org.drools.ide.common.client.modeldriven.testing.FactData;
import org.drools.ide.common.client.modeldriven.testing.Fixture;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.gwtext.client.util.Format;
@@ -34,12 +33,10 @@
public InsertFactWidget(String factType,
FixtureList definitionList,
- Scenario scenario,
ScenarioWidget parent,
ExecutionTrace executionTrace) {
super( factType,
definitionList,
- scenario,
parent,
executionTrace,
Format.format( constants.insertForScenario(),
@@ -48,17 +45,17 @@
public void onDelete() {
boolean used = false;
-
+
for ( Fixture fixture : definitionList ) {
if ( fixture instanceof FactData ) {
final FactData factData = (FactData) fixture;
- if ( scenario.isFactNameUsed( factData ) ) {
+ if ( parent.getScenario().isFactNameUsed( factData ) ) {
used = true;
break;
}
}
}
-
+
if ( used ) {
ErrorPopup.showMessage( constants.CantRemoveThisBlockAsOneOfTheNamesIsBeingUsed() );
} else {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ModifyFactWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ModifyFactWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ModifyFactWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -18,7 +18,6 @@
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.gwtext.client.util.Format;
@@ -31,12 +30,10 @@
public ModifyFactWidget(String factType,
FixtureList definitionList,
- Scenario scenario,
ScenarioWidget parent,
ExecutionTrace executionTrace) {
super( factType,
definitionList,
- scenario,
parent,
executionTrace,
Format.format( constants.modifyForScenario(),
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/NewDataButton.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/NewDataButton.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/NewDataButton.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -24,7 +24,6 @@
import org.drools.ide.common.client.modeldriven.testing.FactData;
import org.drools.ide.common.client.modeldriven.testing.Fixture;
import org.drools.ide.common.client.modeldriven.testing.RetractFact;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -44,13 +43,11 @@
private final ExecutionTrace currentEx;
public NewDataButton(final ExecutionTrace previousEx,
- final Scenario scenario,
final ExecutionTrace currentEx,
ScenarioWidget scenarioWidget) {
super( "images/new_item.gif",
constants.AddANewDataInputToThisScenario(),
previousEx,
- scenario,
scenarioWidget );
this.currentEx = currentEx;
@@ -69,8 +66,8 @@
addAttribute( constants.InsertANewFact1(),
new InsertFactPanel() );
- List<String> varsInScope = scenario.getFactNamesInScope( currentEx,
- false );
+ List<String> varsInScope = parent.getScenario().getFactNamesInScope( currentEx,
+ false );
//now we do modifies & retracts
if ( varsInScope.size() > 0 ) {
addAttribute( constants.ModifyAnExistingFactScenario(),
@@ -121,7 +118,7 @@
@Override
public Fixture getFixture() {
String factName = valueWidget.getItemText( valueWidget.getSelectedIndex() );
- String type = scenario.getVariableTypes().get( factName );
+ String type = parent.getScenario().getVariableTypes().get( factName );
return new FactData( type,
factName,
@@ -146,12 +143,12 @@
if ( factName.equals( "" ) || factNameTextBox.getText().indexOf( ' ' ) > -1 ) {
Window.alert( constants.YouMustEnterAValidFactName() );
} else {
- if ( scenario.isFactNameExisting( factName ) ) {
+ if ( parent.getScenario().isFactNameExisting( factName ) ) {
Window.alert( Format.format( constants.TheFactName0IsAlreadyInUsePleaseChooseAnotherName(),
factName ) );
} else {
- scenario.insertBetween( previousEx,
- getFixture() );
+ parent.getScenario().insertBetween( previousEx,
+ getFixture() );
parent.renderEditor();
hide();
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/RetractWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/RetractWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/RetractWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -42,15 +42,12 @@
private Constants constants = ((Constants) GWT.create( Constants.class ));
protected final FixtureList retractList;
- protected final Scenario scenario;
protected final ScenarioWidget parent;
public RetractWidget(FixtureList retractList,
- Scenario scenario,
ScenarioWidget parent) {
this.retractList = retractList;
- this.scenario = scenario;
this.parent = parent;
render();
@@ -100,7 +97,7 @@
addClickHandler( new ClickHandler() {
public void onClick(ClickEvent event) {
retractList.remove( retractFact );
- scenario.fixtures.remove( retractFact );
+ parent.getScenario().fixtures.remove( retractFact );
parent.renderEditor();
}
} );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -61,7 +61,6 @@
protected final SuggestionCompletionEngine suggestionCompletionEngine;
private ChangeListener ruleSelectionCL;
final RuleAsset asset;
- private final Scenario scenario;
final VerticalPanel layout;
boolean showResults;
@@ -79,9 +78,8 @@
this.suggestionCompletionEngine = SuggestionCompletionCache.getInstance().getEngineFromCache( asset.metaData.packageName );
- scenario = (Scenario) asset.content;
- if ( scenario.fixtures.size() == 0 ) {
- scenario.fixtures.add( new ExecutionTrace() );
+ if ( getScenario().fixtures.size() == 0 ) {
+ getScenario().fixtures.add( new ExecutionTrace() );
}
if ( !asset.isreadonly ) {
@@ -112,7 +110,7 @@
this.layout.add( editorLayout );
ScenarioHelper scenarioHelper = new ScenarioHelper();
- List<Fixture> fixtures = scenarioHelper.lumpyMap( scenario.fixtures );
+ List<Fixture> fixtures = scenarioHelper.lumpyMap( getScenario().fixtures );
List<ExecutionTrace> listExecutionTrace = new ArrayList<ExecutionTrace>();
for ( int i = 0; i < fixtures.size(); i++ ) {
final Object fixture = fixtures.get( i );
@@ -131,7 +129,6 @@
0,
new ExpectPanel( asset.metaData.packageName,
previousEx,
- scenario,
this ) );
executionTraceLine++;
@@ -150,7 +147,6 @@
editorLayout.setWidget( layoutRow,
0,
new GivenLabelButton( previousEx,
- scenario,
listExecutionTrace.get( executionTraceLine ),
this ) );
@@ -172,14 +168,13 @@
1,
new VerifyFactsPanel( fixturesList,
listExecutionTrace.get( executionTraceLine ),
- scenario,
this,
showResults ) );
} else if ( first instanceof VerifyRuleFired ) {
editorLayout.setWidget( layoutRow,
1,
new VerifyRulesFiredWidget( fixturesList,
- scenario,
+ this,
showResults ) );
}
@@ -190,8 +185,7 @@
//add more execution sections.
editorLayout.setWidget( layoutRow,
0,
- new AddExecuteButton( scenario,
- this ) );
+ new AddExecuteButton( this ) );
layoutRow++;
editorLayout.setWidget( layoutRow,
@@ -201,16 +195,14 @@
//config section
editorLayout.setWidget( layoutRow,
1,
- new ConfigWidget( scenario,
- asset.metaData.packageName,
+ new ConfigWidget( asset.metaData.packageName,
this ) );
layoutRow++;
//global section
HorizontalPanel h = new HorizontalPanel();
- h.add( new GlobalButton( scenario,
- this ) );
+ h.add( new GlobalButton( this ) );
h.add( new SmallLabel( constants.globals() ) );
editorLayout.setWidget( layoutRow,
0,
@@ -218,8 +210,7 @@
editorLayout.setWidget( layoutRow,
1,
- new GlobalPanel( scenarioHelper.lumpyMapGlobals( scenario.globals ),
- scenario,
+ new GlobalPanel( scenarioHelper.lumpyMapGlobals( getScenario().globals ),
previousEx,
this ) );
}
@@ -232,7 +223,6 @@
return new GivenPanel( listExecutionTrace,
executionTraceLine,
given,
- scenario,
this );
} else {
@@ -348,4 +338,12 @@
width,
percent );
}
+
+ public Scenario getScenario() {
+ return (Scenario) asset.content;
+ }
+
+ public void setScenario(Scenario scenario) {
+ asset.content = scenario;
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestRunnerWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestRunnerWidget.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestRunnerWidget.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -41,206 +41,256 @@
* Time: 19:27:09
* To change this template use File | Settings | File Templates.
*/
-public /**
- * Runs the test, plus shows a summary view of the results.
- */
+public/**
+* Runs the test, plus shows a summary view of the results.
+*/
class TestRunnerWidget extends Composite {
- FlexTable results = new FlexTable();
- //Grid layout = new Grid(2, 1);
- VerticalPanel layout = new VerticalPanel();
+ FlexTable results = new FlexTable();
+ //Grid layout = new Grid(2, 1);
+ VerticalPanel layout = new VerticalPanel();
- //private HorizontalPanel busy = new HorizontalPanel();
- private SimplePanel actions = new SimplePanel();
- private Constants constants = ((Constants) GWT.create(Constants.class));
+ //private HorizontalPanel busy = new HorizontalPanel();
+ private SimplePanel actions = new SimplePanel();
+ private Constants constants = ((Constants) GWT.create( Constants.class ));
- public TestRunnerWidget(final ScenarioWidget parent, final String packageName) {
+ public TestRunnerWidget(final ScenarioWidget parent,
+ final String packageName) {
- final Button run = new Button(constants.RunScenario());
- run.setTitle(constants.RunScenarioTip());
- run.addClickListener(new ClickListener() {
- public void onClick(Widget w) {
- LoadingPopup.showMessage(constants.BuildingAndRunningScenario());
- RepositoryServiceFactory.getService().runScenario(parent.asset.metaData.packageName, (Scenario) parent.asset.content, new GenericCallback<SingleScenarioResult>() {
- public void onSuccess(SingleScenarioResult data) {
- LoadingPopup.close();
- layout.clear();
- layout.add(actions);
- layout.add(results);
- actions.setVisible(true);
- ScenarioRunResult result = data.result;
- if (result.errors != null) {
- showErrors(result.errors);
- } else {
- showResults(parent, data);
- }
- }
- });
- }
- });
+ final Button run = new Button( constants.RunScenario() );
+ run.setTitle( constants.RunScenarioTip() );
+ run.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ LoadingPopup.showMessage( constants.BuildingAndRunningScenario() );
+ RepositoryServiceFactory.getService().runScenario( parent.asset.metaData.packageName,
+ (Scenario) parent.asset.content,
+ new GenericCallback<SingleScenarioResult>() {
+ public void onSuccess(SingleScenarioResult data) {
+ LoadingPopup.close();
+ layout.clear();
+ layout.add( actions );
+ layout.add( results );
+ actions.setVisible( true );
+ ScenarioRunResult result = data.result;
+ if ( result.errors != null ) {
+ showErrors( result.errors );
+ } else {
+ showResults( parent,
+ data );
+ }
+ }
+ } );
+ }
+ } );
- actions.add(run);
- layout.add(actions);
- initWidget(layout);
- }
+ actions.add( run );
+ layout.add( actions );
+ initWidget( layout );
+ }
+ private void showErrors(BuilderResultLine[] rs) {
+ results.clear();
+ results.setVisible( true );
- private void showErrors(BuilderResultLine[] rs) {
- results.clear();
- results.setVisible(true);
-
FlexTable errTable = new FlexTable();
errTable.setStyleName( "build-Results" );
for ( int i = 0; i < rs.length; i++ ) {
int row = i;
final BuilderResultLine res = rs[i];
- errTable.setWidget( row, 0, new Image("images/error.gif"));
- if( res.assetFormat.equals( "package" )) {
- errTable.setText( row, 1, constants.packageConfigurationProblem1() + res.message );
+ errTable.setWidget( row,
+ 0,
+ new Image( "images/error.gif" ) );
+ if ( res.assetFormat.equals( "package" ) ) {
+ errTable.setText( row,
+ 1,
+ constants.packageConfigurationProblem1() + res.message );
} else {
- errTable.setText( row, 1, "[" + res.assetName + "] " + res.message );
+ errTable.setText( row,
+ 1,
+ "[" + res.assetName + "] " + res.message );
}
}
- ScrollPanel scroll = new ScrollPanel(errTable);
+ ScrollPanel scroll = new ScrollPanel( errTable );
scroll.setWidth( "100%" );
- results.setWidget(0, 0, scroll);
+ results.setWidget( 0,
+ 0,
+ scroll );
- }
+ }
- private void showResults(final ScenarioWidget parent,
- final SingleScenarioResult data) {
- results.clear();
- results.setVisible(true);
+ private void showResults(final ScenarioWidget parent,
+ final SingleScenarioResult data) {
+ results.clear();
+ results.setVisible( true );
- parent.asset.content = data.result.scenario;
- parent.showResults = true;
- parent.renderEditor();
+ parent.setScenario( data.result.scenario );
+ parent.showResults = true;
+ parent.renderEditor();
- int failures = 0;
- int total = 0;
- VerticalPanel resultsDetail = new VerticalPanel();
+ int failures = 0;
+ int total = 0;
+ VerticalPanel resultsDetail = new VerticalPanel();
+ for ( Iterator iterator = data.result.scenario.fixtures.iterator(); iterator.hasNext(); ) {
+ Fixture f = (Fixture) iterator.next();
+ if ( f instanceof VerifyRuleFired ) {
- for (Iterator iterator = data.result.scenario.fixtures.iterator(); iterator.hasNext();) {
- Fixture f = (Fixture) iterator.next();
- if (f instanceof VerifyRuleFired) {
+ VerifyRuleFired vr = (VerifyRuleFired) f;
+ HorizontalPanel h = new HorizontalPanel();
+ if ( !vr.successResult.booleanValue() ) {
+ h.add( new Image( "images/warning.gif" ) );
+ failures++;
+ } else {
+ h.add( new Image( "images/test_passed.png" ) );
+ }
+ h.add( new SmallLabel( vr.explanation ) );
+ resultsDetail.add( h );
+ total++;
+ } else if ( f instanceof VerifyFact ) {
+ VerifyFact vf = (VerifyFact) f;
+ for ( Iterator it = vf.fieldValues.iterator(); it.hasNext(); ) {
+ total++;
+ VerifyField vfl = (VerifyField) it.next();
+ HorizontalPanel h = new HorizontalPanel();
+ if ( !vfl.successResult.booleanValue() ) {
+ h.add( new Image( "images/warning.gif" ) );
+ failures++;
+ } else {
+ h.add( new Image( "images/test_passed.png" ) );
+ }
+ h.add( new SmallLabel( vfl.explanation ) );
+ resultsDetail.add( h );
+ }
- VerifyRuleFired vr = (VerifyRuleFired)f;
- HorizontalPanel h = new HorizontalPanel();
- if (!vr.successResult.booleanValue()) {
- h.add(new Image("images/warning.gif"));
- failures++;
- } else {
- h.add(new Image("images/test_passed.png"));
- }
- h.add(new SmallLabel(vr.explanation));
- resultsDetail.add(h);
- total++;
- } else if (f instanceof VerifyFact) {
- VerifyFact vf = (VerifyFact)f;
- for (Iterator it = vf.fieldValues.iterator(); it.hasNext();) {
- total++;
- VerifyField vfl = (VerifyField) it.next();
- HorizontalPanel h = new HorizontalPanel();
- if (!vfl.successResult.booleanValue()) {
- h.add(new Image("images/warning.gif"));
- failures++;
- } else {
- h.add(new Image("images/test_passed.png"));
- }
- h.add(new SmallLabel(vfl.explanation));
- resultsDetail.add(h);
- }
+ } else if ( f instanceof ExecutionTrace ) {
+ ExecutionTrace ex = (ExecutionTrace) f;
+ if ( ex.numberOfRulesFired == data.result.scenario.maxRuleFirings ) {
+ Window.alert( Format.format( constants.MaxRuleFiringsReachedWarning(),
+ data.result.scenario.maxRuleFirings ) );
+ }
+ }
+ }
- } else if (f instanceof ExecutionTrace) {
- ExecutionTrace ex = (ExecutionTrace) f;
- if (ex.numberOfRulesFired == data.result.scenario.maxRuleFirings) {
- Window.alert(Format.format(constants.MaxRuleFiringsReachedWarning(), data.result.scenario.maxRuleFirings));
- }
- }
+ results.setWidget( 0,
+ 0,
+ new SmallLabel( constants.Results() ) );
+ results.getFlexCellFormatter().setHorizontalAlignment( 0,
+ 0,
+ HasHorizontalAlignment.ALIGN_RIGHT );
+ if ( failures > 0 ) {
+ results.setWidget( 0,
+ 1,
+ ScenarioWidget.getBar( "#CC0000",
+ 150,
+ failures,
+ total ) );
+ } else {
+ results.setWidget( 0,
+ 1,
+ ScenarioWidget.getBar( "GREEN",
+ 150,
+ failures,
+ total ) );
+ }
+ results.setWidget( 1,
+ 0,
+ new SmallLabel( constants.SummaryColon() ) );
+ results.getFlexCellFormatter().setHorizontalAlignment( 1,
+ 0,
+ HasHorizontalAlignment.ALIGN_RIGHT );
+ results.setWidget( 1,
+ 1,
+ resultsDetail );
+ results.setWidget( 2,
+ 0,
+ new SmallLabel( constants.AuditLogColon() ) );
- }
+ final Button showExp = new Button( constants.ShowEventsButton() );
+ results.setWidget( 2,
+ 1,
+ showExp );
+ showExp.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ showExp.setVisible( false );
+ results.setWidget( 2,
+ 1,
+ doAuditView( data.auditLog ) );
+ }
+ } );
- results.setWidget(0, 0, new SmallLabel(constants.Results()));
- results.getFlexCellFormatter().setHorizontalAlignment(0, 0, HasHorizontalAlignment.ALIGN_RIGHT);
- if (failures > 0) {
- results.setWidget(0, 1, ScenarioWidget.getBar("#CC0000" , 150, failures, total));
- } else {
- results.setWidget(0, 1, ScenarioWidget.getBar("GREEN" , 150, failures, total));
- }
+ }
- results.setWidget(1, 0, new SmallLabel(constants.SummaryColon()));
- results.getFlexCellFormatter().setHorizontalAlignment(1, 0, HasHorizontalAlignment.ALIGN_RIGHT);
- results.setWidget(1, 1, resultsDetail);
- results.setWidget(2, 0, new SmallLabel(constants.AuditLogColon()));
+ private Widget doAuditView(List<String[]> auditLog) {
+ VerticalPanel vp = new VerticalPanel();
+ vp.add( new HTML( "<hr/>" ) );
+ FlexTable g = new FlexTable();
+ String indent = "";
+ int row = 0;
+ boolean firing = false;
+ for ( int i = 0; i < auditLog.size(); i++ ) {
+ String[] lg = auditLog.get( i );
- final Button showExp = new Button(constants.ShowEventsButton());
- results.setWidget(2, 1, showExp);
- showExp.addClickListener(new ClickListener() {
- public void onClick(Widget w) {
- showExp.setVisible(false);
- results.setWidget(2, 1, doAuditView(data.auditLog));
- }
- });
+ int id = Integer.parseInt( lg[0] );
+ if ( id <= 7 ) {
+ if ( id <= 3 ) {
+ if ( !firing ) {
+ g.setWidget( row,
+ 0,
+ new Image( "images/audit_events/" + lg[0] + ".gif" ) );
+ g.setWidget( row,
+ 1,
+ new SmallLabel( lg[1] ) );
+ } else {
+ g.setWidget( row,
+ 1,
+ hz( new Image( "images/audit_events/" + lg[0] + ".gif" ),
+ new SmallLabel( lg[1] ) ) );
+ }
+ row++;
+ } else if ( id == 6 ) {
+ firing = true;
+ g.setWidget( row,
+ 0,
+ new Image( "images/audit_events/" + lg[0] + ".gif" ) );
+ g.setWidget( row,
+ 1,
+ new SmallLabel( "<b>" + lg[1] + "</b>" ) );
+ row++;
+ } else if ( id == 7 ) {
+ firing = false;
+ } else {
+ g.setWidget( row,
+ 0,
+ new Image( "images/audit_events/" + lg[0] + ".gif" ) );
+ g.setWidget( row,
+ 1,
+ new SmallLabel( "<font color='grey'>" + lg[1] + "</font>" ) );
+ row++;
+ }
+ } else {
+ g.setWidget( row,
+ 0,
+ new Image( "images/audit_events/misc_event.gif" ) );
+ g.setWidget( row,
+ 1,
+ new SmallLabel( "<font color='grey'>" + lg[1] + "</font>" ) );
+ row++;
+ }
+ }
+ vp.add( g );
+ vp.add( new HTML( "<hr/>" ) );
+ return vp;
+ }
-
-
- }
-
-
-
- private Widget doAuditView(List<String[]> auditLog) {
- VerticalPanel vp = new VerticalPanel();
- vp.add(new HTML("<hr/>"));
- FlexTable g = new FlexTable();
- String indent = "";
- int row = 0;
- boolean firing = false;
- for (int i = 0; i < auditLog.size(); i++) {
- String[] lg = auditLog.get(i);
-
- int id = Integer.parseInt(lg[0]);
- if (id <= 7) {
- if (id <= 3) {
- if (!firing) {
- g.setWidget(row, 0, new Image("images/audit_events/" + lg[0] + ".gif"));
- g.setWidget(row, 1, new SmallLabel(lg[1]));
- } else {
- g.setWidget(row, 1, hz(new Image("images/audit_events/" + lg[0] + ".gif"), new SmallLabel(lg[1])));
- }
- row++;
- } else if (id == 6) {
- firing = true;
- g.setWidget(row, 0, new Image("images/audit_events/" + lg[0] + ".gif"));
- g.setWidget(row, 1, new SmallLabel("<b>" + lg[1] + "</b>"));
- row++;
- } else if (id == 7) {
- firing = false;
- } else {
- g.setWidget(row, 0, new Image("images/audit_events/" + lg[0] + ".gif"));
- g.setWidget(row, 1, new SmallLabel("<font color='grey'>" + lg[1] + "</font>"));
- row++;
- }
- } else {
- g.setWidget(row, 0, new Image("images/audit_events/misc_event.gif"));
- g.setWidget(row, 1, new SmallLabel("<font color='grey'>" + lg[1] + "</font>"));
- row++;
- }
- }
- vp.add(g);
- vp.add(new HTML("<hr/>"));
- return vp;
- }
-
-
- private Widget hz(Image image, SmallLabel smallLabel) {
- HorizontalPanel h = new HorizontalPanel();
- h.add(image);
- h.add(smallLabel);
- return h;
- }
+ private Widget hz(Image image,
+ SmallLabel smallLabel) {
+ HorizontalPanel h = new HorizontalPanel();
+ h.add( image );
+ h.add( smallLabel );
+ return h;
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestScenarioButton.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestScenarioButton.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestScenarioButton.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -25,7 +25,6 @@
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.Fixture;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -44,7 +43,6 @@
protected static Constants constants = ((Constants) GWT.create( Constants.class ));
- protected final Scenario scenario;
protected final ScenarioWidget parent;
protected final SuggestionCompletionEngine suggestionCompletionEngine;
protected final ExecutionTrace previousEx;
@@ -52,12 +50,10 @@
public TestScenarioButton(String img,
String tooltip,
final ExecutionTrace previousEx,
- final Scenario scenario,
ScenarioWidget scenarioWidget) {
super( img,
tooltip );
this.previousEx = previousEx;
- this.scenario = scenario;
this.parent = scenarioWidget;
this.suggestionCompletionEngine = scenarioWidget.suggestionCompletionEngine;
@@ -100,8 +96,8 @@
public void onClick(ClickEvent event) {
- scenario.insertBetween( previousEx,
- getFixture() );
+ parent.getScenario().insertBetween( previousEx,
+ getFixture() );
parent.renderEditor();
hide();
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/VerifyFactsPanel.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/VerifyFactsPanel.java 2010-10-29 12:28:18 UTC (rev 35796)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/VerifyFactsPanel.java 2010-10-29 13:17:00 UTC (rev 35797)
@@ -42,17 +42,13 @@
private Constants constants = ((Constants) GWT.create( Constants.class ));
- private final Scenario scenario;
-
private final ScenarioWidget parent;
public VerifyFactsPanel(FixtureList verifyFacts,
ExecutionTrace executionTrace,
- final Scenario scenario,
ScenarioWidget scenarioWidget,
boolean showResults) {
- this.scenario = scenario;
this.parent = scenarioWidget;
SuggestionCompletionEngine suggestionCompletionEngine = scenarioWidget.suggestionCompletionEngine;
@@ -63,10 +59,10 @@
HorizontalPanel column = new HorizontalPanel();
column.add( new VerifyFactWidget( verifyFact,
- scenario,
suggestionCompletionEngine,
executionTrace,
- showResults ) );
+ showResults,
+ scenarioWidget ) );
column.add( new DeleteButton( verifyFact ) );
@@ -84,7 +80,7 @@
public void onClick(ClickEvent event) {
if ( Window.confirm( constants.AreYouSureYouWantToRemoveThisExpectation() ) ) {
- scenario.removeFixture( verifyFact );
+ parent.getScenario().removeFixture( verifyFact );
parent.renderEditor();
}
}
More information about the jboss-svn-commits
mailing list