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

GP-0 Corrected MarkerTest failure

Browse Source
This commit is contained in:
ghidra1
2024-12-11 12:08:16 -05:00
parent f2c1827272
commit dadfc465df
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/marker/MarkerTest.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -345,11 +345,9 @@ public class MarkerTest extends AbstractGhidraHeadedIntegrationTest {
Color startColor = Palette.PINK; Color startColor = Palette.PINK;
MarkerSet markersP1 = markerService.createPointMarker("Awesome Markers", "Description", MarkerSet markersP1 = markerService.createPointMarker("Awesome Markers", "Description",
program, 0, true, true, program, 0, true, true, true, startColor, null, true);
true, startColor, null, true);
MarkerSet markersP2 = markerService.createPointMarker("Awesome Markers", "Description", MarkerSet markersP2 = markerService.createPointMarker("Awesome Markers", "Description",
program2, 0, true, true, program2, 0, true, true, true, startColor, null, true);
true, startColor, null, true);
Address addressP1 = addr(program, "0x1001000"); Address addressP1 = addr(program, "0x1001000");
Address addressP2 = addr(program2, "0x1001004"); Address addressP2 = addr(program2, "0x1001004");
@@ -475,8 +473,8 @@ public class MarkerTest extends AbstractGhidraHeadedIntegrationTest {
setSelection(fp, sel); setSelection(fp, sel);
DockingActionIf a = getAction(getPlugin(tool, SetHighlightPlugin.class), DockingActionIf a =
"Set Highlight From Selection"); getAction(getPlugin(tool, SetHighlightPlugin.class), "Set Highlight From Selection");
performAction(a, cb.getProvider(), true); performAction(a, cb.getProvider(), true);
clearSelection(p); clearSelection(p);
@@ -484,8 +482,7 @@ public class MarkerTest extends AbstractGhidraHeadedIntegrationTest {
private void clearSelection(Program p) { private void clearSelection(Program p) {
ProgramSelection emptySelection = new ProgramSelection(p.getAddressFactory()); ProgramSelection emptySelection = new ProgramSelection(p.getAddressFactory());
tool.firePluginEvent( tool.firePluginEvent(new ProgramSelectionPluginEvent("Test", emptySelection, p));
new ProgramSelectionPluginEvent("Test", emptySelection, p));
} }
private int getCursorOffset() { private int getCursorOffset() {
@@ -514,8 +511,8 @@ public class MarkerTest extends AbstractGhidraHeadedIntegrationTest {
private Program loadSecondProgram() throws Exception { private Program loadSecondProgram() throws Exception {
ClassicSampleX86ProgramBuilder builder = new ClassicSampleX86ProgramBuilder( ClassicSampleX86ProgramBuilder builder =
"Second Sample Program", true); new ClassicSampleX86ProgramBuilder("Second Sample Program", true);
builder.setBytes("0x010032d7", builder.setBytes("0x010032d7",
"53 56 8b 74 24 18 33 db 8d 04 b6 c1 e0 04 66 39 98 60 8f 00 01", true); "53 56 8b 74 24 18 33 db 8d 04 b6 c1 e0 04 66 39 98 60 8f 00 01", true);
@@ -543,7 +540,7 @@ public class MarkerTest extends AbstractGhidraHeadedIntegrationTest {
turnOffOption("Equates", cd); turnOffOption("Equates", cd);
turnOffOption("Functions", cd); turnOffOption("Functions", cd);
turnOffOption("Registers", cd); turnOffOption("Registers", cd);
turnOffOption("Code", cd); turnOffOption("Instructions", cd);
turnOffOption("Symbols", cd); turnOffOption("Symbols", cd);
runSwing(() -> cd.okCallback()); runSwing(() -> cd.okCallback());