commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdigg...@apache.org
Subject cvs commit: jakarta-commons-sandbox/codec-multipart/src/test/org/apache/commons/codec/multipart MultipartTest.java
Date Mon, 12 Jan 2004 22:24:42 GMT
mdiggory    2004/01/12 14:24:42

  Modified:    codec-multipart/src/test/org/apache/commons/codec/multipart
                        MultipartTest.java
  Log:
  make sure file is still removed even if test fails.
  
  Revision  Changes    Path
  1.3       +103 -104  jakarta-commons-sandbox/codec-multipart/src/test/org/apache/commons/codec/multipart/MultipartTest.java
  
  Index: MultipartTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/codec-multipart/src/test/org/apache/commons/codec/multipart/MultipartTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MultipartTest.java	12 Jan 2004 22:20:05 -0000	1.2
  +++ MultipartTest.java	12 Jan 2004 22:24:41 -0000	1.3
  @@ -1,64 +1,53 @@
   /*
  - * $Header$
  - * $Revision$
  - * $Date$
  - *
  + * $Header:
  + * /home/cvs/jakarta-commons-sandbox/codec-multipart/src/test/org/apache/commons/codec/multipart/MultipartTest.java,v
  + * 1.2 2004/01/12 22:20:05 mdiggory Exp $ $Revision$ $Date: 2004/01/12
  + * 22:20:05 $
  + * 
    * ====================================================================
  - *
  + * 
    * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  + * 
  + * Copyright (c) 2002-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.
  + * 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/>.
  - *
  + * 
  + * 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/> .
  + * 
    * [Additional notices, if required by prior licensing conditions]
  - *
  + *  
    */
   
   package org.apache.commons.codec.multipart;
  @@ -86,56 +75,66 @@
   /**
    * @author <a href="mailto:mdiggory@latte.harvard.edu">Mark Diggory</a>
    */
  -public class MultipartTest extends TestCase{
  +public class MultipartTest extends TestCase {
   
  -    /** Log object for this class. */
  -    private static final Log LOG = LogFactory.getLog(MultipartTest.class);
  +	/** Log object for this class. */
  +	private static final Log LOG = LogFactory.getLog(MultipartTest.class);
   
  -    /**
  -     * No-arg constructor.
  -     */
  -    public MultipartTest() {
  -        super();
  -    }
  -
  -    public void testBasicEncodeDecode() throws Exception {
  -    	
  -    	File file = File.createTempFile("test","txt");
  -    	FileWriter writer = new FileWriter(file);
  -    	writer.write("This is a test");
  -    	writer.close();
  -    	
  -    	MultipartCodec codec = MultipartCodecFactory.newMultipartCodec();
  -
  -    	Part[] parts = new Part[]{
  -    		new StringPart("test1name", "test1value"),
  -			new StringPart("test2name", "test2value"),
  -			new FilePart("test3name", file),
  -			new FilePart("test4name","test4filename",file)
  -    	};
  -
  -    	ByteArrayOutputStream out = new ByteArrayOutputStream();
  -    	codec.writeTo(out, parts);
  -
  -    	ByteArrayOutputStream result = new ByteArrayOutputStream();
  -    	InputStream in = this.getClass().getResourceAsStream("result.txt");
  -    	
  -    	try {
  -    		byte[] tmp = new byte[4096];
  -    		int len;
  -    		while ((len = in.read(tmp)) >= 0) {
  -    			result.write(tmp, 0, len);
  -    		}
  -    	} finally {
  -    		// we're done with the stream, close it
  -    		in.close();
  -    	}
  -    	
  -    	System.out.print(new String(out.toByteArray()));
  -    	
  -		assertEquals(new String(result.toByteArray()),new String(out.toByteArray()));
  -  
  -    	file.delete();
  -    }
  +	/**
  +	 * No-arg constructor.
  +	 */
  +	public MultipartTest() {
  +		super();
  +	}
  +
  +	public void testBasicEncodeDecode() throws Exception {
  +
  +		File file = File.createTempFile("test", "txt");
  +		
  +		try {
  +			
  +			FileWriter writer = new FileWriter(file);
  +			writer.write("This is a test");
  +			writer.close();
  +
  +			MultipartCodec codec = MultipartCodecFactory.newMultipartCodec();
  +
  +			Part[] parts =
  +				new Part[] {
  +					new StringPart("test1name", "test1value"),
  +					new StringPart("test2name", "test2value"),
  +					new FilePart("test3name", file),
  +					new FilePart("test4name", "test4filename", file)};
  +
  +			ByteArrayOutputStream out = new ByteArrayOutputStream();
  +			codec.writeTo(out, parts);
  +
  +			ByteArrayOutputStream result = new ByteArrayOutputStream();
  +			InputStream in = this.getClass().getResourceAsStream("result.txt");
  +
  +			try {
  +				byte[] tmp = new byte[4096];
  +				int len;
  +				while ((len = in.read(tmp)) >= 0) {
  +					result.write(tmp, 0, len);
  +				}
  +			} finally {
  +				// we're done with the stream, close it
  +				in.close();
  +			}
  +
  +			System.out.print(new String(out.toByteArray()));
  +
  +			assertEquals(
  +				new String(result.toByteArray()),
  +				new String(out.toByteArray()));
  +
  +		} finally {
  +			if (file.exists()) {
  +				file.delete();
  +			}
  +		}
  +
  +	}
   
   }
  
  
  

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


Mime
View raw message