[jboss-svn-commits] JBL Code SVN: r20741 - in labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor: server/builder and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 24 20:00:27 EDT 2008
Author: michael.neale at jboss.com
Date: 2008-06-24 20:00:27 -0400 (Tue, 24 Jun 2008)
New Revision: 20741
Modified:
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
Log:
how embarrasing to miss these
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java 2008-06-24 23:11:32 UTC (rev 20740)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java 2008-06-25 00:00:27 UTC (rev 20741)
@@ -54,6 +54,7 @@
assertTrue(AssetFormats.isPackageDependency(AssetFormats.MODEL));
assertTrue(AssetFormats.isPackageDependency(AssetFormats.FUNCTION));
assertTrue(AssetFormats.isPackageDependency( AssetFormats.ENUMERATION ));
+ assertTrue(AssetFormats.isPackageDependency( AssetFormats.DRL_MODEL ));
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2008-06-24 23:11:32 UTC (rev 20740)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2008-06-25 00:00:27 UTC (rev 20741)
@@ -195,12 +195,46 @@
Thread.currentThread().setContextClassLoader(oldCL);
- builder.addPackageFromDrl(new StringReader("package foo\n import com.billasurf.Board"));
+ builder.addPackageFromDrl(new StringReader("package foo\n import com.billasurf.Board"));
Object o2 = builder.getPackageRegistry( "foo" ).getTypeResolver().resolveType("Board");
assertNotNull(o2);
assertEquals("com.billasurf.Board", ((Class)o2).getName());
}
+ public void testSimplePackageWithDeclaredTypes() throws Exception {
+ RulesRepository repo = getRepo();
+
+ PackageItem pkg = repo.createPackage( "testSimplePackageWithDeclaredTypes", "" );
+
+ AssetItem rule1 = pkg.addAsset( "rule_1", "" );
+ rule1.updateFormat( AssetFormats.DRL );
+ rule1.updateContent( "rule 'rule1' \n when Album() \n then System.err.println(42); \n end");
+ rule1.checkin( "" );
+
+
+ AssetItem model = pkg.addAsset( "model", "qed" );
+ model.updateFormat( AssetFormats.DRL_MODEL );
+
+ model.updateContent("declare Album\n genre: String \n end");
+ model.checkin( "" );
+
+ repo.save();
+
+ ContentPackageAssembler asm = new ContentPackageAssembler(pkg);
+ assertFalse(asm.hasErrors());
+ assertNotNull(asm.getBinaryPackage());
+ Package bin = asm.getBinaryPackage();
+ assertEquals(pkg.getName(), bin.getName());
+ assertTrue(bin.isValid());
+
+ asm = new ContentPackageAssembler(pkg, false);
+ String drl = asm.getDRL();
+
+ assertTrue(drl.indexOf("declare Album") > -1);
+
+
+ }
+
public void testSimplePackageBuildNoErrors() throws Exception {
RulesRepository repo = getRepo();
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java 2008-06-24 23:11:32 UTC (rev 20740)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java 2008-06-25 00:00:27 UTC (rev 20741)
@@ -46,6 +46,7 @@
assertTrue(ContentManager.getHandler( AssetFormats.DECISION_SPREADSHEET_XLS ) instanceof DecisionTableXLSHandler);
assertTrue(ContentManager.getHandler( AssetFormats.ENUMERATION ) instanceof EnumerationContentHandler);
assertTrue(ContentManager.getHandler( AssetFormats.DECISION_TABLE_GUIDED ) instanceof GuidedDTContentHandler);
+ assertTrue(ContentManager.getHandler( AssetFormats.DRL_MODEL ) instanceof FactModelContentHandler);
@@ -61,6 +62,7 @@
assertTrue(ContentManager.getHandler( AssetFormats.DECISION_SPREADSHEET_XLS ).isRuleAsset());
assertTrue(ContentManager.getHandler( AssetFormats.DECISION_TABLE_GUIDED ).isRuleAsset());
+ assertFalse(ContentManager.getHandler( AssetFormats.DRL_MODEL ).isRuleAsset());
assertFalse(ContentManager.getHandler( AssetFormats.DSL ).isRuleAsset());
assertFalse(ContentManager.getHandler( AssetFormats.MODEL ).isRuleAsset());
assertFalse(ContentManager.getHandler( AssetFormats.ENUMERATION ).isRuleAsset());
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java 2008-06-24 23:11:32 UTC (rev 20740)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java 2008-06-25 00:00:27 UTC (rev 20741)
@@ -11,6 +11,7 @@
import org.drools.guvnor.client.factmodel.FactModels;
import org.drools.guvnor.client.factmodel.FieldMetaModel;
import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleContentText;
import org.drools.guvnor.server.builder.BRMSPackageBuilder;
import org.drools.guvnor.server.builder.ContentPackageAssembler;
import org.drools.guvnor.server.builder.ContentPackageAssembler.ErrorLogger;
@@ -66,39 +67,8 @@
}
- public void testSource() throws Exception {
- FactModelContentHandler ch = new FactModelContentHandler();
- RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
- PackageItem pkg = repo.loadDefaultPackage();
- AssetItem asset = pkg.addAsset( "testDeclaredTypeSource", "" );
- asset.updateFormat("model.drl");
- asset.updateContent("declare Foo\n end");
- asset.checkin("");
- StringBuffer buf = new StringBuffer();
- ch.assembleDRL(null, asset, buf);
- assertEquals("declare Foo\n end", buf.toString());
-
- }
-
- public void testCompile() throws Exception {
- FactModelContentHandler ch = new FactModelContentHandler();
-
- RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
- PackageItem pkg = repo.loadDefaultPackage();
- AssetItem asset = pkg.addAsset( "testDeclaredTypeCompile", "" );
- asset.updateFormat("model.drl");
- asset.updateContent("declare Foo\n name: String\n end");
- asset.checkin("");
-
- BRMSPackageBuilder builder = BRMSPackageBuilder.getInstance(Collections.EMPTY_LIST);
-
- ch.compile(builder, asset, null);
- assertFalse(builder.hasErrors());
-
- }
-
public void testStore() throws Exception {
FactModelContentHandler ch = new FactModelContentHandler();
@@ -129,6 +99,16 @@
assertTrue(asset.getContent().indexOf("age: int") > -1);
+ asset.updateContent("rubbish here");
+ asset.checkin("");
+
+ ch.retrieveAssetContent(ass, pkg, asset);
+ assertTrue(ass.content instanceof RuleContentText);
+
+ ch.storeAssetContent(ass, asset);
+
+ assertEquals("rubbish here", asset.getContent());
+
}
}
More information about the jboss-svn-commits
mailing list