github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-10 14:38:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-12-20-24'

Browse Source
This commit is contained in:
ghidra1
2024-12-20 18:41:04 -05:00
parent 747edbfc67 2bd15c1d9c
commit 5925d3eb06
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin1Test.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -421,7 +421,7 @@ public class SearchTextPlugin1Test extends AbstractGhidraHeadedIntegrationTest {
assertEquals(getAddr(0x01004192), loc.getAddress());
assertTrue(loc instanceof CommentFieldLocation);
assertEquals("Search result not placed at the matching character position", 15,
((CommentFieldLocation) loc).getCharOffset());
loc.getCharOffset());
assertEquals(CodeUnit.PLATE_COMMENT, ((CommentFieldLocation) loc).getCommentType());
pressButton(searchButton);
@@ -673,7 +673,7 @@ public class SearchTextPlugin1Test extends AbstractGhidraHeadedIntegrationTest {
//
AddressSet set = getAddressesFromModel(model);
MarkerService markerService = tool.getService(MarkerService.class);
MarkerSet markerSet = markerService.getMarkerSet("Search", program);
MarkerSet markerSet = markerService.getMarkerSet("Search Results", program);
assertNotNull(markerSet);
AddressSet addresses = runSwing(() -> markerSet.getAddressSet());
assertTrue(set.hasSameAddresses(addresses));