mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4223_Dan_fixFindInTerminal'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-01-29 17:22:55 -05:00
parent f1f0b1f0ae fb9cbdf7ed
commit f3cd67d5ab
2 changed files with 103 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/plugin/core/terminal/TerminalProviderTest.java
View File

@@ -150,7 +150,7 @@ public class TerminalProviderTest extends AbstractGhidraHeadedDebuggerTest {
@Test
@SuppressWarnings("resource")
public void testFindSimple() throws Exception {
public void testFindText() throws Exception {
terminalService = addPlugin(tool, TerminalPlugin.class);
try (DefaultTerminal term = (DefaultTerminal) terminalService
@@ -180,6 +180,38 @@ public class TerminalProviderTest extends AbstractGhidraHeadedDebuggerTest {
}
}
@Test
@SuppressWarnings("resource")
public void testFindTextCaps() throws Exception {
terminalService = addPlugin(tool, TerminalPlugin.class);
try (DefaultTerminal term = (DefaultTerminal) terminalService
.createNullTerminal(Charset.forName("UTF-8"), buf -> {
})) {
term.setFixedSize(80, 25);
term.injectDisplayOutput(TEST_CONTENTS);
term.provider.findDialog.txtFind.setText("TERM");
performAction(term.provider.actionFindNext, false);
waitForPass(() -> assertSingleSelection(0, 0, 4,
term.provider.panel.fieldPanel.getSelection()));
performAction(term.provider.actionFindNext, false);
waitForPass(() -> assertSingleSelection(0, 5, 9,
term.provider.panel.fieldPanel.getSelection()));
performAction(term.provider.actionFindNext, false);
waitForPass(() -> assertSingleSelection(1, 2, 6,
term.provider.panel.fieldPanel.getSelection()));
performAction(term.provider.actionFindNext, false);
OkDialog dialog = waitForInfoDialog();
assertEquals("String not found", dialog.getMessage());
dialog.close();
}
}
@Test
@SuppressWarnings("resource")
public void testFindCaseSensitive() throws Exception {
@@ -308,6 +340,44 @@ public class TerminalProviderTest extends AbstractGhidraHeadedDebuggerTest {
}
}
@Test
@SuppressWarnings("resource")
public void testFindRegexCaps() throws Exception {
terminalService = addPlugin(tool, TerminalPlugin.class);
try (DefaultTerminal term = (DefaultTerminal) terminalService
.createNullTerminal(Charset.forName("UTF-8"), buf -> {
})) {
term.setFixedSize(80, 25);
term.injectDisplayOutput(TEST_CONTENTS);
term.provider.findDialog.txtFind.setText("o?TERM");
term.provider.findDialog.cbRegex.setSelected(true);
performAction(term.provider.actionFindNext, false);
waitForPass(() -> assertSingleSelection(0, 0, 4,
term.provider.panel.fieldPanel.getSelection()));
performAction(term.provider.actionFindNext, false);
waitForPass(() -> assertSingleSelection(0, 5, 9,
term.provider.panel.fieldPanel.getSelection()));
performAction(term.provider.actionFindNext, false);
waitForPass(() -> assertSingleSelection(1, 1, 6,
term.provider.panel.fieldPanel.getSelection()));
// NB. the o is optional, so it finds a subrange of the previous result
performAction(term.provider.actionFindNext, false);
waitForPass(() -> assertSingleSelection(1, 2, 6,
term.provider.panel.fieldPanel.getSelection()));
performAction(term.provider.actionFindNext, false);
OkDialog dialog = waitForInfoDialog();
assertEquals("String not found", dialog.getMessage());
dialog.close();
}
}
@Test
@SuppressWarnings("resource")
public void testFindPrevious() throws Exception {