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

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

Author: michael.neale at jboss.com
Date: 2007-02-27 02:15:44 -0500 (Tue, 27 Feb 2007)
New Revision: 9803

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
Log:
JBRULES-709 fixed.

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-02-27 06:33:27 UTC (rev 9802)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-02-27 07:15:44 UTC (rev 9803)
@@ -737,8 +737,10 @@
             while(it.hasNext()) {
                 Property ruleLink = (Property) it.next();
                 Node parentNode = ruleLink.getParent();
-                if(parentNode.getPrimaryNodeType().getName().equals(AssetItem.RULE_NODE_TYPE_NAME)) {
-                    results.add(new AssetItem(this, parentNode));
+                if (isNotSnapshot( parentNode )) {
+                    if(parentNode.getPrimaryNodeType().getName().equals(AssetItem.RULE_NODE_TYPE_NAME)) {
+                        results.add(new AssetItem(this, parentNode));
+                    }
                 }
             }
             return results;
@@ -746,6 +748,12 @@
             throw new RulesRepositoryException(e);
         }        
     }
+
+
+
+    private boolean isNotSnapshot(Node parentNode) throws RepositoryException {
+        return parentNode.getPath().indexOf( PACKAGE_SNAPSHOT_AREA ) == -1;
+    }
     
     /**
      * @return an Iterator which will provide RulePackageItem's.

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2007-02-27 06:33:27 UTC (rev 9802)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2007-02-27 07:15:44 UTC (rev 9803)
@@ -147,6 +147,8 @@
             AssetItem prev = (AssetItem) ruleItem1.getPrecedingVersion();
             assertNotNull(prev);
             
+            
+            
     }
     
     public void testUpdateCategories() {

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java	2007-02-27 06:33:27 UTC (rev 9802)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java	2007-02-27 07:15:44 UTC (rev 9803)
@@ -224,6 +224,28 @@
             
     }
     
+    /**
+     * Here we are testing to make sure that category links don't pick up stuff in snapshots area.
+     */
+    public void testCategoriesAndSnapshots() throws Exception {
+        RulesRepository repo = RepositorySessionUtil.getRepository();
+        repo.loadCategory( "/" ).addCategory( "testCategoriesAndSnapshots", "X" );
+        
+        PackageItem pkg = repo.createPackage( "testCategoriesAndSnapshots", "");
+        pkg.addAsset( "testCat1", "x", "/testCategoriesAndSnapshots", "drl");
+        pkg.addAsset( "testCat2", "x", "/testCategoriesAndSnapshots", "drl");
+        repo.save();
+        
+        List items = repo.findAssetsByCategory( "/testCategoriesAndSnapshots" );
+        assertEquals(2, items.size());
+        
+        repo.createPackageSnapshot( "testCategoriesAndSnapshots", "SNAP 1" );
+        items = repo.findAssetsByCategory( "testCategoriesAndSnapshots" );
+        assertEquals(2, items.size());        
+        
+        
+    }
+    
     public void testMoveRulePackage() throws Exception {
         RulesRepository repo = RepositorySessionUtil.getRepository();
         PackageItem pkg = repo.createPackage( "testMove", "description" );