-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Using method name to find unqualified Stacktraces in Java Stack Trace +
Code review changes
- Loading branch information
Showing
8 changed files
with
327 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
....tests/console tests/org/eclipse/jdt/debug/tests/console/JavaStackTraceAmbiguityTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 IBM Corporation. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * IBM Corporation - Implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.jdt.debug.tests.console; | ||
|
|
||
| import org.eclipse.core.runtime.NullProgressMonitor; | ||
| import org.eclipse.jdt.core.IJavaProject; | ||
| import org.eclipse.jdt.debug.testplugin.JavaProjectHelper; | ||
| import org.eclipse.jdt.debug.tests.TestUtil; | ||
| import org.eclipse.jface.text.ITextSelection; | ||
| import org.eclipse.jface.viewers.ISelection; | ||
| import org.eclipse.jface.viewers.ISelectionProvider; | ||
| import org.eclipse.ui.IEditorPart; | ||
| import org.eclipse.ui.console.IHyperlink; | ||
| import org.eclipse.ui.texteditor.ITextEditor; | ||
|
|
||
| public class JavaStackTraceAmbiguityTest extends AbstractJavaStackTraceConsoleTest { | ||
|
|
||
| public JavaStackTraceAmbiguityTest(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| public void testLinkAmbiguityNavigationTrue() throws Exception { | ||
| String projectName = "StackTest"; | ||
| IJavaProject project = createProject(projectName, "testfiles/Ambiguity/", JavaProjectHelper.JAVA_SE_1_8_EE_NAME, false); | ||
| waitForBuild(); | ||
| waitForJobs(); | ||
| consoleDocumentWithText("Sample.tes3(int) line: 31"); | ||
| IHyperlink[] hyperlinks = fConsole.getHyperlinks(); | ||
| assertEquals("Wrong hyperlinks, listing all links: " + allLinks(), 2, hyperlinks.length); | ||
| String expectedText = "System.out.println(\"Expected\");"; | ||
| try { | ||
| for (IHyperlink hyperlink : hyperlinks) { | ||
| closeAllEditors(); | ||
| hyperlink.linkActivated(); | ||
| IEditorPart editor = waitForEditorOpen(); | ||
| String[] selectedText = new String[1]; | ||
| sync(() -> selectedText[0] = getSelectedText(editor)); | ||
| selectedText[0] = selectedText[0].trim(); | ||
| assertEquals("Wrong text selected after hyperlink navigation", expectedText, selectedText[0]); | ||
|
|
||
| } | ||
| } finally { | ||
| closeAllEditors(); | ||
| boolean force = true; | ||
| project.getProject().delete(force, new NullProgressMonitor()); | ||
| } | ||
| } | ||
|
|
||
| private void waitForJobs() throws Exception { | ||
| TestUtil.waitForJobs(getName(), 250, 1000); | ||
| } | ||
|
|
||
| private static String getSelectedText(IEditorPart editor) { | ||
| ITextEditor textEditor = (ITextEditor) editor; | ||
| ISelectionProvider selectionProvider = textEditor.getSelectionProvider(); | ||
| ISelection selection = selectionProvider.getSelection(); | ||
| ITextSelection textSelection = (ITextSelection) selection; | ||
| String selectedText = textSelection.getText(); | ||
| return selectedText; | ||
| } | ||
|
|
||
| private IEditorPart waitForEditorOpen() throws Exception { | ||
| waitForJobs(); | ||
| IEditorPart[] editor = new IEditorPart[1]; | ||
| sync(() -> editor[0] = getActivePage().getActiveEditor()); | ||
| long timeout = 30_000; | ||
| long start = System.currentTimeMillis(); | ||
| while (editor[0] == null && System.currentTimeMillis() - start < timeout) { | ||
| waitForJobs(); | ||
| sync(() -> editor[0] = getActivePage().getActiveEditor()); | ||
| } | ||
| if (editor[0] == null) { | ||
| throw new AssertionError("Timeout occurred while waiting for editor to open"); | ||
| } | ||
| return editor[0]; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
org.eclipse.jdt.debug.tests/testfiles/Ambiguity/a/Sample.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 IBM Corporation. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * IBM Corporation - initial API and implementation | ||
| *******************************************************************************/ | ||
| package a; | ||
|
|
||
| /** | ||
| * Test class | ||
| */ | ||
| public class Sample { | ||
| public static void main(String[] args) { | ||
| System.out.println("Main Method"); | ||
| test(); | ||
| } | ||
| public static void test() { | ||
| System.out.println("Testing.."); | ||
| } | ||
| public void testMethod() { | ||
| System.out.println("Random"); | ||
| } | ||
| public static void tes3(int x) { | ||
| System.out.println("Expected"); | ||
| } | ||
| public void tes2() { | ||
|
|
||
| } | ||
|
|
||
| } |
37 changes: 37 additions & 0 deletions
37
org.eclipse.jdt.debug.tests/testfiles/Ambiguity/b/Sample.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 IBM Corporation. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * IBM Corporation - initial API and implementation | ||
| *******************************************************************************/ | ||
| package b; | ||
|
|
||
| /** | ||
| * Test class | ||
| */ | ||
| public class Sample { | ||
| public static void main(String[] args) { | ||
| System.out.println("Main Method"); | ||
| test(); | ||
| } | ||
| public static void test() { | ||
| System.out.println("Testing.."); | ||
| } | ||
| public void testMethod() { | ||
| System.out.println("Random"); | ||
| } | ||
| public static void tes3() { | ||
| System.out.println("Expected"); | ||
| } | ||
| public void tes2() { | ||
|
|
||
| } | ||
|
|
||
| } |
37 changes: 37 additions & 0 deletions
37
org.eclipse.jdt.debug.tests/testfiles/Ambiguity/c/Sample.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 IBM Corporation. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * IBM Corporation - initial API and implementation | ||
| *******************************************************************************/ | ||
| package c; | ||
|
|
||
| /** | ||
| * Test class | ||
| */ | ||
| public class Sample { | ||
| public static void main(String[] args) { | ||
| System.out.println("Main Method"); | ||
| test(); | ||
| } | ||
| public static void test() { | ||
| System.out.println("Testing.."); | ||
| } | ||
| public void testMethod() { | ||
| System.out.println("Random"); | ||
| } | ||
| public static void tes32() { | ||
| System.out.println("Expected"); | ||
| } | ||
| public void tes2() { | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.