From: Curt A. <ca...@us...> - 2005-02-10 16:05:46
|
Update of /cvsroot/ant-contrib/ant-contrib/test/src/net/sf/antcontrib/logic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25715/net/sf/antcontrib/logic Modified Files: TryCatchTaskTest.java Log Message: TryCatch test not updated for v 1.4 of task Index: TryCatchTaskTest.java =================================================================== RCS file: /cvsroot/ant-contrib/ant-contrib/test/src/net/sf/antcontrib/logic/TryCatchTaskTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TryCatchTaskTest.java 5 Feb 2004 16:36:56 -0000 1.4 --- TryCatchTaskTest.java 10 Feb 2005 16:05:24 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (c) 2001-2004 Ant-Contrib project. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); --- 1,4 ---- /* ! * Copyright (c) 2001-2005 Ant-Contrib project. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); *************** *** 34,43 **** public void testFullTest() { executeTarget("fullTest"); - int message = getLog().indexOf("Caught exception: Tada!"); - int catchBlock = getLog().indexOf("In <catch>"); - int finallyBlock = getLog().indexOf("In <finally>"); - assertTrue(message > -1); - assertTrue(catchBlock > message); - assertTrue(finallyBlock > catchBlock); assertEquals("Tada!", getProject().getProperty("foo")); Object e = getProject().getReference("bar"); --- 34,37 ---- *************** *** 48,53 **** public void testTwoCatches() { ! expectSpecificBuildException("twoCatches", "two catch children", ! "You must not specify more than one <catch>"); } --- 42,47 ---- public void testTwoCatches() { ! // two catch blocks were not supported prior to TryCatchTask.java v 1.4. ! executeTarget("twoCatches"); } |