From 455aa62308792cc796d5830816f974c7df35ba1c Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Mon, 4 Dec 2023 13:38:56 -0500 Subject: [PATCH] Test fixes --- .../app/plugin/core/strings/EncodedStringsPlugin.java | 7 ++++--- .../plugin/core/codebrowser/CodeBrowserOptionsTest.java | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/EncodedStringsPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/EncodedStringsPlugin.java index 3e48ab35a5..d6cc50d9a2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/EncodedStringsPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/EncodedStringsPlugin.java @@ -80,11 +80,12 @@ public class EncodedStringsPlugin extends ProgramPlugin { private void registerOptions() { ToolOptions options = tool.getOptions(STRINGS_OPTION_NAME); - options.registerOption(CHARSET_OPTIONNAME, CHARSET_DEFAULT_VALUE, null, + options.registerOption(CHARSET_OPTIONNAME, CHARSET_DEFAULT_VALUE, HELP_LOCATION, "Name of default charset."); - options.registerOption(STRINGMODEL_FILENAME_OPTIONNAME, STRINGMODEL_FILENAME_DEFAULT, null, + options.registerOption(STRINGMODEL_FILENAME_OPTIONNAME, STRINGMODEL_FILENAME_DEFAULT, + HELP_LOCATION, "Name of default string model file."); - options.registerOption(TRANSLATE_SERVICE_OPTIONNAME, "", null, + options.registerOption(TRANSLATE_SERVICE_OPTIONNAME, "", HELP_LOCATION, "Name of default translation service."); } diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java index 65e44e8009..503137cc9d 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java @@ -1012,7 +1012,8 @@ public class CodeBrowserOptionsTest extends AbstractGhidraHeadedIntegrationTest // it has a help location; is it valid? if (hl != null && !isValidHelpLocation(hl)) { - missing.add(name + "." + name); + isValidHelpLocation(hl); + missing.add(options.getName() + "." + name); } } }