You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ad...@apache.org on 2003/06/28 12:52:30 UTC

cvs commit: jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test LastModifiedTests.java ProviderTestSuite.java

adammurdoch    2003/06/28 03:52:30

  Modified:    vfs      project.properties
               vfs/src/test/org/apache/commons/vfs/provider/url/test
                        UrlProviderTestCase.java
               vfs/src/test/org/apache/commons/vfs/test
                        ProviderTestSuite.java
  Added:       vfs/src/test/org/apache/commons/vfs/provider/http/test
                        HttpProviderTestCase.java
               vfs/src/test/org/apache/commons/vfs/test
                        LastModifiedTests.java
  Log:
  - Added unit tests for the HTTP provider.
  - Added unit tests for last-modified time.
  
  Revision  Changes    Path
  1.15      +2 -1      jakarta-commons-sandbox/vfs/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/project.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- project.properties	24 Feb 2003 08:29:02 -0000	1.14
  +++ project.properties	28 Jun 2003 10:52:30 -0000	1.15
  @@ -11,7 +11,7 @@
   #maven.linkcheck.enable = off
   maven.repo.remote=file://${basedir}/lib,http://www.ibiblio.org/maven
   maven.junit.fork = true
  -maven.junit.sysproperties = test.basedir test.ftp.uri test.smb.uri test.webdav.uri test.sftp.uri
  +maven.junit.sysproperties = test.basedir test.ftp.uri test.smb.uri test.webdav.uri test.sftp.uri test.http.uri
   maven.test.failure.ignore=true
   maven.ant.excludeTests=**/*.java
   
  @@ -21,6 +21,7 @@
   test.secure=false
   test.smb.uri=smb://${test.user}:${test.password}@${test.hostname}/${test.user}${test.path}
   test.ftp.uri=ftp://${test.user}:${test.password}@${test.hostname}${test.path}
  +test.http.uri=http://${test.hostname}${test.path}
   test.webdav.uri=webdav://${test.user}:${test.password}@${test.hostname}${test.path}
   test.sftp.uri=sftp://${test.user}:${test.password}@${test.hostname}/home/${test.user}${test.path}
   
  
  
  
  1.1                  jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/http/test/HttpProviderTestCase.java
  
  Index: HttpProviderTestCase.java
  ===================================================================
  /* ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.commons.vfs.provider.http.test;
  
  import junit.framework.Test;
  import org.apache.commons.vfs.test.AbstractProviderTestConfig;
  import org.apache.commons.vfs.test.ProviderTestSuite;
  import org.apache.commons.vfs.impl.DefaultFileSystemManager;
  import org.apache.commons.vfs.provider.http.HttpFileProvider;
  import org.apache.commons.vfs.FileObject;
  import org.apache.commons.vfs.FileSystemManager;
  
  /**
   * Test cases for the HTTP provider.
   *
   * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
   * @version $Revision: 1.1 $ $Date: 2003/06/28 10:52:30 $
   */
  public class HttpProviderTestCase
      extends AbstractProviderTestConfig
  {
      public static Test suite() throws Exception
      {
          return new ProviderTestSuite( new HttpProviderTestCase() );
      }
  
      /**
       * Prepares the file system manager.
       */
      public void prepare( final DefaultFileSystemManager manager )
          throws Exception
      {
          manager.addProvider( "http", new HttpFileProvider() );
      }
  
      /**
       * Returns the base folder for tests.
       */
      public FileObject getBaseTestFolder( final FileSystemManager manager )
          throws Exception
      {
          final String uri = System.getProperty( "test.http.uri" );
          return manager.resolveFile( uri );
      }
  }
  
  
  
  1.6       +1 -3      jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/url/test/UrlProviderTestCase.java
  
  Index: UrlProviderTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/provider/url/test/UrlProviderTestCase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- UrlProviderTestCase.java	17 Feb 2003 09:22:16 -0000	1.5
  +++ UrlProviderTestCase.java	28 Jun 2003 10:52:30 -0000	1.6
  @@ -63,7 +63,6 @@
   import org.apache.commons.vfs.FileSystemManager;
   import org.apache.commons.vfs.impl.DefaultFileSystemManager;
   import org.apache.commons.vfs.provider.url.UrlFileProvider;
  -import org.apache.commons.vfs.provider.jar.JarFileProvider;
   import org.apache.commons.vfs.test.AbstractProviderTestConfig;
   import org.apache.commons.vfs.test.ProviderTestSuite;
   
  @@ -88,7 +87,6 @@
           throws Exception
       {
           manager.addProvider( "file", new UrlFileProvider() );
  -        manager.addProvider( "jar", new JarFileProvider() );
       }
   
       /**
  
  
  
  1.12      +2 -1      jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/ProviderTestSuite.java
  
  Index: ProviderTestSuite.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/ProviderTestSuite.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ProviderTestSuite.java	23 Feb 2003 00:40:37 -0000	1.11
  +++ ProviderTestSuite.java	28 Jun 2003 10:52:30 -0000	1.12
  @@ -127,6 +127,7 @@
           addTests( ContentTests.class );
           addTests( ProviderReadTests.class );
           addTests( ProviderWriteTests.class );
  +        addTests( LastModifiedTests.class );
           addTests( UrlTests.class );
           addTests( UrlStructureTests.class );
           addTests( VfsClassLoaderTests.class );
  
  
  
  1.1                  jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/LastModifiedTests.java
  
  Index: LastModifiedTests.java
  ===================================================================
  /* ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.commons.vfs.test;
  
  import org.apache.commons.vfs.Capability;
  import org.apache.commons.vfs.FileObject;
  
  /**
   * Test cases for getting and setting file last modified time.
   *
   * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
   * @version $Revision: 1.1 $ $Date: 2003/06/28 10:52:30 $
   */
  public class LastModifiedTests
      extends AbstractProviderTestCase
  {
      /**
       * Returns the capabilities required by the tests of this test case.
       */
      protected Capability[] getRequiredCaps()
      {
          return new Capability[] {
              Capability.GET_LAST_MODIFIED
          };
      }
  
      /**
       * Tests getting the last modified time of a file.
       */
      public void testGetLastModified() throws Exception {
          // Try a file.
          final FileObject file = getReadFolder().resolveFile( "file1.txt" );
          file.getContent().getLastModifiedTime();
  
          // TODO - switch this on
          // Try a folder
          //final FileObject folder = getReadFolder().resolveFile( "dir1" );
          //folder.getContent().getLastModifiedTime();
      }
  
      /**
       * Tests setting the last modified time of file.
       */
      public void testSetLastModified() throws Exception {
          if ( !getReadFolder().getFileSystem().hasCapability( Capability.SET_LAST_MODIFIED ) )
          {
              // Can't set last modified
              return;
          }
          final long now = System.currentTimeMillis();
  
          // Try a file
          final FileObject file = getReadFolder().resolveFile( "file1.txt" );
          file.getContent().setLastModifiedTime( now);
          assertEquals( now, file.getContent().getLastModifiedTime() );
  
          // Try a folder
          final FileObject folder = getReadFolder().resolveFile( "dir1" );
          folder.getContent().setLastModifiedTime( now );
          assertEquals( now, folder.getContent().getLastModifiedTime() );
      }
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org