[jboss-svn-commits] JBL Code SVN: r19335 - in labs/jbossrules/branches/mic_20080325/drools-jbrms/src: main/java/org/drools/brms/client/qa and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 31 04:52:26 EDT 2008
Author: michael.neale at jboss.com
Date: 2008-03-31 04:52:26 -0400 (Mon, 31 Mar 2008)
New Revision: 19335
Modified:
labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditor.java
labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java
labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java
labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
labs/jbossrules/branches/mic_20080325/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
general fixes for testing QA
Modified: labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditor.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditor.java 2008-03-31 08:51:16 UTC (rev 19334)
+++ labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditor.java 2008-03-31 08:52:26 UTC (rev 19335)
@@ -225,7 +225,7 @@
}
}
- if (currentValue != null && !selected) {
+ if (currentValue != null && !"".equals(currentValue) && !selected) {
//need to add this value
box.addItem( currentValue, currentValue );
box.setSelectedIndex( enumeratedValues.length );
Modified: labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2008-03-31 08:51:16 UTC (rev 19334)
+++ labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2008-03-31 08:52:26 UTC (rev 19335)
@@ -148,7 +148,7 @@
//HorizontalPanel ab = new HorizontalPanel();
//ab.setStyleName( "composite-fact-pattern" );
horiz.add( edit );
- horiz.add( new HTML("<i>" + desc + " </i>") );
+ horiz.add( new SmallLabel(desc) );
//horiz.add( ab );
Modified: labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java 2008-03-31 08:51:16 UTC (rev 19334)
+++ labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java 2008-03-31 08:52:26 UTC (rev 19335)
@@ -222,34 +222,30 @@
final FormStylePopup pop = new FormStylePopup("images/rule_asset.gif", "New global");
final ListBox factTypes = new ListBox();
- for (int i = 0; i < sce.factTypes.length; i++) {
- factTypes.addItem(sce.factTypes[i]);
- }
- final TextBox factName = new TextBox();
- factName.setVisibleLength(5);
+ for (Iterator iterator = sce.globalTypes.keySet().iterator(); iterator
+ .hasNext();) {
+ String g = (String) iterator.next();
+ factTypes.addItem(g);
+ }
Button add = new Button("Add");
add.addClickListener(new ClickListener() {
public void onClick(Widget w) {
- String fn = ("" + factName.getText()).trim();
- if (fn.equals("")
- || factName.getText().indexOf(' ') > -1) {
- Window.alert("You must enter a valid name.");
- } else {
+ String fn = factTypes.getItemText(factTypes.getSelectedIndex());
if (scenario.isFactNameExisting(fn)) {
Window.alert("The name [" + fn + "] is already in use. Please choose another name.");
} else {
- scenario.globals.add(new FactData(factTypes.getItemText(factTypes.getSelectedIndex()), factName.getText(), new ArrayList(), false ));
+ FactData ng = new FactData((String) sce.globalTypes.get(fn), fn, new ArrayList(), false);
+ scenario.globals.add(ng);
renderEditor();
pop.hide();
}
- }
}
});
HorizontalPanel insertFact = new HorizontalPanel();
- insertFact.add(factTypes); insertFact.add(new SmallLabel("Fact name:")); insertFact.add(factName); insertFact.add(add);
- pop.addAttribute("New global:", insertFact);
+ insertFact.add(factTypes); insertFact.add(add);
+ pop.addAttribute("Global:", insertFact);
pop.show();
}
@@ -586,6 +582,7 @@
scenario = sc;
this.sce = sce;
this.type = factType;
+
this.parent = parent;
outer.getCellFormatter().setStyleName(0, 0, "modeller-fact-TypeHeader");
outer.getCellFormatter().setAlignment(0, 0, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_MIDDLE );
@@ -1193,6 +1190,7 @@
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);
@@ -1202,6 +1200,8 @@
}
});
+ b.addItem("Choose...");
+
num.addChangeListener(new ChangeListener() {
public void onChange(Widget w) {
v.expectedCount = new Integer(num.getText());
Modified: labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2008-03-31 08:51:16 UTC (rev 19334)
+++ labs/jbossrules/branches/mic_20080325/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2008-03-31 08:52:26 UTC (rev 19335)
@@ -32,6 +32,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import java.util.regex.Matcher;
@@ -42,6 +43,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
+import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
@@ -1178,7 +1180,17 @@
RuleBase rb = ruleBaseCache.get(item.getUUID());
Package bin = rb.getPackages()[0];
- ClassTypeResolver res = new ClassTypeResolver(bin.getImports().keySet(), cl);
+
+ Set<String> imps = bin.getImports().keySet();
+ Set<String> allImps = new HashSet<String>(imps);
+ if (bin.getGlobals() != null) {
+ for (Iterator iterator = bin.getGlobals().keySet().iterator(); iterator.hasNext();) {
+ Class c = (Class) bin.getGlobals().get(iterator.next());
+ allImps.add(c.getName());
+ }
+ }
+
+ ClassTypeResolver res = new ClassTypeResolver(allImps, cl);
InternalWorkingMemory workingMemory = (InternalWorkingMemory) rb.newStatefulSession(false);
return runScenario(scenario, res, workingMemory);
}
@@ -1247,6 +1259,13 @@
RuleAsset asset = loadAsset((AssetItem) it.next());
Scenario sc = (Scenario) asset.content;
sc = runScenario(sc, res, workingMemory).scenario;
+
+ //clean out WM
+ Iterator<FactHandle> fhs = workingMemory.iterateFactHandles();
+ while(fhs.hasNext()) {
+ workingMemory.retract(fhs.next());
+ }
+
int[] totals = sc.countFailuresTotal();
resultSummaries.add(new ScenarioResultSummary(totals[0], totals[1], asset.metaData.name, asset.metaData.description, asset.uuid));
}
Modified: labs/jbossrules/branches/mic_20080325/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2008-03-31 08:51:16 UTC (rev 19334)
+++ labs/jbossrules/branches/mic_20080325/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2008-03-31 08:52:26 UTC (rev 19335)
@@ -1510,7 +1510,7 @@
RulesRepository repo = impl.repository;
PackageItem pkg = repo.createPackage("testScenarioRun", "");
- pkg.updateHeader("import org.drools.Person");
+ pkg.updateHeader("import org.drools.Person\n global org.drools.Cheese cheese\n");
AssetItem rule1 = pkg.addAsset("rule_1", "");
rule1.updateFormat(AssetFormats.DRL);
rule1
@@ -1536,6 +1536,12 @@
vf.fieldValues.add(new VerifyField("age", "42", "=="));
sc.fixtures.add(vf);
+ FactData cheese = new FactData();
+ cheese.name = "cheese";
+ cheese.type = "Cheese";
+ cheese.fieldData.add(new FieldData("price", "42"));
+ sc.globals.add(cheese);
+
ScenarioRunResult res = impl.runScenario(pkg.getName(), sc);
assertEquals(null, res.errors);
assertNotNull(res.scenario);
More information about the jboss-svn-commits
mailing list