tbennett 2004/04/21 10:55:04
Modified:
composition/impl/src/test/org/apache/avalon/composition/model/impl/fileset
FilesetModelTestCase.java
Log:
changed test case in response to trimming of the FilesetModel interface
Revision Changes Path
1.4 +25 -33
avalon/composition/impl/src/test/org/apache/avalon/composition/model/impl/fileset/FilesetModelTestCase.java
Index: FilesetModelTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/composition/impl/src/test/org/apache/avalon/composition/model/impl/fileset/FilesetModelTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FilesetModelTestCase.java 21 Apr 2004 06:45:13 -0000 1.3
+++ FilesetModelTestCase.java 21 Apr 2004 17:55:03 -0000 1.4
@@ -31,7 +31,6 @@
public class FilesetModelTestCase extends TestCase
{
- private DefaultFilesetModel m_model;
private ConsoleLogger m_logger;
private File m_root;
@@ -42,7 +41,6 @@
{
m_root = new File( System.getProperty( "basedir" ) );
m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO );
- m_model = new DefaultFilesetModel( m_logger );
}
/**
@@ -50,7 +48,6 @@
*/
public void tearDown() throws Exception
{
- m_model = null;
m_logger = null;
}
@@ -72,13 +69,12 @@
// make up a *bad* fileset directory attribute
FilesetDirective fsd = new FilesetDirective( "junk", includes, excludes );
- // set the fileset model's anchor directory and set of includes/excludes
+ // create the fileset model's anchor directory
File anchor = new File( m_root, fsd.getBaseDirectory() );
- m_model.setBaseDirectory( anchor );
- m_model.setIncludeDirectives( fsd.getIncludes() );
- m_model.setExcludeDirectives( fsd.getExcludes() );
- m_model.setDefaultIncludes( null );
- m_model.setDefaultExcludes( null );
+
+ // create the Fileset Model
+ DefaultFilesetModel m_model = new DefaultFilesetModel( anchor,
fsd.getIncludes(),
+ fsd.getExcludes(), null, null, m_logger );
// do the test...
try
@@ -118,13 +114,12 @@
final String dir = "target/test";
FilesetDirective fsd = new FilesetDirective( dir, includes, excludes );
- // set the fileset model's anchor directory and set of includes/excludes
+ // create the fileset model's anchor directory
File anchor = new File( m_root, fsd.getBaseDirectory() );
- m_model.setBaseDirectory( anchor );
- m_model.setIncludeDirectives( fsd.getIncludes() );
- m_model.setExcludeDirectives( fsd.getExcludes() );
- m_model.setDefaultIncludes( null );
- m_model.setDefaultExcludes( null );
+
+ // create the Fileset Model
+ DefaultFilesetModel m_model = new DefaultFilesetModel( anchor,
fsd.getIncludes(),
+ fsd.getExcludes(), null, null, m_logger );
// do the test...
try
@@ -182,13 +177,12 @@
final String dir = "target/test/ext";
FilesetDirective fsd = new FilesetDirective( dir, includes, excludes );
- // set the fileset model's anchor directory and set of includes/excludes
+ // create the fileset model's anchor directory
File anchor = new File( m_root, fsd.getBaseDirectory() );
- m_model.setBaseDirectory( anchor );
- m_model.setIncludeDirectives( fsd.getIncludes() );
- m_model.setExcludeDirectives( fsd.getExcludes() );
- m_model.setDefaultIncludes( null );
- m_model.setDefaultExcludes( null );
+
+ // create the Fileset Model
+ DefaultFilesetModel m_model = new DefaultFilesetModel( anchor,
fsd.getIncludes(),
+ fsd.getExcludes(), null, null, m_logger );
// do the test...
try
@@ -252,13 +246,12 @@
final String dir = "target/test/ext";
FilesetDirective fsd = new FilesetDirective( dir, includes, excludes );
- // set the fileset model's anchor directory and set of includes/excludes
+ // create the fileset model's anchor directory
File anchor = new File( m_root, fsd.getBaseDirectory() );
- m_model.setBaseDirectory( anchor );
- m_model.setIncludeDirectives( fsd.getIncludes() );
- m_model.setExcludeDirectives( fsd.getExcludes() );
- m_model.setDefaultIncludes( null );
- m_model.setDefaultExcludes( null );
+
+ // create the Fileset Model
+ DefaultFilesetModel m_model = new DefaultFilesetModel( anchor,
fsd.getIncludes(),
+ fsd.getExcludes(), null, null, m_logger );
// do the test...
try
@@ -323,13 +316,12 @@
final String dir = "target/test";
FilesetDirective fsd = new FilesetDirective( dir, includes, excludes );
- // set the fileset model's anchor directory and set of includes/excludes
+ // create the fileset model's anchor directory
File anchor = new File( m_root, fsd.getBaseDirectory() );
- m_model.setBaseDirectory( anchor );
- m_model.setIncludeDirectives( fsd.getIncludes() );
- m_model.setExcludeDirectives( fsd.getExcludes() );
- m_model.setDefaultIncludes( null );
- m_model.setDefaultExcludes( null );
+
+ // create the Fileset Model
+ DefaultFilesetModel m_model = new DefaultFilesetModel( anchor,
fsd.getIncludes(),
+ fsd.getExcludes(), null, null, m_logger );
// do the test...
try
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
