[jboss-svn-commits] JBL Code SVN: r9664 - 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-21 00:30:16 -0500 (Wed, 21 Feb 2007)
New Revision: 9664

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
Log:
JBRULES-691 can list multiple formats at once

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-02-21 05:20:24 UTC (rev 9663)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-02-21 05:30:16 UTC (rev 9664)
@@ -366,8 +366,20 @@
     /**
      * This will load an iterator for assets of the given format type.
      */
-    public AssetItemIterator listAssetsByFormat(String format) {
-        return queryAssets( "drools:format='" + format + "'" );
+    public AssetItemIterator listAssetsByFormat(String[] formats) {
+        if (formats.length == 1) {
+            return queryAssets( "drools:format='" + formats[0] + "'" );
+        } else {
+            String predicate = " ( ";
+            for ( int i = 0; i < formats.length; i++ ) {
+                predicate = predicate + "drools:format='" + formats[i] + "'";
+                if (!(i == formats.length -1 )) { predicate =  predicate + " OR "; }
+            }
+            predicate = predicate + " ) ";
+            return queryAssets( predicate );
+            
+        }
+        
     }
     
     /**

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2007-02-21 05:20:24 UTC (rev 9663)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2007-02-21 05:30:16 UTC (rev 9664)
@@ -433,12 +433,19 @@
         assertTrue(list.get( 1 ) instanceof AssetItem);
 
         
-        AssetItemIterator it2 = pkg.listAssetsByFormat( "xyz" );
+        AssetItemIterator it2 = pkg.listAssetsByFormat( new String[] {"xyz"} );
         List list2 = iteratorToList( it2 );
-        assertEquals(2, list.size());
+        assertEquals(2, list2.size());
         assertTrue(list2.get( 0 ) instanceof AssetItem);
         assertTrue(list2.get( 1 ) instanceof AssetItem);
         
+        it2 = pkg.listAssetsByFormat( new String[] {"xyz", "ABC"} );
+        list2 = iteratorToList( it2 );
+        assertEquals(3, list2.size());
+        assertTrue(list2.get( 0 ) instanceof AssetItem);
+        assertTrue(list2.get( 1 ) instanceof AssetItem);
+        assertTrue(list2.get( 2 ) instanceof AssetItem);
+        
     }
     
     public void testSortHistoryByVersionNumber() {