Attachment #40233 for bug #137235

Lines 33-38 Link Here

(-)testsrc/org/aspectj/ajde/NullIdeProperties.java (-1 / +6 lines)
33	private Set sourceRoots;	33	private Set sourceRoots;
34	private Set aspectPath;	34	private Set aspectPath;
35	private String outJar;	35	private String outJar;
		36	private String outputPath = "bin";
36		37
37	public NullIdeProperties(String testProjectPath) {	38	public NullIdeProperties(String testProjectPath) {
38	this.testProjectPath = testProjectPath;	39	this.testProjectPath = testProjectPath;
Lines 75-81 Link Here
75	}	76	}
76		77
77	public String getOutputPath() {	78	public String getOutputPath() {
78	return testProjectPath + "/bin";	79	return testProjectPath + "/" + outputPath;
		80	}
		81
		82	public void setOutputPath(String outputPath) {
		83	this.outputPath = outputPath;
79	}	84	}
80		85
81	public String getAjcWorkingDir() {	86	public String getAjcWorkingDir() {




		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

Lines 54-60 Link Here

(-)testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java (-1 / +1 lines)
54	doSynchronousBuild("bad-injar.lst");	54	doSynchronousBuild("bad-injar.lst");
55	messages = NullIdeManager.getIdeManager().getCompilationSourceLineTasks();	55	messages = NullIdeManager.getIdeManager().getCompilationSourceLineTasks();
56	message = (NullIdeTaskListManager.SourceLineTask)messages.get(0);	56	message = (NullIdeTaskListManager.SourceLineTask)messages.get(0);
57	assertTrue(message.getContainedMessage().getMessage().indexOf("bad inpath") != -1);	57	assertTrue(message.getContainedMessage().getMessage().indexOf("skipping missing, empty or corrupt inpath entry") != -1);
58	}	58	}
59		59
60	public void testErrorMessages() throws IOException {	60	public void testErrorMessages() throws IOException {

Return to bug 137235

Lines 98-103 Link Here

(-)testsrc/org/aspectj/ajde/ResourceCopyTestCase.java (+23 lines)
98	assertTrue("Build warnings",ideManager.getCompilationSourceLineTasks().isEmpty());	98	assertTrue("Build warnings",ideManager.getCompilationSourceLineTasks().isEmpty());
99	compareInjarsToBin(injar1,"src","bin");	99	compareInjarsToBin(injar1,"src","bin");
100	}	100	}
		101
		102	public void testInjarsToOddBin () {
		103	Set injars = new HashSet();
		104	File injar1 = openFile(injar1Name);
		105	injars.add(injar1);
		106	ideManager.getProjectProperties().setOutputPath("crazy.jar");
		107	ideManager.getProjectProperties().setInJars(injars);
		108	assertTrue("Build failed",doSynchronousBuild("config2.lst"));
		109	assertTrue("Build warnings",ideManager.getCompilationSourceLineTasks().isEmpty());
		110	compareInjarsToBin(injar1,"src","crazy.jar");
		111	}
		112
		113	public void testInjarsToOutjarOddNames () {
		114	Set injars = new HashSet();
		115	File injar1 = openFile("input1");
		116	File outjar = openFile(outjarName+".fozout");
		117	injars.add(injar1);
		118	ideManager.getProjectProperties().setInJars(injars);
		119	ideManager.getProjectProperties().setOutJar(outjar.getAbsolutePath());
		120	assertTrue("Build failed",doSynchronousBuild("config2.lst"));
		121	assertTrue("Build warnings",ideManager.getCompilationSourceLineTasks().isEmpty());
		122	compareJars(injar1,"src",outjar);
		123	}
101		124
102	/*	125	/*
103	* Ensure bin contains all non-Java resouces from source and injars	126	* Ensure bin contains all non-Java resouces from source and injars