From: Dean H. <dea...@us...> - 2003-11-23 15:06:41
|
Update of /cvsroot/ant-contrib/ant-contrib/test/src/net/sf/antcontrib/walls In directory sc8-pr-cvs1:/tmp/cvs-serv19568/test/src/net/sf/antcontrib/walls Modified Files: CompileWithWallsTest.java Log Message: ctrl-c now works with compilewithwalls task. killing ant in middle of run does not hose up files. Index: CompileWithWallsTest.java =================================================================== RCS file: /cvsroot/ant-contrib/ant-contrib/test/src/net/sf/antcontrib/walls/CompileWithWallsTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CompileWithWallsTest.java 20 Nov 2003 13:00:27 -0000 1.5 --- CompileWithWallsTest.java 23 Nov 2003 15:06:38 -0000 1.6 *************** *** 49,57 **** --- 49,60 ---- import java.io.File; + import java.io.PrintStream; import junit.framework.TestSuite; import junit.textui.TestRunner; + import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildFileTest; + import org.apache.tools.ant.BuildListener; /** *************** *** 77,89 **** } ! public void setUp() { configureProject("test/resources/walls/compilewithwalls.xml"); } ! public void tearDown() { executeTarget("cleanup"); } ! public void testTooManyNestedWallElements() { expectSpecificBuildException("testTooManyNestedWallElements" , "TooManyNestedWallElements" --- 80,162 ---- } ! public void setUp() { ! configureProject("test/resources/walls/compilewithwalls.xml"); + // project.addBuildListener(new LogListener()); } ! // protected class LogListener implements BuildListener { ! // ! // /* (non-Javadoc) ! // * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent) ! // */ ! // public void buildStarted(BuildEvent event) { ! // // TODO Auto-generated method stub ! // ! // } ! // ! // /* (non-Javadoc) ! // * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent) ! // */ ! // public void buildFinished(BuildEvent event) { ! // // TODO Auto-generated method stub ! // ! // } ! // ! // /* (non-Javadoc) ! // * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent) ! // */ ! // public void targetStarted(BuildEvent event) { ! // // TODO Auto-generated method stub ! // ! // } ! // ! // /* (non-Javadoc) ! // * @see org.apache.tools.ant.BuildListener#targetFinished(org.apache.tools.ant.BuildEvent) ! // */ ! // public void targetFinished(BuildEvent event) { ! // // TODO Auto-generated method stub ! // ! // } ! // ! // /* (non-Javadoc) ! // * @see org.apache.tools.ant.BuildListener#taskStarted(org.apache.tools.ant.BuildEvent) ! // */ ! // public void taskStarted(BuildEvent event) { ! // // TODO Auto-generated method stub ! // ! // } ! // ! // /* (non-Javadoc) ! // * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent) ! // */ ! // public void taskFinished(BuildEvent event) { ! // // TODO Auto-generated method stub ! // ! // } ! // ! // /* (non-Javadoc) ! // * @see org.apache.tools.ant.BuildListener#messageLogged(org.apache.tools.ant.BuildEvent) ! // */ ! // public void messageLogged(BuildEvent event) { ! // ! // System.out.println(event.getException()); ! // System.out.println("aaa"); ! // } ! // ! // } ! public void tearDown() { executeTarget("cleanup"); + + // System.out.println(getFullLog()); + // System.out.println("std out. from ant build begin--------------"); + // System.out.println(getOutput()); + // System.out.println("std.out. from ant build end----------------"); + // System.out.println("std err. from ant build begin--------------"); + // System.out.println(getError()); + // System.out.println("std.err. from ant build end----------------"); } ! public void testTooManyNestedWallElements() { expectSpecificBuildException("testTooManyNestedWallElements" , "TooManyNestedWallElements" *************** *** 124,127 **** --- 197,220 ---- , "Javac inside compilewithwalls must have a srcdir specified"); } + + public void testIntermediaryDirAndDestDirSame() { + expectSpecificBuildException("testIntermediaryDirAndDestDirSame" + , "IntermediaryDirAndDestDirSame" + , "intermediaryBuildDir attribute cannot be specified\n" + +"to be the same as destdir or inside desdir of the javac task.\n" + +"This is an intermediary build directory only used by the\n" + +"compilewithwalls task, not the class file output directory.\n" + +"The class file output directory is specified in javac's destdir attribute"); + } + + public void testIntermediaryDirInsideDestDir() { + expectSpecificBuildException("testIntermediaryDirInsideDestDir" + , "IntermediaryDirInsideDestDir" + , "intermediaryBuildDir attribute cannot be specified\n" + +"to be the same as destdir or inside desdir of the javac task.\n" + +"This is an intermediary build directory only used by the\n" + +"compilewithwalls task, not the class file output directory.\n" + +"The class file output directory is specified in javac's destdir attribute"); + } public void testPackageDoesntEndWithStar() { *************** *** 202,207 **** public void testDependsOnPackageAfterExternalWalls() { ! expectSpecificBuildException("testDependsOnPackageAfter" ! , "DependsOnPackageAfter" , "package name=modA did not have modB" + " listed before it and cannot compile without it"); --- 295,300 ---- public void testDependsOnPackageAfterExternalWalls() { ! expectSpecificBuildException("testDependsOnPackageAfterExternalWalls" ! , "DependsOnPackageAfterExternalWalls" , "package name=modA did not have modB" + " listed before it and cannot compile without it"); *************** *** 249,254 **** f1.exists()); else ! assertFalse("The java file="+f1.getAbsolutePath()+" exists and shouldn't, we can't run this test. It will pass with false results", ! f1.exists()); } --- 342,347 ---- f1.exists()); else ! assertTrue("The java file="+f1.getAbsolutePath()+" exists and shouldn't, we can't run this test. It will pass with false results", ! !f1.exists()); } *************** *** 265,270 **** f1.exists()); else ! assertFalse("The class file="+f1.getAbsolutePath()+" exists and shouldn't\nTest may be inaccurate if this file already exists...correct the test", ! f1.exists()); } --- 358,363 ---- f1.exists()); else ! assertTrue("The class file="+f1.getAbsolutePath()+" exists and shouldn't\nTest may be inaccurate if this file already exists...correct the test", ! !f1.exists()); } |