Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@apache.org Received: (qmail 98489 invoked from network); 25 Nov 2002 05:46:25 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 25 Nov 2002 05:46:25 -0000 Received: (qmail 3458 invoked by uid 97); 25 Nov 2002 05:47:34 -0000 Delivered-To: qmlist-jakarta-archive-commons-dev@jakarta.apache.org Received: (qmail 3438 invoked by uid 97); 25 Nov 2002 05:47:33 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 3427 invoked by uid 97); 25 Nov 2002 05:47:33 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 25 Nov 2002 05:46:18 -0000 Message-ID: <20021125054618.7804.qmail@icarus.apache.org> From: adammurdoch@apache.org To: jakarta-commons-sandbox-cvs@apache.org Subject: cvs commit: jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test AbstractProviderTestCase.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N adammurdoch 2002/11/24 21:46:18 Modified: vfs/src/test/org/apache/commons/vfs/test AbstractProviderTestCase.java Log: Assume we always have provider config. Revision Changes Path 1.4 +11 -24 jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/AbstractProviderTestCase.java Index: AbstractProviderTestCase.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/AbstractProviderTestCase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractProviderTestCase.java 23 Nov 2002 00:33:55 -0000 1.3 +++ AbstractProviderTestCase.java 25 Nov 2002 05:46:18 -0000 1.4 @@ -103,14 +103,6 @@ } /** - * Returns the provider config for this test. - */ - public ProviderTestConfig getProviderConfig() - { - return providerConfig; - } - - /** * Returns the file system manager used by this test. */ protected DefaultFileSystemManager getManager() @@ -119,7 +111,7 @@ } /** - * Returns the read test folder. + * Returns the read test folder. Asserts that the read folder exists. */ protected FileObject getReadFolder() { @@ -164,23 +156,18 @@ manager.setReplicator( new PrivilegedFileReplicator( replicator ) ); manager.setTemporaryFileStore( replicator ); - if ( providerConfig != null ) - { - providerConfig.prepare( manager ); - } + providerConfig.prepare( manager ); manager.init(); - if ( providerConfig != null ) - { - // Locate the base folder - final FileObject baseFolder = providerConfig.getBaseTestFolder( manager ); - readFolder = baseFolder.resolveFile( "read-tests" ); - writeFolder = baseFolder.resolveFile( "write-tests" ); - - // Make some assumptions about the name - assertFalse( readFolder.getName().getPath().equals( FileName.ROOT_PATH ) ); - } + // Locate the base folder + final FileObject baseFolder = providerConfig.getBaseTestFolder( manager ); + readFolder = baseFolder.resolveFile( "read-tests" ); + writeFolder = baseFolder.resolveFile( "write-tests" ); + + // Make some assumptions about the read folder + assertTrue( readFolder.exists() ); + assertFalse( readFolder.getName().getPath().equals( FileName.ROOT_PATH ) ); } /** -- To unsubscribe, e-mail: For additional commands, e-mail: