Index: testsrc/org/aspectj/ajde/NullIdeProperties.java =================================================================== RCS file: /home/technology/org.aspectj/modules/ajde/testsrc/org/aspectj/ajde/NullIdeProperties.java,v retrieving revision 1.7 diff -u -r1.7 NullIdeProperties.java --- testsrc/org/aspectj/ajde/NullIdeProperties.java 8 Jun 2005 23:38:04 -0000 1.7 +++ testsrc/org/aspectj/ajde/NullIdeProperties.java 3 May 2006 15:47:43 -0000 @@ -33,6 +33,7 @@ private Set sourceRoots; private Set aspectPath; private String outJar; + private String outputPath = "bin"; public NullIdeProperties(String testProjectPath) { this.testProjectPath = testProjectPath; @@ -75,7 +76,11 @@ } public String getOutputPath() { - return testProjectPath + "/bin"; + return testProjectPath + "/" + outputPath; + } + + public void setOutputPath(String outputPath) { + this.outputPath = outputPath; } public String getAjcWorkingDir() { Index: testsrc/org/aspectj/ajde/ResourceCopyTestCase.java =================================================================== RCS file: /home/technology/org.aspectj/modules/ajde/testsrc/org/aspectj/ajde/ResourceCopyTestCase.java,v retrieving revision 1.8 diff -u -r1.8 ResourceCopyTestCase.java --- testsrc/org/aspectj/ajde/ResourceCopyTestCase.java 17 Mar 2004 12:26:01 -0000 1.8 +++ testsrc/org/aspectj/ajde/ResourceCopyTestCase.java 3 May 2006 15:47:43 -0000 @@ -98,6 +98,29 @@ assertTrue("Build warnings",ideManager.getCompilationSourceLineTasks().isEmpty()); compareInjarsToBin(injar1,"src","bin"); } + + public void testInjarsToOddBin () { + Set injars = new HashSet(); + File injar1 = openFile(injar1Name); + injars.add(injar1); + ideManager.getProjectProperties().setOutputPath("crazy.jar"); + ideManager.getProjectProperties().setInJars(injars); + assertTrue("Build failed",doSynchronousBuild("config2.lst")); + assertTrue("Build warnings",ideManager.getCompilationSourceLineTasks().isEmpty()); + compareInjarsToBin(injar1,"src","crazy.jar"); + } + + public void testInjarsToOutjarOddNames () { + Set injars = new HashSet(); + File injar1 = openFile("input1"); + File outjar = openFile(outjarName+".fozout"); + injars.add(injar1); + ideManager.getProjectProperties().setInJars(injars); + ideManager.getProjectProperties().setOutJar(outjar.getAbsolutePath()); + assertTrue("Build failed",doSynchronousBuild("config2.lst")); + assertTrue("Build warnings",ideManager.getCompilationSourceLineTasks().isEmpty()); + compareJars(injar1,"src",outjar); + } /* * Ensure bin contains all non-Java resouces from source and injars Index: testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java =================================================================== RCS file: /home/technology/org.aspectj/modules/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java,v retrieving revision 1.9 diff -u -r1.9 LstBuildConfigManagerTest.java --- testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java 24 Nov 2005 15:25:50 -0000 1.9 +++ testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java 3 May 2006 15:47:44 -0000 @@ -54,7 +54,7 @@ doSynchronousBuild("bad-injar.lst"); messages = NullIdeManager.getIdeManager().getCompilationSourceLineTasks(); message = (NullIdeTaskListManager.SourceLineTask)messages.get(0); - assertTrue(message.getContainedMessage().getMessage().indexOf("bad inpath") != -1); + assertTrue(message.getContainedMessage().getMessage().indexOf("skipping missing, empty or corrupt inpath entry") != -1); } public void testErrorMessages() throws IOException {