From 0eff3eb258c05a7d240073731c62cc8bb6cc2ad3 Mon Sep 17 00:00:00 2001 From: Andrew Ross Date: Wed, 26 Jun 2024 20:20:10 +0000 Subject: [PATCH] Fix test issues due to class renaming on main Signed-off-by: Andrew Ross --- ...inTests.java => IngestCommonPluginTests.java} | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) rename modules/ingest-common/src/test/java/org/opensearch/ingest/common/{IngestCommonModulePluginTests.java => IngestCommonPluginTests.java} (81%) diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/IngestCommonModulePluginTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/IngestCommonPluginTests.java similarity index 81% rename from modules/ingest-common/src/test/java/org/opensearch/ingest/common/IngestCommonModulePluginTests.java rename to modules/ingest-common/src/test/java/org/opensearch/ingest/common/IngestCommonPluginTests.java index b0c1e0fdbaa63..06c611009df64 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/IngestCommonModulePluginTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/IngestCommonPluginTests.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Set; -public class IngestCommonModulePluginTests extends OpenSearchTestCase { +public class IngestCommonPluginTests extends OpenSearchTestCase { public void testAllowlist() throws IOException { runAllowlistTest(List.of()); @@ -28,19 +28,17 @@ public void testAllowlist() throws IOException { } private void runAllowlistTest(List allowlist) throws IOException { - final Settings settings = Settings.builder() - .putList(IngestCommonModulePlugin.PROCESSORS_ALLOWLIST_SETTING.getKey(), allowlist) - .build(); - try (IngestCommonModulePlugin plugin = new IngestCommonModulePlugin()) { + final Settings settings = Settings.builder().putList(IngestCommonPlugin.PROCESSORS_ALLOWLIST_SETTING.getKey(), allowlist).build(); + try (IngestCommonPlugin plugin = new IngestCommonPlugin()) { assertEquals(Set.copyOf(allowlist), plugin.getProcessors(createParameters(settings)).keySet()); } } public void testAllowlistNotSpecified() throws IOException { final Settings.Builder builder = Settings.builder(); - builder.remove(IngestCommonModulePlugin.PROCESSORS_ALLOWLIST_SETTING.getKey()); + builder.remove(IngestCommonPlugin.PROCESSORS_ALLOWLIST_SETTING.getKey()); final Settings settings = builder.build(); - try (IngestCommonModulePlugin plugin = new IngestCommonModulePlugin()) { + try (IngestCommonPlugin plugin = new IngestCommonPlugin()) { final Set expected = Set.of( "append", "urldecode", @@ -81,9 +79,9 @@ public void testAllowlistNotSpecified() throws IOException { public void testAllowlistHasNonexistentProcessors() throws IOException { final Settings settings = Settings.builder() - .putList(IngestCommonModulePlugin.PROCESSORS_ALLOWLIST_SETTING.getKey(), List.of("threeve")) + .putList(IngestCommonPlugin.PROCESSORS_ALLOWLIST_SETTING.getKey(), List.of("threeve")) .build(); - try (IngestCommonModulePlugin plugin = new IngestCommonModulePlugin()) { + try (IngestCommonPlugin plugin = new IngestCommonPlugin()) { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, () -> plugin.getProcessors(createParameters(settings))