+++ /dev/null
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation,
- * 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved.
- * This program and the accompanying materials are made available
- * under the terms of the Common Public License v1.0
- * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Xerox/PARC initial implementation
- * ******************************************************************/
-
-
-package org.aspectj.tools.ajbrowser;
-
-import java.io.File;
-import javax.swing.*;
-import junit.framework.*;
-//import org.aspectj.asm.*;
-import org.aspectj.bridge.*;
-import org.aspectj.bridge.IMessage;
-import org.aspectj.ajde.*;
-
-/**
- * @author Mik Kersten
- */
-public class BrowserManagerTest extends TestCase {
-
- public BrowserManagerTest(String name) {
- super(name);
- }
-
- public static TestSuite suite() {
- TestSuite result = new TestSuite();
- result.addTestSuite(BrowserManagerTest.class);
- return result;
- }
-
- public void testInitNoArgs() {
- //String[] args = { "C:/Dev/aspectj/modules/ajde/testdata/examples/figures-coverage/all.lst" };
- String[] args = { };
- BrowserManager.getDefault().init(args, true);
- }
-
- public void testAddProjectTask() {
- BrowserManager.getDefault().init(new String[]{}, true);
- Ajde.getDefault().getTaskListManager().addProjectTask(
- "project-level task",
- IMessage.ERROR);
-
- assertTrue("confirmation result", verifySuccess("Project task is visible."));
- }
-
- public void testAddSourceLineTasks() {
- BrowserManager.getDefault().init(new String[]{}, true);
- ISourceLocation dummyLocation = new SourceLocation(new File("<file>"), -1, -1);
- Ajde.getDefault().getTaskListManager().addSourcelineTask(
- "error task",
- dummyLocation,
- IMessage.ERROR);
-
- Ajde.getDefault().getTaskListManager().addSourcelineTask(
- "warning task",
- dummyLocation,
- IMessage.WARNING);
-
- Ajde.getDefault().getTaskListManager().addSourcelineTask(
- "info task",
- dummyLocation,
- IMessage.INFO);
-
- assertTrue("confirmation result", verifySuccess("3 kinds of sourceline tasks are visible."));
- }
-
-
- private boolean verifySuccess(String message) {
- int result = JOptionPane.showConfirmDialog(
- BrowserManager.getDefault().getRootFrame(),
- "Verify Results",
- message,
- JOptionPane.YES_NO_OPTION);
- return result == JOptionPane.YES_OPTION;
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-}
--- /dev/null
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation,
+ * 2002 Palo Alto Research Center, Incorporated (PARC).
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Common Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * Xerox/PARC initial implementation
+ * ******************************************************************/
+
+
+package org.aspectj.tools.ajbrowser;
+
+import java.io.File;
+import javax.swing.*;
+import junit.framework.*;
+//import org.aspectj.asm.*;
+import org.aspectj.bridge.*;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.ajde.*;
+
+/**
+ * @author Mik Kersten
+ */
+public class InteractiveBrowserTest extends TestCase {
+
+ public InteractiveBrowserTest(String name) {
+ super(name);
+ }
+
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
+ result.addTestSuite(InteractiveBrowserTest.class);
+ return result;
+ }
+
+ public void testInitNoArgs() {
+ //String[] args = { "C:/Dev/aspectj/modules/ajde/testdata/examples/figures-coverage/all.lst" };
+ String[] args = { };
+ BrowserManager.getDefault().init(args, true);
+ }
+
+ public void testAddProjectTask() {
+ BrowserManager.getDefault().init(new String[]{}, true);
+ Ajde.getDefault().getTaskListManager().addProjectTask(
+ "project-level task",
+ IMessage.ERROR);
+
+ BrowserManager.getDefault().showMessages();
+
+ assertTrue("confirmation result", verifySuccess("Project task is visible."));
+ }
+
+ public void testAddSourceLineTasks() {
+ BrowserManager.getDefault().init(new String[]{}, true);
+ ISourceLocation dummyLocation = new SourceLocation(new File("<file>"), 0, 0);
+
+ Ajde.getDefault().getTaskListManager().addSourcelineTask(
+ "error task",
+ dummyLocation,
+ IMessage.ERROR);
+
+ Ajde.getDefault().getTaskListManager().addSourcelineTask(
+ "warning task",
+ dummyLocation,
+ IMessage.WARNING);
+
+ Ajde.getDefault().getTaskListManager().addSourcelineTask(
+ "info task",
+ dummyLocation,
+ IMessage.INFO);
+
+ BrowserManager.getDefault().showMessages();
+
+ assertTrue("confirmation result", verifySuccess("3 kinds of sourceline tasks are visible."));
+ }
+
+
+ private boolean verifySuccess(String message) {
+ int result = JOptionPane.showConfirmDialog(
+ BrowserManager.getDefault().getRootFrame(),
+ "Verify Results",
+ message,
+ JOptionPane.YES_NO_OPTION);
+ return result == JOptionPane.YES_OPTION;
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+}
} else if (IMessage.ERROR.isSameOrLessThan(kind)) {
setIcon(AjdeUIManager.getDefault().getIconRegistry().getErrorIcon());
} else {
- setIcon(null);
+ setIcon(AjdeUIManager.getDefault().getIconRegistry().getInfoIcon());
}
if (isSelected) {
setBackground(list.getSelectionBackground());
--- /dev/null
+
+package d1;
+
+public class A {
+
+}
--- /dev/null
+package d1.d2;
+
+class B { }
\ No newline at end of file
--- /dev/null
+A.java
+d2/B.java
+../d3/C.java
--- /dev/null
+package d3;
+
+class C { }
\ No newline at end of file
suite.addTestSuite(BuildArgParserTestCase.class);
suite.addTestSuite(ConsoleMessageHandlerTestCase.class);
//$JUnit-END$
- return suite;
+ return suite;
}
public AjdtAjcTests(String name) { super(name); }
package org.aspectj.ajdt.ajc;
-import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
-import org.aspectj.ajdt.internal.core.builder.AjCompilerOptions;
+import java.io.*;
+import java.util.*;
+
+import junit.framework.TestCase;
+
+import org.aspectj.ajdt.internal.core.builder.*;
import org.aspectj.bridge.MessageWriter;
import org.aspectj.testing.util.TestUtil;
import org.eclipse.jdt.core.compiler.InvalidInputException;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.TestCase;
-
/**
* Some black-box test is happening here.
*/
assertEquals(outputDir.getPath(), OUT_PATH);
}
+ public void testNonExistentConfigFile() throws IOException {
+ String FILE_PATH = "@" + TEST_DIR + "../bug-40257/d1/test.lst";
+ AjBuildConfig config = parser.genBuildConfig(new String[] { FILE_PATH }, messageWriter);
+
+ String a = new File(TEST_DIR + "../bug-40257/d1/A.java").getCanonicalPath();
+ String b = new File(TEST_DIR + "../bug-40257/d1/d2/B.java").getCanonicalPath();
+ String c = new File(TEST_DIR + "../bug-40257/d3/C.java").getCanonicalPath();
+ List pathList = new ArrayList();
+ for (Iterator it = config.getFiles().iterator(); it.hasNext(); ) {
+ pathList.add(((File)it.next()).getCanonicalPath());
+ }
+ assertTrue(pathList.contains(a));
+ assertTrue(pathList.contains(b));
+ assertTrue(pathList.contains(c));
+
+ }
+
public void testXlint() throws InvalidInputException {
AjdtCommand command = new AjdtCommand();
AjBuildConfig config = parser.genBuildConfig(new String[] {"-Xlint"}, messageWriter);
projects / aspectj.git / commitdiff