Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 08:02:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-0: Fixing tests

Browse Source
This commit is contained in:
Ryan Kurtz
2025-06-10 11:56:26 -04:00
parent 4257433253
commit d4c034df15
1 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/console/ConsolePluginTest.java
+34 -43
View File
@@ -37,6 +37,7 @@ import generic.jar.ResourceFile;
import generic.theme.GColor; import generic.theme.GColor;
import ghidra.app.script.GhidraScript; import ghidra.app.script.GhidraScript;
import ghidra.framework.Application; import ghidra.framework.Application;
import ghidra.framework.OperatingSystem;
import ghidra.framework.main.ConsoleTextPane; import ghidra.framework.main.ConsoleTextPane;
import ghidra.framework.plugintool.PluginTool; import ghidra.framework.plugintool.PluginTool;
import ghidra.program.database.ProgramDB; import ghidra.program.database.ProgramDB;
@@ -91,7 +92,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testFindHighlights() throws Exception { public void testFindHighlights() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
verfyHighlightColor(matches); verfyHighlightColor(matches);
close(findDialog); close(findDialog);
@@ -102,7 +103,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testFindHighlights_ChangeSearchText() throws Exception { public void testFindHighlights_ChangeSearchText() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
verfyHighlightColor(matches); verfyHighlightColor(matches);
// Change the search text after the first search and make sure the new text is found and // Change the search text after the first search and make sure the new text is found and
@@ -111,7 +112,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
runSwing(() -> findDialog.setSearchText(newSearchText)); runSwing(() -> findDialog.setSearchText(newSearchText));
pressButtonByText(findDialog, "Next"); pressButtonByText(findDialog, "Next");
matches = getMatches(); matches = getMatches();
assertEquals(3, matches.size()); assertEquals(2, matches.size());
verfyHighlightColor(matches); verfyHighlightColor(matches);
close(findDialog); close(findDialog);
@@ -122,7 +123,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testFindHighlights_ChangeDocumentText() throws Exception { public void testFindHighlights_ChangeDocumentText() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
verfyHighlightColor(matches); verfyHighlightColor(matches);
runSwing(() -> textPane.setText("This is some\nnew text.")); runSwing(() -> textPane.setText("This is some\nnew text."));
@@ -135,22 +136,18 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testMovingCursorUpdatesActiveHighlight() { public void testMovingCursorUpdatesActiveHighlight() {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
TestTextMatch first = matches.get(0); TestTextMatch first = matches.get(0);
TestTextMatch second = matches.get(1); TestTextMatch second = matches.get(1);
TestTextMatch third = matches.get(2); TestTextMatch last = matches.get(2);
TestTextMatch last = matches.get(3);
placeCursonInMatch(second); placeCursorInMatch(second);
assertActiveHighlight(second); assertActiveHighlight(second);
placeCursonInMatch(third); placeCursorInMatch(first);
assertActiveHighlight(third);
placeCursonInMatch(first);
assertActiveHighlight(first); assertActiveHighlight(first);
placeCursonInMatch(last); placeCursorInMatch(last);
assertActiveHighlight(last); assertActiveHighlight(last);
} }
@@ -158,7 +155,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testFindNext_ChangeDocumentText() throws Exception { public void testFindNext_ChangeDocumentText() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
TestTextMatch first = matches.get(0); TestTextMatch first = matches.get(0);
TestTextMatch second = matches.get(1); TestTextMatch second = matches.get(1);
@@ -181,7 +178,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
next(); next();
matches = getMatches(); matches = getMatches();
assertEquals(6, matches.size()); // 4 old matches plus 2 new matches assertEquals(5, matches.size()); // 3 old matches plus 2 new matches
second = matches.get(1); second = matches.get(1);
assertCursorInMatch(second); assertCursorInMatch(second);
assertActiveHighlight(second); assertActiveHighlight(second);
@@ -189,8 +186,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
next(); // third next(); // third
next(); // fourth next(); // fourth
next(); // fifth next(); // fifth
next(); // sixth TestTextMatch last = matches.get(4); // search wrapped
TestTextMatch last = matches.get(5); // search wrapped
assertCursorInMatch(last); assertCursorInMatch(last);
assertActiveHighlight(last); assertActiveHighlight(last);
@@ -201,25 +197,19 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testFindNext() throws Exception { public void testFindNext() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
TestTextMatch first = matches.get(0); TestTextMatch first = matches.get(0);
TestTextMatch second = matches.get(1); TestTextMatch second = matches.get(1);
TestTextMatch third = matches.get(2); TestTextMatch last = matches.get(2);
TestTextMatch last = matches.get(3);
assertCursorInMatch(first); assertCursorInMatch(first);
assertActiveHighlight(first); assertActiveHighlight(first);
placeCursonInMatch(second); placeCursorInMatch(second);
assertActiveHighlight(second); assertActiveHighlight(second);
next(); next();
assertCursorInMatch(third);
assertActiveHighlight(third);
next();
assertCursorInMatch(last); assertCursorInMatch(last);
assertActiveHighlight(last); assertActiveHighlight(last);
@@ -235,16 +225,16 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testFindNext_MoveCaret() throws Exception { public void testFindNext_MoveCaret() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
TestTextMatch first = matches.get(0); TestTextMatch first = matches.get(0);
TestTextMatch third = matches.get(2); TestTextMatch second = matches.get(1);
TestTextMatch last = matches.get(3); TestTextMatch last = matches.get(2);
assertCursorInMatch(first); assertCursorInMatch(first);
assertActiveHighlight(first); assertActiveHighlight(first);
placeCursonInMatch(third); placeCursorInMatch(second);
assertActiveHighlight(third); assertActiveHighlight(second);
next(); next();
@@ -258,11 +248,10 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testFindPrevious() throws Exception { public void testFindPrevious() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
TestTextMatch first = matches.get(0); TestTextMatch first = matches.get(0);
TestTextMatch second = matches.get(1); TestTextMatch second = matches.get(1);
TestTextMatch third = matches.get(2); TestTextMatch last = matches.get(2);
TestTextMatch last = matches.get(3);
assertCursorInMatch(first); assertCursorInMatch(first);
assertActiveHighlight(first); assertActiveHighlight(first);
@@ -274,11 +263,6 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
previous(); previous();
assertCursorInMatch(third);
assertActiveHighlight(third);
previous();
assertCursorInMatch(second); assertCursorInMatch(second);
assertActiveHighlight(second); assertActiveHighlight(second);
@@ -294,7 +278,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testFindPrevious_MoveCaret() throws Exception { public void testFindPrevious_MoveCaret() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
TestTextMatch first = matches.get(0); TestTextMatch first = matches.get(0);
TestTextMatch second = matches.get(1); TestTextMatch second = matches.get(1);
TestTextMatch third = matches.get(2); TestTextMatch third = matches.get(2);
@@ -302,7 +286,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
assertCursorInMatch(first); assertCursorInMatch(first);
assertActiveHighlight(first); assertActiveHighlight(first);
placeCursonInMatch(third); placeCursorInMatch(third);
assertActiveHighlight(third); assertActiveHighlight(third);
previous(); previous();
@@ -317,7 +301,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
public void testClear() throws Exception { public void testClear() throws Exception {
List<TestTextMatch> matches = getMatches(); List<TestTextMatch> matches = getMatches();
assertEquals(4, matches.size()); assertEquals(3, matches.size());
verfyHighlightColor(matches); verfyHighlightColor(matches);
clear(); clear();
@@ -406,7 +390,7 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
waitForSwing(); waitForSwing();
} }
private void placeCursonInMatch(TestTextMatch match) { private void placeCursorInMatch(TestTextMatch match) {
int pos = match.start; int pos = match.start;
runSwing(() -> textPane.setCaretPosition(pos)); runSwing(() -> textPane.setCaretPosition(pos));
waitForSwing(); waitForSwing();
@@ -447,6 +431,13 @@ public class ConsolePluginTest extends AbstractGhidraHeadedIntegrationTest {
String searchText = findDialog.getSearchText(); String searchText = findDialog.getSearchText();
List<TestTextMatch> results = new ArrayList<>(); List<TestTextMatch> results = new ArrayList<>();
String text = runSwing(() -> textPane.getText()); String text = runSwing(() -> textPane.getText());
// Cursor positions in tests are based on single character newlines, so adjust them if we
// are on Windows
if (OperatingSystem.CURRENT_OPERATING_SYSTEM == OperatingSystem.WINDOWS) {
text = text.replaceAll("\r\n", "\r");
}
int index = text.indexOf(searchText); int index = text.indexOf(searchText);
while (index != -1) { while (index != -1) {
results.add(new TestTextMatch(index, index + searchText.length())); results.add(new TestTextMatch(index, index + searchText.length()));