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

Author: ghidra1

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

@@ -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 @@ private void programLocationChange(String buttonText) throws Exception {
 		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 @@ private void searchAll(String buttonText, String searchType) throws Exception {
 		//
 		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));