[jboss-svn-commits] JBL Code SVN: r9747 - 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-25 17:46:21 -0500 (Sun, 25 Feb 2007)
New Revision: 9747

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/PackageItemTest.java
Log:
improved test coverage of package snapshots

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-25 22:34:31 UTC (rev 9746)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-02-25 22:46:21 UTC (rev 9747)
@@ -2,16 +2,12 @@
 
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.jcr.AccessDeniedException;
-import javax.jcr.InvalidItemStateException;
 import javax.jcr.ItemExistsException;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
@@ -20,13 +16,8 @@
 import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Value;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.version.Version;
-import javax.jcr.version.VersionException;
 
 import org.apache.log4j.Logger;
 import org.drools.repository.util.DefaultVersionNumberGenerator;

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-25 22:34:31 UTC (rev 9746)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2007-02-25 22:46:21 UTC (rev 9747)
@@ -91,16 +91,30 @@
         AssetItem it2 = pkg.addAsset( "testPackageCopy2", "la" );
         
         it1.updateContent( "new content" );
+        it1.updateFormat( "drl" );
         it2.updateContent( "more content" );
+        it2.updateFormat( "drl" );
         it1.checkin( "c" );
         it2.checkin( "c" );
         
         String ver1 = it1.getVersionNumber();
         String ver2 = it2.getVersionNumber();
         assertFalse( "".equals( ver1 ));
+        
+        assertEquals(2, iteratorToList(pkg.listAssetsByFormat( new String[] {"drl"} )).size());
         repo.createPackageSnapshot( "testPackageSnapshot", "PROD 2.0" );
+
+        //now make some changes on the main line
+        it1.updateContent( "XXX" );
+        it1.checkin( "X" );
+        assertFalse(it1.getVersionNumber().equals( ver1 ));
+        AssetItem it3 = pkg.addAsset( "testPackageCopy3", "x" );
+        it3.updateFormat( "drl" );
+        it3.checkin( "a" );
+        assertEquals(3, iteratorToList( pkg.listAssetsByFormat( new String[] {"drl"} )).size());
         
         
+        
         PackageItem pkg2 = repo.loadPackageSnapshot( "testPackageSnapshot", "PROD 2.0" );
         assertNotNull(pkg2);
         List snapAssets = iteratorToList( pkg2.getAssets() );
@@ -116,8 +130,9 @@
         assertEquals(ver1, sn1.getVersionNumber());
         assertEquals(ver2, sn2.getVersionNumber());
         
+
+        assertEquals(2, iteratorToList(pkg2.listAssetsByFormat( new String[] {"drl"} )).size());
         
-        
         //now check we can list the snappies
         String[] res = repo.listPackageSnapshots("testPackageSnapshot");