[jboss-svn-commits] JBL Code SVN: r14622 - in labs/jbossrules/trunk/drools-repository/src: test/java/org/drools/repository and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 27 00:04:30 EDT 2007
Author: michael.neale at jboss.com
Date: 2007-08-27 00:04:30 -0400 (Mon, 27 Aug 2007)
New Revision: 14622
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-1106
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-08-27 04:03:19 UTC (rev 14621)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2007-08-27 04:04:30 UTC (rev 14622)
@@ -310,6 +310,7 @@
/**
* This will copy an assets content to the new location.
+ * @return the UUID of the new asset.
*/
public String copyAsset(String uuidSource, String destinationPackage, String destinationName) {
try {
@@ -319,10 +320,12 @@
String destPath = this.getAreaNode( RULE_PACKAGE_AREA ).getPath() + "/" + destinationPackage + "/" + PackageItem.ASSET_FOLDER_NAME + "/" + destinationName;
this.session.getWorkspace().copy( sourcePath, destPath );
AssetItem dest = loadPackage( destinationPackage ).loadAsset( destinationName );
- if (dest.getContent() != null ) {
- dest.updateContent( dest.getContent().replaceAll( source.getName(), dest.getName() ) );
- }
+// if (dest.getContent() != null ) {
+// dest.updateContent( dest.getContent().replaceAll( source.getName(), dest.getName() ) );
+// }
+
dest.updateStringProperty( destinationPackage, AssetItem.PACKAGE_NAME_PROPERTY );
+ dest.node.setProperty( AssetItem.VERSION_NUMBER_PROPERTY_NAME, 0 );
dest.checkin( "Copied from " + source.getPackageName() + "/" + source.getName() );
return dest.getUUID();
} catch ( RepositoryException e ) {
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-08-27 04:03:19 UTC (rev 14621)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2007-08-27 04:04:30 UTC (rev 14622)
@@ -17,36 +17,37 @@
private RulesRepository getRepo() {
return RepositorySessionUtil.getRepository();
}
-
+
private PackageItem getDefaultPackage() {
return getRepo().loadDefaultPackage();
}
-
+
public void testAssetItemCreation() throws Exception {
-
+
Calendar now = Calendar.getInstance();
-
+
Thread.sleep(500); //MN: need this sleep to get the correct date
-
+
AssetItem ruleItem1 = getDefaultPackage().addAsset("testRuleItem", "test content");
-
+
+
assertNotNull(ruleItem1);
assertNotNull(ruleItem1.getNode());
assertEquals("testRuleItem", ruleItem1.getName());
-
+
assertNotNull(ruleItem1.getCreatedDate());
-
+
assertTrue(now.before( ruleItem1.getCreatedDate() ));
-
+
String packName = getDefaultPackage().getName();
assertEquals(packName, ruleItem1.getPackageName());
-
+
assertNotNull(ruleItem1.getUUID());
-
+
//try constructing with node of wrong type
try {
-
+
PackageItem pitem = getRepo().loadDefaultPackage();
new AssetItem(getRepo(), pitem.getNode());
fail("Exception not thrown for node of wrong type");
@@ -58,7 +59,7 @@
fail("Caught unexpected exception: " + e);
}
}
-
+
public void testGetPackageItem() throws Exception {
RulesRepository repo = getRepo();
PackageItem def = repo.loadDefaultPackage();
@@ -66,53 +67,53 @@
PackageItem pkg = asset.getPackage();
assertEquals(def.getName(), pkg.getName());
assertEquals(def.getUUID(), pkg.getUUID());
-
+
}
-
+
public void testGetContent() {
-
+
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetContent", "test content");
ruleItem1.updateContent( "test content" );
-
+
assertNotNull(ruleItem1);
assertNotNull(ruleItem1.getNode());
assertEquals("test content", ruleItem1.getContent());
}
-
+
public void testUpdateContent() throws Exception {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testUpdateContent", "test description");
-
+
assertFalse(ruleItem1.getCreator().equals( "" ));
- ruleItem1.updateContent( "test content" );
+ ruleItem1.updateContent( "test content" );
ruleItem1.checkin( "yeah" );
-
+
assertFalse(ruleItem1.getLastContributor().equals( "" ));
-
+
ruleItem1.updateContent( "new rule content");
-
+
assertEquals("new rule content", ruleItem1.getContent());
-
+
assertTrue(ruleItem1.getNode().getSession().hasPendingChanges());
-
+
ruleItem1.checkin( "yeah !" );
assertFalse(ruleItem1.getNode().getSession().hasPendingChanges());
-
+
assertEquals("yeah !", ruleItem1.getCheckinComment());
-
+
AssetItem prev = (AssetItem) ruleItem1.getPrecedingVersion();
assertEquals("test content", prev.getContent());
assertFalse("yeah !".equals(prev.getCheckinComment()));
-
-
+
+
assertEquals(prev, ruleItem1.getPrecedingVersion());
-
+
ruleItem1 = getDefaultPackage().loadAsset( "testUpdateContent" );
VersionIterator it = ruleItem1.getNode().getVersionHistory().getAllVersions();
- // and this shows using a version iterator.
+ // and this shows using a version iterator.
// perhaps migrate to using this rather then next/prev methods.
//this way, we can skip.
assertTrue(it.hasNext());
@@ -120,90 +121,90 @@
Version n = it.nextVersion();
AssetItem item = new AssetItem(ruleItem1.getRulesRepository(), n);
assertNotNull(item);
-
+
}
}
-
+
public void testCategories() {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testAddTag", "test content");
-
+
getRepo().loadCategory( "/" ).addCategory( "testAddTagTestTag", "description" );
-
+
ruleItem1.addCategory("testAddTagTestTag");
List tags = ruleItem1.getCategories();
assertEquals(1, tags.size());
assertEquals("testAddTagTestTag", ((CategoryItem)tags.get(0)).getName());
-
- getRepo().loadCategory( "/" ).addCategory( "testAddTagTestTag2", "description" );
+
+ getRepo().loadCategory( "/" ).addCategory( "testAddTagTestTag2", "description" );
ruleItem1.addCategory("testAddTagTestTag2");
tags = ruleItem1.getCategories();
- assertEquals(2, tags.size());
-
+ assertEquals(2, tags.size());
+
ruleItem1.checkin( "woot" );
-
+
//now test retrieve by tags
- List result = getRepo().findAssetsByCategory("testAddTagTestTag");
- assertEquals(1, result.size());
+ List result = getRepo().findAssetsByCategory("testAddTagTestTag");
+ assertEquals(1, result.size());
AssetItem retItem = (AssetItem) result.get( 0 );
assertEquals("testAddTag", retItem.getName());
-
+
ruleItem1.updateContent( "foo" );
ruleItem1.checkin( "latest" );
-
+
result = getRepo().findAssetsByCategory( "testAddTagTestTag" );
-
+
assertEquals(1, result.size());
ruleItem1 = (AssetItem) result.get( 0 );
assertEquals(2, ruleItem1.getCategories().size());
-
+
assertEquals("foo", ruleItem1.getContent());
AssetItem prev = (AssetItem) ruleItem1.getPrecedingVersion();
assertNotNull(prev);
-
-
-
+
+
+
}
-
+
public void testUpdateCategories() {
getRepo().loadCategory( "/" ).addCategory( "testUpdateCategoriesOnAsset", "la" );
getRepo().loadCategory( "/" ).addCategory( "testUpdateCategoriesOnAsset2", "la" );
-
+
AssetItem item = getRepo().loadDefaultPackage().addAsset( "testUpdateCategoriesOnAsset", "huhuhu" );
String[] cats = new String[] {"testUpdateCategoriesOnAsset", "testUpdateCategoriesOnAsset2"};
item.updateCategoryList( cats );
-
+
item.checkin( "aaa" );
-
+
item = getRepo().loadDefaultPackage().loadAsset( "testUpdateCategoriesOnAsset" );
assertEquals(2, item.getCategories().size());
-
+
for ( Iterator iter = item.getCategories().iterator(); iter.hasNext(); ) {
- CategoryItem cat = (CategoryItem) iter.next();
- assertTrue(cat.getName().startsWith( "testUpdateCategoriesOnAsset" ));
+ CategoryItem cat = (CategoryItem) iter.next();
+ assertTrue(cat.getName().startsWith( "testUpdateCategoriesOnAsset" ));
}
-
+
}
-
+
public void testFindRulesByCategory() throws Exception {
-
+
getRepo().loadCategory( "/" ).addCategory( "testFindRulesByCat", "yeah" );
AssetItem as1 = getDefaultPackage().addAsset( "testFindRulesByCategory1", "ya", "testFindRulesByCat", "drl" );
getDefaultPackage().addAsset( "testFindRulesByCategory2", "ya", "testFindRulesByCat", AssetItem.DEFAULT_CONTENT_FORMAT ).checkin( "version0" );
-
+
as1.checkin( "version0" );
-
+
assertEquals("drl", as1.getFormat());
-
+
List rules = getRepo().findAssetsByCategory( "testFindRulesByCat" );
assertEquals(2, rules.size());
-
+
for ( Iterator iter = rules.iterator(); iter.hasNext(); ) {
AssetItem element = (AssetItem) iter.next();
assertTrue(element.getName().startsWith( "testFindRulesByCategory" ));
}
-
+
try {
getRepo().loadCategory( "testFindRulesByCat" ).remove();
@@ -212,17 +213,17 @@
//assertTrue(e.getCause() instanceof ReferentialIntegrityException);
assertNotNull(e.getMessage());
}
-
+
}
-
+
public void testRemoveTag() {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testRemoveTag", "test content");
-
+
getRepo().loadCategory( "/" ).addCategory( "TestRemoveCategory", "description" );
-
- ruleItem1.addCategory("TestRemoveCategory");
+
+ ruleItem1.addCategory("TestRemoveCategory");
List tags = ruleItem1.getCategories();
assertEquals(1, tags.size());
ruleItem1.removeCategory("TestRemoveCategory");
@@ -231,25 +232,25 @@
getRepo().loadCategory( "/" ).addCategory( "TestRemoveCategory2", "description" );
getRepo().loadCategory( "/" ).addCategory( "TestRemoveCategory3", "description" );
- ruleItem1.addCategory("TestRemoveCategory2");
+ ruleItem1.addCategory("TestRemoveCategory2");
ruleItem1.addCategory("TestRemoveCategory3");
ruleItem1.removeCategory("TestRemoveCategory2");
tags = ruleItem1.getCategories();
assertEquals(1, tags.size());
- assertEquals("TestRemoveCategory3", ((CategoryItem)tags.get(0)).getName());
+ assertEquals("TestRemoveCategory3", ((CategoryItem)tags.get(0)).getName());
}
public void testGetTags() {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testGetTags", "test content");
-
+
List tags = ruleItem1.getCategories();
assertNotNull(tags);
assertEquals(0, tags.size());
-
+
getRepo().loadCategory( "/" ).addCategory( "testGetTagsTestTag", "description" );
-
- ruleItem1.addCategory("testGetTagsTestTag");
+
+ ruleItem1.addCategory("testGetTagsTestTag");
tags = ruleItem1.getCategories();
assertEquals(1, tags.size());
assertEquals("testGetTagsTestTag", ((CategoryItem)tags.get(0)).getName());
@@ -258,44 +259,44 @@
public void testSetStateString() {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testSetStateString", "test content");
-
+
getRepo().createState( "TestState1" );
-
+
ruleItem1.updateState("TestState1");
assertNotNull(ruleItem1.getState());
assertEquals("TestState1", ruleItem1.getState().getName());
-
+
getRepo().createState( "TestState2" );
ruleItem1.updateState("TestState2");
assertNotNull(ruleItem1.getState());
- assertEquals("TestState2", ruleItem1.getState().getName());
+ assertEquals("TestState2", ruleItem1.getState().getName());
ruleItem1 = getDefaultPackage().addAsset("foobar", "test description");
-
+
StateItem stateItem1 = getRepo().getState("TestState1");
- ruleItem1.updateState(stateItem1);
+ ruleItem1.updateState(stateItem1);
assertNotNull(ruleItem1.getState());
assertEquals(ruleItem1.getState().getName(), "TestState1");
-
+
StateItem stateItem2 = getRepo().getState("TestState2");
ruleItem1.updateState(stateItem2);
assertNotNull(ruleItem1.getState());
- assertEquals("TestState2", ruleItem1.getState().getName());
+ assertEquals("TestState2", ruleItem1.getState().getName());
}
public void testStatusStuff() {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testGetState", "test content");
-
+
StateItem stateItem1 = ruleItem1.getState();
assertEquals(StateItem.DRAFT_STATE_NAME, stateItem1.getName());
-
+
ruleItem1.updateState("TestState1");
assertNotNull(ruleItem1.getState());
- assertEquals("TestState1", ruleItem1.getState().getName());
-
+ assertEquals("TestState1", ruleItem1.getState().getName());
+
ruleItem1 = getDefaultPackage().addAsset( "testGetState2", "wa" );
assertEquals(StateItem.DRAFT_STATE_NAME, ruleItem1.getStateDescription());
assertEquals(getRepo().getState( StateItem.DRAFT_STATE_NAME ), ruleItem1.getState());
@@ -305,162 +306,162 @@
AssetItem ruleItem1 = getDefaultPackage().addAsset("testToString", "test content");
assertNotNull(ruleItem1.toString());
}
-
+
public void testGetLastModifiedOnCheckin() throws Exception {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testGetLastModified", "test content");
-
+
Calendar cal = Calendar.getInstance();
- long before = cal.getTimeInMillis();
-
+ long before = cal.getTimeInMillis();
+
Thread.sleep( 100 );
ruleItem1.updateContent("new lhs");
ruleItem1.checkin( "woot" );
Calendar cal2 = ruleItem1.getLastModified();
- long lastMod = cal2.getTimeInMillis();
-
+ long lastMod = cal2.getTimeInMillis();
+
cal = Calendar.getInstance();
long after = cal.getTimeInMillis();
-
-
-
+
+
+
assertTrue(before < lastMod);
assertTrue(lastMod < after);
}
-
+
public void testGetDateEffective() {
AssetItem ruleItem1 = getDefaultPackage().addAsset("testGetDateEffective", "test content");
-
+
//it should be initialized to null
assertTrue(ruleItem1.getDateEffective() == null);
-
+
//now try setting it, then retrieving it
Calendar cal = Calendar.getInstance();
ruleItem1.updateDateEffective(cal);
Calendar cal2 = ruleItem1.getDateEffective();
-
- assertEquals(cal, cal2);
+
+ assertEquals(cal, cal2);
}
-
+
public void testGetDateExpired() {
try {
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetDateExpired", "test content");
-
+
//it should be initialized to null
assertTrue(ruleItem1.getDateExpired() == null);
-
+
//now try setting it, then retrieving it
Calendar cal = Calendar.getInstance();
ruleItem1.updateDateExpired(cal);
Calendar cal2 = ruleItem1.getDateExpired();
-
- assertEquals(cal, cal2);
+
+ assertEquals(cal, cal2);
}
catch(Exception e) {
fail("Caught unexpected exception: " + e);
}
}
-
-
+
+
public void testSaveAndCheckinDescriptionAndTitle() throws Exception {
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetDescription", "");
ruleItem1.checkin( "version0" );
-
+
//it should be "" to begin with
assertEquals("", ruleItem1.getDescription());
-
+
ruleItem1.updateDescription("test description");
assertEquals("test description", ruleItem1.getDescription());
-
-
-
-
+
+
+
+
assertTrue(getRepo().getSession().hasPendingChanges());
-
+
ruleItem1.updateTitle( "This is a title" );
assertTrue(getRepo().getSession().hasPendingChanges());
ruleItem1.checkin( "ya" );
-
+
//we can save without a checkin
getRepo().getSession().save();
assertFalse(getRepo().getSession().hasPendingChanges());
-
+
try {
ruleItem1.getPrecedingVersion().updateTitle( "baaad" );
fail("should not be able to do this");
} catch (RulesRepositoryException e) {
assertNotNull(e.getMessage());
}
-
+
}
-
+
public void testGetPrecedingVersionAndRestore() throws Exception {
getRepo().loadCategory( "/" ).addCategory( "foo", "ka" );
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetPrecedingVersion", "descr");
ruleItem1.checkin( "version0" );
assertTrue(ruleItem1.getPrecedingVersion() == null);
-
+
ruleItem1.addCategory( "foo" );
ruleItem1.updateContent( "test content" );
ruleItem1.updateDescription( "descr2" );
Thread.sleep( 100 );
ruleItem1.checkin( "boo" );
-
+
AssetItem predecessorRuleItem = (AssetItem) ruleItem1.getPrecedingVersion();
- assertNotNull(predecessorRuleItem);
-
+ assertNotNull(predecessorRuleItem);
+
//check version handling
assertNotNull(predecessorRuleItem.getVersionSnapshotUUID());
assertFalse(predecessorRuleItem.getVersionSnapshotUUID().equals( ruleItem1.getUUID() ));
-
+
//assertEquals(predecessorRuleItem.getCreatedDate().getTimeInMillis(), ruleItem1.getCreatedDate().getTimeInMillis());
-
-
+
+
assertEquals(ruleItem1.getState().getName(), predecessorRuleItem.getState().getName());
//assertEquals(ruleItem1.getName(), predecessorRuleItem.getName());
-
-
-
+
+
+
AssetItem loadedHistorical = getRepo().loadAssetByUUID( predecessorRuleItem.getVersionSnapshotUUID() );
assertTrue(loadedHistorical.isHistoricalVersion());
assertFalse(ruleItem1.getVersionNumber() == loadedHistorical.getVersionNumber());
-
+
ruleItem1.updateContent("new content");
ruleItem1.checkin( "two changes" );
-
+
predecessorRuleItem = (AssetItem) ruleItem1.getPrecedingVersion();
assertNotNull(predecessorRuleItem);
assertEquals(1, predecessorRuleItem.getCategories().size());
CategoryItem cat = (CategoryItem) predecessorRuleItem.getCategories().get( 0 );
assertEquals("foo", cat.getName());
-
+
assertEquals("test content", predecessorRuleItem.getContent());
assertEquals(RulesRepository.DEFAULT_PACKAGE, predecessorRuleItem.getPackageName());
-
+
ruleItem1.updateContent("newer lhs");
ruleItem1.checkin( "another" );
-
+
predecessorRuleItem = (AssetItem) ruleItem1.getPrecedingVersion();
assertNotNull(predecessorRuleItem);
assertEquals("new content", predecessorRuleItem.getContent());
predecessorRuleItem = (AssetItem) predecessorRuleItem.getPrecedingVersion();
assertNotNull(predecessorRuleItem);
assertEquals("test content", predecessorRuleItem.getContent());
-
+
//now try restoring
long oldVersionNumber = ruleItem1.getVersionNumber();
-
+
AssetItem toRestore = getRepo().loadAssetByUUID( predecessorRuleItem.getVersionSnapshotUUID() );
-
+
getRepo().restoreHistoricalAsset( toRestore, ruleItem1, "cause I want to" );
-
-
+
+
AssetItem restored = getRepo().loadDefaultPackage().loadAsset( "testGetPrecedingVersion" );
//assertEquals( predecessorRuleItem.getCheckinComment(), restored.getCheckinComment());
@@ -469,44 +470,44 @@
assertEquals(5, restored.getVersionNumber());
assertFalse(oldVersionNumber == restored.getVersionNumber() );
}
-
+
public void testGetSucceedingVersion() {
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetSucceedingVersion", "test description");
ruleItem1.checkin( "version0" );
assertEquals(1, ruleItem1.getVersionNumber());
-
+
AssetItem succeedingRuleItem = (AssetItem) ruleItem1.getSucceedingVersion();
- assertTrue(succeedingRuleItem == null);
-
+ assertTrue(succeedingRuleItem == null);
+
ruleItem1.updateContent("new content");
ruleItem1.checkin( "la" );
-
+
assertEquals(2, ruleItem1.getVersionNumber());
-
+
AssetItem predecessorRuleItem = (AssetItem) ruleItem1.getPrecedingVersion();
assertEquals(null, predecessorRuleItem.getContent());
succeedingRuleItem = (AssetItem) predecessorRuleItem.getSucceedingVersion();
assertNotNull(succeedingRuleItem);
- assertEquals(ruleItem1.getContent(), succeedingRuleItem.getContent());
- }
-
+ assertEquals(ruleItem1.getContent(), succeedingRuleItem.getContent());
+ }
+
public void testGetSuccessorVersionsIterator() {
try {
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetSuccessorVersionsIterator", "test content");
ruleItem1.checkin( "version0" );
-
- Iterator iterator = ruleItem1.getSuccessorVersionsIterator();
+
+ Iterator iterator = ruleItem1.getSuccessorVersionsIterator();
assertNotNull(iterator);
assertFalse(iterator.hasNext());
-
+
ruleItem1.updateContent("new content").checkin( "ya" );
-
-
- iterator = ruleItem1.getSuccessorVersionsIterator();
+
+
+ iterator = ruleItem1.getSuccessorVersionsIterator();
assertNotNull(iterator);
assertFalse(iterator.hasNext());
-
+
AssetItem predecessorRuleItem = (AssetItem) ruleItem1.getPrecedingVersion();
iterator = predecessorRuleItem.getSuccessorVersionsIterator();
assertNotNull(iterator);
@@ -514,10 +515,10 @@
AssetItem nextRuleItem = (AssetItem) iterator.next();
assertEquals("new content", nextRuleItem.getContent());
assertFalse(iterator.hasNext());
-
+
ruleItem1.updateContent("newer content");
ruleItem1.checkin( "boo" );
-
+
iterator = predecessorRuleItem.getSuccessorVersionsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
@@ -526,64 +527,64 @@
assertTrue(iterator.hasNext());
nextRuleItem = (AssetItem)iterator.next();
assertEquals("newer content", nextRuleItem.getContent());
- assertFalse(iterator.hasNext());
+ assertFalse(iterator.hasNext());
}
catch(Exception e) {
fail("Caught unexpected exception: " + e);
}
}
-
+
public void testGetPredecessorVersionsIterator() {
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetPredecessorVersionsIterator", "test description");
ruleItem1.checkin( "version0" );
-
- Iterator iterator = ruleItem1.getPredecessorVersionsIterator();
+
+ Iterator iterator = ruleItem1.getPredecessorVersionsIterator();
assertNotNull(iterator);
- assertFalse(iterator.hasNext());
-
+ assertFalse(iterator.hasNext());
+
ruleItem1.updateContent( "test content" );
ruleItem1.checkin( "lalalalala" );
-
- iterator = ruleItem1.getPredecessorVersionsIterator();
+
+ iterator = ruleItem1.getPredecessorVersionsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
-
+
ruleItem1.updateContent("new content");
ruleItem1.checkin( "boo" );
-
- iterator = ruleItem1.getPredecessorVersionsIterator();
+
+ iterator = ruleItem1.getPredecessorVersionsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
AssetItem nextRuleItem = (AssetItem) iterator.next();
-
+
assertEquals("test content", nextRuleItem.getContent());
-
+
ruleItem1.updateContent("newer content");
ruleItem1.checkin( "wee" );
-
-
- iterator = ruleItem1.getPredecessorVersionsIterator();
+
+
+ iterator = ruleItem1.getPredecessorVersionsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
nextRuleItem = (AssetItem) iterator.next();
- assertTrue(iterator.hasNext());
+ assertTrue(iterator.hasNext());
assertEquals("new content", nextRuleItem.getContent());
nextRuleItem = (AssetItem) iterator.next();
-
+
assertEquals("test content", nextRuleItem.getContent());
-
+
assertEquals(null, ((AssetItem) iterator.next()).getContent());
}
-
+
public void testHistoryIterator() throws Exception {
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testHistoryIterator", "test description");
ruleItem1.checkin( "version0" );
-
+
ruleItem1 = getRepo().loadAssetByUUID( ruleItem1.getUUID() );
ruleItem1.updateContent( "wo" );
ruleItem1.checkin( "version1" );
-
+
ruleItem1 = getRepo().loadAssetByUUID( ruleItem1.getUUID() );
ruleItem1.updateContent( "ya" );
ruleItem1.checkin( "version2" );
@@ -592,54 +593,54 @@
for ( int i = 0; i < 2; i++ ) {
assertTrue(it.hasNext());
it.next();
- }
-
+ }
+
}
-
- public void testGetTitle() {
- AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetTitle", "test content");
-
+
+ public void testGetTitle() {
+ AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetTitle", "test content");
+
assertEquals("testGetTitle", ruleItem1.getTitle());
}
-
+
public void testDublinCoreProperties() {
PackageItem pkg = getRepo().createPackage( "testDublinCore", "wa" );
-
+
AssetItem ruleItem = pkg.addAsset( "testDublinCoreProperties", "yeah yeah yeah" );
ruleItem.updateCoverage( "b" );
assertEquals("b",ruleItem.getCoverage());
-
+
ruleItem.checkin( "woo" );
-
+
pkg = getRepo().loadPackage( "testDublinCore" );
ruleItem = (AssetItem) pkg.getAssets().next();
-
+
assertEquals("b", ruleItem.getCoverage());
-
+
assertEquals("", ruleItem.getExternalRelation());
assertEquals("", ruleItem.getExternalSource());
-
+
}
-
- public void testGetFormat() throws Exception {
+
+ public void testGetFormat() throws Exception {
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetFormat", "test content");
ruleItem1.updateContent( "la" );
- assertEquals(AssetItem.DEFAULT_CONTENT_FORMAT, ruleItem1.getFormat());
-
+ assertEquals(AssetItem.DEFAULT_CONTENT_FORMAT, ruleItem1.getFormat());
+
assertTrue(ruleItem1.getNode().hasProperty( AssetItem.CONTENT_PROPERTY_NAME ));
- assertFalse(ruleItem1.getNode().hasProperty( AssetItem.CONTENT_PROPERTY_BINARY_NAME ));
-
+ assertFalse(ruleItem1.getNode().hasProperty( AssetItem.CONTENT_PROPERTY_BINARY_NAME ));
+
ruleItem1.updateFormat( "blah" );
assertEquals("blah", ruleItem1.getFormat());
- }
-
+ }
+
public void testAnonymousProperties() {
AssetItem item = getRepo().loadDefaultPackage().addAsset( "anonymousproperty", "lalalalala" );
item.updateUserProperty( "fooBar", "value");
assertEquals("value", item.getUserProperty("fooBar"));
-
-
-
+
+
+
item.checkin( "lalalala" );
try {
item.updateUserProperty( "drools:content", "whee" );
@@ -649,9 +650,9 @@
assertNotNull(e.getMessage());
}
-
+
}
-
+
public void testBinaryAsset() throws Exception {
AssetItem item = getRepo().loadDefaultPackage().addAsset( "testBinaryAsset", "yeah" );
String data = "abc 123";
@@ -659,21 +660,21 @@
item.updateBinaryContentAttachment( in );
item.updateBinaryContentAttachmentFileName( "x.x" );
in.close();
-
+
assertFalse(item.getNode().hasProperty( AssetItem.CONTENT_PROPERTY_NAME ));
assertTrue(item.getNode().hasProperty( AssetItem.CONTENT_PROPERTY_BINARY_NAME ));
item.checkin( "lalalala" );
-
-
-
+
+
+
item = getRepo().loadDefaultPackage().loadAsset( "testBinaryAsset" );
InputStream in2 = item.getBinaryContentAttachment();
assertNotNull(in2);
-
+
byte[] data2 = item.getBinaryContentAsBytes();
assertEquals(data, new String(data2));
assertEquals("x.x", item.getBinaryContentAttachmentFileName());
-
+
}
-
+
}
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-08-27 04:03:19 UTC (rev 14621)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2007-08-27 04:04:30 UTC (rev 14622)
@@ -321,12 +321,16 @@
AssetItem item = repo.loadDefaultPackage().addAsset( "testCopyAssetSource", "desc" );
item.updateContent( "la" );
item.checkin( "" );
+ item.updateDescription( "mmm" );
+ item.checkin( "again" );
+ assertEquals(2, item.getVersionNumber());
String uuid = repo.copyAsset( item.getUUID(), "testCopyAsset", "testCopyAssetDestination" );
AssetItem dest = repo.loadAssetByUUID( uuid );
assertEquals("la", dest.getContent());
assertEquals("testCopyAsset", dest.getPackageName());
assertFalse(uuid.equals( item.getUUID() ));
+ assertEquals(1, dest.getVersionNumber());
}
public void testRenameAsset() throws Exception {
More information about the jboss-svn-commits
mailing list