[jboss-svn-commits] JBL Code SVN: r9528 - in labs/jbossrules/trunk/drools-repository/src: main/java/org/drools/scm/jcr and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 15 08:16:41 EST 2007
Author: mark.proctor at jboss.com
Date: 2007-02-15 08:16:41 -0500 (Thu, 15 Feb 2007)
New Revision: 9528
Added:
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/CompositeScmAction.java
Removed:
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/svn/CompositeSvnAction.java
Modified:
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/ScmActionFactory.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/ScmEntry.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/jcr/JcrActionFactory.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnActionFactoryTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnLogTest.java
Log:
-added failing unit test for add directory with jcr
Added: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/CompositeScmAction.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/CompositeScmAction.java (rev 0)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/CompositeScmAction.java 2007-02-15 13:16:41 UTC (rev 9528)
@@ -0,0 +1,36 @@
+/**
+ *
+ */
+package org.drools.scm;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.io.ISVNEditor;
+
+public class CompositeScmAction
+ implements
+ ScmAction {
+ private List actions;
+
+ public CompositeScmAction() {
+ this.actions = Collections.EMPTY_LIST;
+ }
+
+ public void addScmAction(ScmAction action) {
+ if ( actions == Collections.EMPTY_LIST ) {
+ this.actions = new ArrayList();
+ }
+ this.actions.add( action );
+ }
+
+ public void applyAction(Object context) throws Exception {
+ for ( Iterator it = this.actions.iterator(); it.hasNext(); ) {
+ ScmAction action = (ScmAction) it.next();
+ action.applyAction( context );
+ }
+ }
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/ScmActionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/ScmActionFactory.java 2007-02-15 13:13:44 UTC (rev 9527)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/ScmActionFactory.java 2007-02-15 13:16:41 UTC (rev 9528)
@@ -52,9 +52,6 @@
public void getContent(String path, String file, long revision, OutputStream os) throws Exception;
- public List listEntries(String path) throws Exception;
+ public List listEntries(String path) throws Exception;
- public void listEntries(String path,
- List list) throws Exception;
-
}
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/ScmEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/ScmEntry.java 2007-02-15 13:13:44 UTC (rev 9527)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/ScmEntry.java 2007-02-15 13:16:41 UTC (rev 9528)
@@ -11,7 +11,7 @@
Date getDate();
String getName();
String getPath();
- long getRevision();
+ long getRevision();
long getSize();
public boolean isFile();
public boolean isDirectory();
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/jcr/JcrActionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/jcr/JcrActionFactory.java 2007-02-15 13:13:44 UTC (rev 9527)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/jcr/JcrActionFactory.java 2007-02-15 13:16:41 UTC (rev 9528)
@@ -2,6 +2,11 @@
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -9,14 +14,17 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.scm.DefaultScmEntry;
import org.drools.scm.ScmAction;
import org.drools.scm.ScmActionFactory;
+import org.drools.scm.ScmEntry;
import org.drools.scm.log.ScmLogEntry;
import org.drools.scm.log.ScmLogEntryItem;
import org.drools.scm.log.ScmLogEntry.Add;
import org.drools.scm.log.ScmLogEntry.Copy;
import org.drools.scm.log.ScmLogEntry.Delete;
import org.drools.scm.log.ScmLogEntry.Update;
+import org.tmatesoft.svn.core.SVNNodeKind;
public class JcrActionFactory
implements
@@ -27,16 +35,19 @@
public JcrActionFactory(RulesRepository repo) {
this.repository = repo;
}
-
+
public ScmAction addDirectory(String root,
String path) {
- return null;
+ return new AddDirectory( root,
+ path );
}
public ScmAction addFile(String path,
String file,
byte[] content) {
- return new AddFile(path, file, content);
+ return new AddFile( path,
+ file,
+ content );
}
public ScmAction copyDirectory(String path,
@@ -64,8 +75,10 @@
public void execute(ScmAction action,
String message) throws Exception {
+
- action.applyAction( new RepositoryContext(repository, message));
+ action.applyAction( new RepositoryContext( repository,
+ message ) );
}
public void getContent(String path,
@@ -79,11 +92,67 @@
}
public List listEntries(String path) throws Exception {
- return null;
+ // Build a list of packages which are for this path and all sub paths
+ List pkgs = new ArrayList();
+ String pathAsPackageName = toPackageName( path );
+ for ( Iterator it = this.repository.listPackages(); it.hasNext(); ) {
+ PackageItem pkgItem = (PackageItem) it.next();
+ if ( pkgItem.getName().startsWith( pathAsPackageName ) ) {
+ pkgs.add( it.next() );
+ }
+
+ }
+
+ // now sort so that it's directory listing order
+ Collections.sort( pkgs,
+ new PackagePathComparator() );
+
+ // Now iterate each directory create an ScmEntry and then add an ScmEntry for each child
+ List entries = new ArrayList();
+ String parentPath = path;
+ for ( Iterator pkgIter = pkgs.iterator(); pkgIter.hasNext(); ) {
+ PackageItem item = (PackageItem) pkgIter.next();
+
+ DefaultScmEntry scmEntry = new DefaultScmEntry();
+ scmEntry.setPath( parentPath );
+ String name = toDirectoryName( item.getName() ).substring( parentPath.length() );
+ scmEntry.setName( name );
+ scmEntry.setAuthor( item.getPublisher() );
+ scmEntry.setDate( item.getLastModified().getTime() );
+ scmEntry.setRevision( new Long( item.getVersionNumber() ).longValue() );
+ scmEntry.setSize( 0 );
+ scmEntry.setType( ScmEntry.DIRECTORY );
+ entries.add( scmEntry );
+
+ String pkgNameAsPath = toDirectoryName( item.getName() );
+ for ( Iterator assetIter = item.getAssets(); assetIter.hasNext(); ) {
+ AssetItem assetItem = (AssetItem) assetIter.next();
+
+ scmEntry = new DefaultScmEntry();
+ scmEntry.setPath( pkgNameAsPath );
+ scmEntry.setName( toFileName( assetItem ) );
+ scmEntry.setAuthor( assetItem.getPublisher() );
+ scmEntry.setDate( assetItem.getLastModified().getTime() );
+ scmEntry.setRevision( new Long( assetItem.getVersionNumber() ).longValue() );
+ scmEntry.setSize( 0 );
+ scmEntry.setType( ScmEntry.FILE );
+ entries.add( scmEntry );
+ }
+ }
+
+ return entries;
}
- public void listEntries(String path,
- List list) throws Exception {
+ public static class PackagePathComparator
+ implements
+ Comparator {
+ public int compare(Object object0,
+ Object object1) {
+ PackageItem item0 = (PackageItem) object0;
+ PackageItem item1 = (PackageItem) object1;
+
+ return item0.getName().compareTo( item1.getName() );
+ }
}
public ScmAction moveDirectory(String path,
@@ -104,7 +173,10 @@
String file,
byte[] oldContent,
byte[] newContent) {
- return new UpdateFile(path, file, oldContent, newContent);
+ return new UpdateFile( path,
+ file,
+ oldContent,
+ newContent );
}
public void syncToScmLog(List list,
@@ -234,59 +306,23 @@
public void applyAction(Object context) throws Exception {
RepositoryContext ctx = (RepositoryContext) context;
-
-
- PackageItem pkg = ctx.repository.loadPackage( toPackageName(path) );
-
- StringTokenizer tk = new StringTokenizer(file, ".");
-
+
+ PackageItem pkg = ctx.repository.loadPackage( toPackageName( path ) );
+
+ StringTokenizer tk = new StringTokenizer( file,
+ "." );
+
String name = tk.nextToken();
String format = tk.nextToken();
-
- AssetItem asset = pkg.addAsset( name, ctx.message );
+
+ AssetItem asset = pkg.addAsset( name,
+ ctx.message );
asset.updateFormat( format );
- asset.updateContent( new String(content) );
- ctx.repository.save();
-
+ asset.updateContent( new String( content ) );
}
}
/**
- * This is used for passing in a context to perform the actions.
- */
- public static class RepositoryContext {
-
- public RepositoryContext(RulesRepository repository2, String message2) {
- this.repository = repository2;
- this.message = message2;
- }
-
- public RulesRepository repository;
- public String message;
- }
-
- private static String convertPath(String path, String token, String replace) {
- if (path.indexOf( token ) == -1) return path;
- StringTokenizer tk = new StringTokenizer(path, token);
- StringBuffer buf = new StringBuffer();
- while ( tk.hasMoreTokens() ) {
- String el = tk.nextToken();
- buf.append( el );
- if (tk.hasMoreTokens()) buf.append( replace );
- }
- return buf.toString();
- }
-
- static String toDirectoryName(String packageName) {
- return convertPath( packageName, ".", "/" );
- }
-
- static String toPackageName(String directory) {
- return convertPath( directory, "/", "." );
- }
-
-
- /**
* root should be the last, previously created, parent folder. Each directory in the path
* will be created.
*
@@ -304,7 +340,17 @@
}
public void applyAction(Object context) throws Exception {
+ RepositoryContext ctx = (RepositoryContext) context;
+ ctx.repository.createPackage( "testAddFiles.package",
+ "just for testing" );
+ PackageItem pkgItem = ctx.repository.loadPackage( toPackageName( this.root ) );
+ if ( pkgItem == null ) {
+ throw new RuntimeException( "The parent package '" + this.root + "' must exist" );
+ }
+
+ ctx.repository.createPackage( toPackageName( root + "/" + this.path ),
+ "initial package" );
}
}
@@ -329,9 +375,10 @@
public void applyAction(Object context) throws Exception {
RepositoryContext ctx = (RepositoryContext) context;
PackageItem pkg = ctx.repository.loadPackage( toPackageName( path ) );
- String name = file.substring( 0, file.indexOf( '.' ) );
+ String name = file.substring( 0,
+ file.indexOf( '.' ) );
AssetItem asset = pkg.loadAsset( name );
- asset.updateContent( new String(newContent) );
+ asset.updateContent( new String( newContent ) );
asset.checkin( ctx.message );
}
}
@@ -455,6 +502,50 @@
}
}
+ /**
+ * This is used for passing in a context to perform the actions.
+ */
+ public static class RepositoryContext {
+ public RepositoryContext(RulesRepository repository2,
+ String message2) {
+ this.repository = repository2;
+ this.message = message2;
+ }
+ public RulesRepository repository;
+ public String message;
+ }
+
+ private static String convertPath(String path,
+ String token,
+ String replace) {
+ if ( path.indexOf( token ) == -1 ) return path;
+ StringTokenizer tk = new StringTokenizer( path,
+ token );
+ StringBuffer buf = new StringBuffer();
+ while ( tk.hasMoreTokens() ) {
+ String el = tk.nextToken();
+ buf.append( el );
+ if ( tk.hasMoreTokens() ) buf.append( replace );
+ }
+ return buf.toString();
+ }
+
+ static String toDirectoryName(String packageName) {
+ return convertPath( packageName,
+ ".",
+ "/" );
+ }
+
+ static String toPackageName(String directory) {
+ return convertPath( directory,
+ "/",
+ "." );
+ }
+
+ static String toFileName(AssetItem item) {
+ return item.getName() + "." + item.getFormat();
+ }
+
}
Deleted: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/svn/CompositeSvnAction.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/svn/CompositeSvnAction.java 2007-02-15 13:13:44 UTC (rev 9527)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/svn/CompositeSvnAction.java 2007-02-15 13:16:41 UTC (rev 9528)
@@ -1,38 +0,0 @@
-/**
- *
- */
-package org.drools.scm.svn;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.drools.scm.ScmAction;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.io.ISVNEditor;
-
-public class CompositeSvnAction
- implements
- ScmAction {
- private List actions;
-
- public CompositeSvnAction() {
- this.actions = Collections.EMPTY_LIST;
- }
-
- public void addScmAction(ScmAction action) {
- if ( actions == Collections.EMPTY_LIST ) {
- this.actions = new ArrayList();
- }
- this.actions.add( action );
- }
-
- public void applyAction(Object context) throws Exception {
- ISVNEditor editor = ( ISVNEditor ) context;
- for ( Iterator it = this.actions.iterator(); it.hasNext(); ) {
- ScmAction action = (ScmAction) it.next();
- action.applyAction( editor );
- }
- }
-}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java 2007-02-15 13:13:44 UTC (rev 9527)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java 2007-02-15 13:16:41 UTC (rev 9528)
@@ -1,11 +1,19 @@
package org.drools.scm.jcr;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RepositorySessionUtil;
import org.drools.repository.RulesRepository;
+import org.drools.scm.CompositeScmAction;
import org.drools.scm.ScmAction;
+import org.drools.scm.ScmActionFactory;
+import org.drools.scm.ScmEntry;
import org.drools.scm.jcr.JcrActionFactory.AddFile;
+import org.drools.scm.jcr.JcrActionFactory.AddDirectory;
import junit.framework.TestCase;
@@ -22,6 +30,57 @@
assertEquals("foo", fact.toDirectoryName("foo"));
}
+ public void testAddDirectories() throws Exception {
+ ScmActionFactory svn = new JcrActionFactory( RepositorySessionUtil.getRepository() );
+
+ CompositeScmAction actions = new CompositeScmAction();
+
+ // Correctly add a new Directory at root
+ actions = new CompositeScmAction();
+ ScmAction addDirectory = new AddDirectory( "",
+ "folder1" );
+ actions.addScmAction( addDirectory );
+
+ svn.execute( actions,
+ "test message" );
+
+ // Now check various flat and deep Directory creations
+ actions = new CompositeScmAction();
+
+ addDirectory = new AddDirectory( "folder1",
+ "folder1_1" );
+ actions.addScmAction( addDirectory );
+
+ addDirectory = new AddDirectory( "folder1/folder1_1",
+ "folder1_1_1" );
+ actions.addScmAction( addDirectory );
+
+ addDirectory = new AddDirectory( "folder1",
+ "folder1_2" );
+ actions.addScmAction( addDirectory );
+
+ addDirectory = new AddDirectory( "",
+ "folder2/folder2_1" );
+ actions.addScmAction( addDirectory );
+
+ addDirectory = new AddDirectory( "",
+ "folder3/folder3_1/folder3_1_1/folder3_1_1_1" );
+ actions.addScmAction( addDirectory );
+
+ svn.execute( actions,
+ "test message" );
+ //------
+ // Now test results
+ //-------
+ List list = convertToStringList( svn.listEntries( "" ) );
+
+ assertTrue( list.contains( "folder1" ) );
+ assertTrue( list.contains( "folder1/folder1_1" ) );
+ assertTrue( list.contains( "folder1/folder1_2" ) );
+ assertTrue( list.contains( "folder2/folder2_1" ) );
+ assertTrue( list.contains( "folder3/folder3_1/folder3_1_1/folder3_1_1_1" ) );
+ }
+
public void testAddFiles() throws Exception {
RulesRepository repo = RepositorySessionUtil.getRepository();
@@ -60,10 +119,17 @@
AssetItem asset2 = pkg.loadAsset( "testUpdateFilesSVN" );
assertFalse(oldVersion.equals( asset2.getVersionNumber() ));
assertEquals("lala2", asset2.getContent());
- assertEquals("goo", asset2.getCheckinComment());
-
- }
+ assertEquals("goo", asset2.getCheckinComment());
+ }
+ public static List convertToStringList(List list) {
+ List files = new ArrayList( list.size() );
+
+ for ( Iterator it = list.iterator(); it.hasNext(); ) {
+ ScmEntry entry = (ScmEntry) it.next();
+ files.add( entry.getPath().equals( "" ) ? entry.getName() : entry.getPath() + "/" + entry.getName() );
+ }
+ return files;
+ }
-
}
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnActionFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnActionFactoryTest.java 2007-02-15 13:13:44 UTC (rev 9527)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnActionFactoryTest.java 2007-02-15 13:16:41 UTC (rev 9528)
@@ -1,6 +1,5 @@
package org.drools.scm.svn;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -19,7 +18,7 @@
import junit.framework.TestCase;
//import org.apache.log4j.Logger;
-import org.drools.scm.DefaultScmEntry;
+import org.drools.scm.CompositeScmAction;
import org.drools.scm.ScmAction;
import org.drools.scm.ScmActionFactory;
import org.drools.scm.ScmEntry;
@@ -32,12 +31,8 @@
import org.drools.scm.svn.SvnActionFactory.MoveDirectory;
import org.drools.scm.svn.SvnActionFactory.MoveFile;
import org.drools.scm.svn.SvnActionFactory.UpdateFile;
-import org.tmatesoft.svn.core.SVNDirEntry;
-import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNLogEntry;
import org.tmatesoft.svn.core.SVNLogEntryPath;
-import org.tmatesoft.svn.core.SVNNodeKind;
-import org.tmatesoft.svn.core.io.SVNRepository;
public class SvnActionFactoryTest extends TestCase {
@@ -70,17 +65,17 @@
delete( new File( url.getFile() ) );
}
- public void testCannotAddFolderWithNoParent() throws Exception {
+ public void testCannotAddDirectoryWithNoParent() throws Exception {
ScmActionFactory svn = new SvnActionFactory( svnUrl,
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
try {
- ScmAction addFolder = new AddDirectory( "folder1",
+ ScmAction addDirectory = new AddDirectory( "folder1",
"folder1_1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
svn.execute( actions,
"test message" );
fail( "This should fail as 'folder1' has not yet been created" );
@@ -94,23 +89,23 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
// Correctly add a new directory at root
- actions = new CompositeSvnAction();
- ScmAction addFolder = new AddDirectory( "",
+ actions = new CompositeScmAction();
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
svn.execute( actions,
"test message" );
- // Check we can't add duplicate folders
+ // Check we can't add duplicate Directorys
try {
- actions = new CompositeSvnAction();
- addFolder = new AddDirectory( "",
+ actions = new CompositeScmAction();
+ addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
svn.execute( actions,
"test message" );
fail( "This should fail as 'folder1' already exists" );
@@ -119,44 +114,44 @@
}
}
- public void testAddFolders() throws Exception {
+ public void testAddDirectories() throws Exception {
ScmActionFactory svn = new SvnActionFactory( svnUrl,
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- // Correctly add a new folder at root
- actions = new CompositeSvnAction();
- ScmAction addFolder = new AddDirectory( "",
+ // Correctly add a new Directory at root
+ actions = new CompositeScmAction();
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
svn.execute( actions,
"test message" );
- // Now check various flat and deep folder creations
- actions = new CompositeSvnAction();
+ // Now check various flat and deep Directory creations
+ actions = new CompositeScmAction();
- addFolder = new AddDirectory( "folder1",
+ addDirectory = new AddDirectory( "folder1",
"folder1_1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
- addFolder = new AddDirectory( "folder1/folder1_1",
+ addDirectory = new AddDirectory( "folder1/folder1_1",
"folder1_1_1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
- addFolder = new AddDirectory( "folder1",
+ addDirectory = new AddDirectory( "folder1",
"folder1_2" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
- addFolder = new AddDirectory( "",
+ addDirectory = new AddDirectory( "",
"folder2/folder2_1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
- addFolder = new AddDirectory( "",
+ addDirectory = new AddDirectory( "",
"folder3/folder3_1/folder3_1_1/folder3_1_1_1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
svn.execute( actions,
"test message" );
@@ -170,7 +165,6 @@
assertTrue( list.contains( "folder1/folder1_2" ) );
assertTrue( list.contains( "folder2/folder2_1" ) );
assertTrue( list.contains( "folder3/folder3_1/folder3_1_1/folder3_1_1_1" ) );
-
}
public void testAddFiles() throws Exception {
@@ -178,20 +172,20 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
ScmAction addFile = new AddFile( "folder1",
"file1.dat",
new byte[]{1, 1, 1, 1} );
actions.addScmAction( addFile );
- addFolder = new AddDirectory( "folder1",
+ addDirectory = new AddDirectory( "folder1",
"folder1_1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
addFile = new AddFile( "folder1/folder1_1",
"file1_1.dat",
@@ -231,11 +225,11 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] oldContent = new byte[]{1, 1, 1, 1};
byte[] newContent = new byte[]{1, 0, 1, 0};
@@ -258,7 +252,7 @@
baos.toByteArray() ) );
// Update the existing file
- actions = new CompositeSvnAction();
+ actions = new CompositeScmAction();
ScmAction updateFile = new UpdateFile( "folder1",
"file1.dat",
oldContent,
@@ -287,11 +281,11 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] content = new byte[]{1, 1, 1, 1};
ScmAction addFile = new AddFile( "folder1",
"file1.dat",
@@ -315,10 +309,10 @@
assertFalse( list.contains( "folder2/file2.dat" ) );
// Now copy the file
- actions = new CompositeSvnAction();
- addFolder = new AddDirectory( "",
+ actions = new CompositeScmAction();
+ addDirectory = new AddDirectory( "",
"folder2" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
ScmAction copyFile = new CopyFile( "folder1",
"file1.dat",
"folder2",
@@ -347,20 +341,20 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] content1 = new byte[]{1, 1, 1, 1};
ScmAction addFile = new AddFile( "folder1",
"file1.dat",
content1 );
actions.addScmAction( addFile );
- addFolder = new AddDirectory( "folder1",
+ addDirectory = new AddDirectory( "folder1",
"folder1_1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] content2 = new byte[]{1, 0, 0, 1};
addFile = new AddFile( "folder1/folder1_1",
"file1.dat",
@@ -390,10 +384,10 @@
assertFalse( list.contains( "folder2/folder1/file1.dat" ) );
// Now copy the directory
- actions = new CompositeSvnAction();
- addFolder = new AddDirectory( "",
+ actions = new CompositeScmAction();
+ addDirectory = new AddDirectory( "",
"folder2" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
ScmAction copyDirectory = new CopyDirectory( "folder1",
"folder2/folder1",
svn.getLatestRevision() );
@@ -441,11 +435,11 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] content = new byte[]{1, 1, 1, 1};
ScmAction addFile = new AddFile( "folder1",
"file1.dat",
@@ -468,10 +462,10 @@
assertFalse( list.contains( "folder2/file2.dat" ) );
// No do the file move
- actions = new CompositeSvnAction();
- addFolder = new AddDirectory( "",
+ actions = new CompositeScmAction();
+ addDirectory = new AddDirectory( "",
"folder2" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
MoveFile moveFile = new MoveFile( "folder1",
"file1.dat",
"folder2",
@@ -500,11 +494,11 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] content = new byte[]{1, 1, 1, 1};
ScmAction addFile = new AddFile( "folder1",
"file1.dat",
@@ -522,7 +516,7 @@
assertTrue( Arrays.equals( content,
baos.toByteArray() ) );
- actions = new CompositeSvnAction();
+ actions = new CompositeScmAction();
MoveDirectory moveDirectory = new MoveDirectory( "folder1",
"folder2",
svn.getLatestRevision() );
@@ -551,11 +545,11 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] content = new byte[]{1, 1, 1, 1};
ScmAction addFile = new AddFile( "folder1",
"file1.dat",
@@ -568,7 +562,7 @@
assertTrue( list.contains( "folder1/file1.dat" ) );
// Now do the file delete
- actions = new CompositeSvnAction();
+ actions = new CompositeScmAction();
ScmAction deleteFile = new DeleteFile( "folder1",
"file1.dat" );
actions.addScmAction( deleteFile );
@@ -584,19 +578,19 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] content = new byte[]{1, 1, 1, 1};
ScmAction addFile = new AddFile( "folder1",
"file1.dat",
content );
actions.addScmAction( addFile );
- addFolder = new AddDirectory( "",
+ addDirectory = new AddDirectory( "",
"folder2" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
svn.execute( actions,
"test message" );
List list = convertToStringList( svn.listEntries( "" ) );
@@ -605,7 +599,7 @@
assertTrue( list.contains( "folder2" ) );
// now do the directory delete
- actions = new CompositeSvnAction();
+ actions = new CompositeScmAction();
ScmAction deleteDirectory = new DeleteDirectory( "folder1" );
actions.addScmAction( deleteDirectory );
svn.execute( actions,
@@ -621,11 +615,11 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
- ScmAction addFolder = new AddDirectory( "",
+ ScmAction addDirectory = new AddDirectory( "",
"folder1" );
- actions.addScmAction( addFolder );
+ actions.addScmAction( addDirectory );
byte[] content = new byte[]{1, 1, 1, 1};
ScmAction addFile = new AddFile( "folder1",
"file1.dat",
@@ -634,7 +628,7 @@
svn.execute( actions,
"test message" );
- actions = new CompositeSvnAction();
+ actions = new CompositeScmAction();
MoveDirectory moveDirectory = new MoveDirectory( "folder1",
"folder2",
svn.getLatestRevision() );
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnLogTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnLogTest.java 2007-02-15 13:13:44 UTC (rev 9527)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnLogTest.java 2007-02-15 13:16:41 UTC (rev 9528)
@@ -14,6 +14,7 @@
import java.util.Map;
import java.util.Set;
+import org.drools.scm.CompositeScmAction;
import org.drools.scm.ScmAction;
import org.drools.scm.ScmActionFactory;
import org.drools.scm.ScmEntry;
@@ -58,7 +59,7 @@
"mrtrout",
"drools" );
- CompositeSvnAction actions = new CompositeSvnAction();
+ CompositeScmAction actions = new CompositeScmAction();
ScmAction addFolder = new AddDirectory( "",
"folder1" );
More information about the jboss-svn-commits
mailing list