[jboss-svn-commits] JBL Code SVN: r14623 - in labs/jbossrules/trunk/drools-jbrms/src: test/java/org/drools/brms/server and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2007-08-27 00:05:44 -0400 (Mon, 27 Aug 2007)
New Revision: 14623

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/BRLContentHandler.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
JBRULES-1106

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/BRLContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/BRLContentHandler.java	2007-08-27 04:04:30 UTC (rev 14622)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/BRLContentHandler.java	2007-08-27 04:05:44 UTC (rev 14623)
@@ -1,13 +1,13 @@
 package org.drools.brms.server.contenthandler;
 /*
  * Copyright 2005 JBoss Inc
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -69,6 +69,7 @@
 	private String getSourceDRL(AssetItem asset, BRMSPackageBuilder builder) {
 		RuleModel model = BRXMLPersistence.getInstance().unmarshal(
 				asset.getContent());
+        model.name = asset.getName();
 		String drl = BRDRLPersistence.getInstance().marshal(model);
 		if (builder.hasDSL() && model.hasDSLSentences()) {
 			drl = builder.getDSLExpander().expand(drl);

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-08-27 04:04:30 UTC (rev 14622)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-08-27 04:05:44 UTC (rev 14623)
@@ -19,8 +19,11 @@
 import java.io.ByteArrayInputStream;
 import java.io.ObjectInputStream;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -50,6 +53,7 @@
 import org.drools.brms.server.util.TestEnvironmentSessionHelper;
 import org.drools.common.DroolsObjectInputStream;
 import org.drools.compiler.RuleBaseLoader;
+import org.drools.integrationtests.IteratorToList;
 import org.drools.repository.AssetItem;
 import org.drools.repository.CategoryItem;
 import org.drools.repository.PackageItem;
@@ -1368,8 +1372,8 @@
         asset.updateFormat( AssetFormats.DSL_TEMPLATE_RULE );
         asset.updateContent( "when \n This is foo \n then \n do something" );
         asset.checkin( "" );
-        
-        
+
+
         rule = impl.loadRuleAsset( asset.getUUID() );
         drl = impl.buildAssetSource( rule );
         assertNotNull( drl );
@@ -1377,15 +1381,17 @@
         assertTrue( drl.indexOf( "do something" ) == -1 );
         assertTrue( drl.indexOf( "bar()" ) > -1 );
         assertTrue( drl.indexOf( "yeahMan();" ) > -1 );
-        
-        
+
+
         rule = impl.loadRuleAsset( repo.copyAsset( asset.getUUID(), "testAssetSource", "newRuleName" ) );
+        //System.err.println(((RuleContentText)rule.content).content);
         drl = impl.buildAssetSource( rule );
         assertNotNull( drl );
         assertTrue( drl.indexOf( "newRuleName" ) > 0 );
-        
+
     }
 
+
     public void testBuildAsset() throws Exception {
         ServiceImplementation impl = getService();
         RulesRepository repo = impl.repository;
@@ -1445,7 +1451,7 @@
 
     }
 
-    public void testBuildAssetBRXML() throws Exception {
+    public void testBuildAssetBRXMLAndCopy() throws Exception {
         ServiceImplementation impl = getService();
         RulesRepository repo = impl.repository;
 
@@ -1505,8 +1511,39 @@
             }
         }
         assertNull( result );
+
+
+        List assets = iteratorToList(pkg.getAssets());
+        assertEquals(2, assets.size());
+        //now lets copy...
+        String newUUID = impl.copyAsset( rule.uuid, rule.metaData.packageName, "ruleName2" );
+
+
+        assets = iteratorToList(pkg.getAssets());
+        assertEquals(3, assets.size());
+        RuleAsset asset = impl.loadRuleAsset( newUUID );
+
+        String pkgSource = impl.buildPackageSource( pkg.getUUID() );
+
+        assertTrue(pkgSource.indexOf( "ruleName2" ) > 0);
+        assertTrue(impl.buildAssetSource( asset ).indexOf( "ruleName2" ) > 0);
+        assertTrue(impl.buildAssetSource( asset ).indexOf( "testBRL" ) == -1);
+
+
+//        RuleModel model2 = (RuleModel) asset.content;
+//        assertEquals("ruleName2", model2.name);
+
     }
 
+    private List iteratorToList(Iterator assets) {
+        List result = new ArrayList();
+        while ( assets.hasNext() ) {
+            result.add( assets.next() );
+
+        }
+        return result;
+    }
+
     public void testBuildAssetWithPackageConfigError() throws Exception {
         ServiceImplementation impl = getService();
         RulesRepository repo = impl.repository;