From bff95dc7c611abf3c6efeda3293f3cc513a40b08 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Thu, 21 Aug 2025 14:25:45 -0400
Subject: [PATCH] Test fixes

---
 .../plugin/core/script/ScriptSelectionEditor.java   |  2 +-
 .../core/script/GhidraScriptMgrPlugin1Test.java     | 13 +++++++++----
 .../docking/widgets/DropDownTextFieldDataModel.java |  2 +-
 .../src/main/java/ghidra/util/UserSearchUtils.java  |  1 -
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/ScriptSelectionEditor.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/ScriptSelectionEditor.java
index fbc7c47748..f00d5880b1 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/ScriptSelectionEditor.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/ScriptSelectionEditor.java
@@ -220,7 +220,7 @@ public class ScriptSelectionEditor {
 
 		@Override
 		public List<SearchMode> getSupportedSearchModes() {
-			return List.of(SearchMode.CONTAINS, SearchMode.WILDCARD, SearchMode.STARTS_WITH);
+			return List.of(SearchMode.WILDCARD, SearchMode.CONTAINS, SearchMode.STARTS_WITH);
 		}
 
 	}
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/GhidraScriptMgrPlugin1Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/GhidraScriptMgrPlugin1Test.java
index b9e400f13a..71a123374d 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/GhidraScriptMgrPlugin1Test.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/GhidraScriptMgrPlugin1Test.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.
@@ -29,6 +29,8 @@ import docking.DockingUtils;
 import docking.action.DockingActionIf;
 import docking.actions.KeyBindingUtils;
 import docking.actions.ToolActions;
+import docking.widgets.DropDownTextField;
+import docking.widgets.DropDownTextFieldDataModel.SearchMode;
 import ghidra.util.TaskUtilities;
 
 public class GhidraScriptMgrPlugin1Test extends AbstractGhidraScriptMgrPluginTest {
@@ -183,8 +185,11 @@ public class GhidraScriptMgrPlugin1Test extends AbstractGhidraScriptMgrPluginTes
 //==================================================================================================	
 
 	private void pickScript(ScriptSelectionDialog dialog, String userText, String scriptName) {
-		JTextField textField =
-			findComponent(dialog.getComponent(), JTextField.class);
+		DropDownTextField<?> textField =
+			(DropDownTextField<?>) findComponent(dialog.getComponent(), JTextField.class);
+
+		runSwing(() -> textField.setSearchMode(SearchMode.WILDCARD));
+
 		triggerText(textField, userText);
 
 		TaskListenerFlag taskFlag = new TaskListenerFlag(scriptName);
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/DropDownTextFieldDataModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/DropDownTextFieldDataModel.java
index d2ff4d6f4d..21ff9eb110 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/DropDownTextFieldDataModel.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/DropDownTextFieldDataModel.java
@@ -77,7 +77,7 @@ public interface DropDownTextFieldDataModel<T> {
 				case STARTS_WITH:
 					return createStartsWithPattern(input, false, Pattern.CASE_INSENSITIVE);
 				case WILDCARD:
-					return createSearchPattern(input, false);
+					return createContainsPattern(input, true, Pattern.CASE_INSENSITIVE);
 				default:
 					throw new IllegalStateException("Cannot create pattern for mode: " + this);
 			}
diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/util/UserSearchUtils.java b/Ghidra/Framework/Utility/src/main/java/ghidra/util/UserSearchUtils.java
index b2a5540a54..e5ed7be5c6 100644
--- a/Ghidra/Framework/Utility/src/main/java/ghidra/util/UserSearchUtils.java
+++ b/Ghidra/Framework/Utility/src/main/java/ghidra/util/UserSearchUtils.java
@@ -82,7 +82,6 @@ public class UserSearchUtils {
 	 * <b>Note: </b>This method <b>will</b> escape regular expression
 	 * characters, such as:
 	 * <ul>
-	 * <li>?</li>
 	 * <li>.</li>
 	 * <li>$</li>
 	 * <li>...and many others</li>