Return-Path: Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 3507 invoked by uid 500); 21 Apr 2003 20:48:27 -0000 Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list cvs@avalon.apache.org Received: (qmail 3457 invoked by uid 500); 21 Apr 2003 20:48:27 -0000 Received: (qmail 3434 invoked from network); 21 Apr 2003 20:48:27 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 21 Apr 2003 20:48:27 -0000 Received: (qmail 56028 invoked by uid 1152); 21 Apr 2003 20:48:26 -0000 Date: 21 Apr 2003 20:48:26 -0000 Message-ID: <20030421204826.56027.qmail@icarus.apache.org> From: bloritsch@apache.org To: avalon-excalibur-cvs@apache.org Subject: cvs commit: avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/util/test CompositeExceptionTestCase.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bloritsch 2003/04/21 13:48:26 Modified: fortress/src/java/org/apache/avalon/fortress/util CompositeException.java Added: fortress/src/test/org/apache/avalon/fortress/util/test CompositeExceptionTestCase.java Log: add new testcase, and fix contracts/semantics of compositeexception Revision Changes Path 1.4 +4 -4 avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/CompositeException.java Index: CompositeException.java =================================================================== RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/CompositeException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CompositeException.java 18 Apr 2003 20:02:30 -0000 1.3 +++ CompositeException.java 21 Apr 2003 20:48:26 -0000 1.4 @@ -33,13 +33,13 @@ m_message = message; } - public Exception[] getExceptions() + public String getMessage() { - return m_ex; + return m_message; } - public String toString() + public Exception[] getExceptions() { - return m_message; + return m_ex; } } 1.1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/util/test/CompositeExceptionTestCase.java Index: CompositeExceptionTestCase.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, 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 acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Jakarta", "Avalon", "Excalibur" 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 name, without prior written permission of the Apache Software Foundation. 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 (INCLU- DING, 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 . */ package org.apache.avalon.fortress.util.test; import junit.framework.TestCase; import org.apache.avalon.fortress.InitializationException; import org.apache.avalon.fortress.util.CompositeException; /** * CompositeExceptionTestCase does XYZ * * @author Berin Loritsch * @version CVS $ Revision: 1.1 $ */ public class CompositeExceptionTestCase extends TestCase { private Exception[] m_exceptions; public CompositeExceptionTestCase( String name ) { super( name ); } public void setUp() { m_exceptions = new Exception[2]; m_exceptions[0] = new RuntimeException("Test1"); m_exceptions[1] = new RuntimeException("Test2"); } public void testRegularCreation() { CompositeException exc = new CompositeException( m_exceptions ); assertNotNull( exc ); assertNotNull( exc.getMessage() ); assertTrue( null == exc.getCause() ); assertNotNull( exc.getExceptions() ); final StringBuffer msg = new StringBuffer(); for ( int i = 0; i < m_exceptions.length; i++ ) { msg.append( m_exceptions[i].getMessage() ); } final String message = msg.toString(); assertEquals( message, exc.getMessage() ); Exception[] exceptions = exc.getExceptions(); assertEquals( m_exceptions.length, exceptions.length ); for (int i = 0; i < exceptions.length; i++) { assertEquals( m_exceptions[i], exceptions[i]); } } public void testNestedCreation() { final String message = "Message"; CompositeException exc = new CompositeException( m_exceptions, message ); assertNotNull( exc ); assertNotNull( exc.getMessage() ); assertTrue( null == exc.getCause() ); assertNotNull( exc.getExceptions() ); assertEquals( message, exc.getMessage() ); Exception[] exceptions = exc.getExceptions(); assertEquals( m_exceptions.length, exceptions.length ); for ( int i = 0; i < exceptions.length; i++ ) { assertEquals( m_exceptions[i], exceptions[i] ); } } public void testIllegalArgument() { try { new CompositeException(null); fail("Did not throw an IllegalArgumentException"); } catch(IllegalArgumentException iae) { // SUCCESS!! } catch(Exception e) { fail("Threw the wrong exception: " + e.getClass().getName()); } try { new CompositeException( new Exception[] {} ); fail( "Did not throw an IllegalArgumentException" ); } catch ( IllegalArgumentException iae ) { // SUCCESS!! } catch ( Exception e ) { fail( "Threw the wrong exception: " + e.getClass().getName() ); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org