From 2ef6aca252ead7f5a8136d1b1e382d9dfd00a14c Mon Sep 17 00:00:00 2001 From: srigovs Date: Tue, 20 Feb 2024 15:22:04 -0800 Subject: [PATCH] Add support for spilt event processor(#4089) Signed-off-by: srigovs --- .../processor/splitevent/SplitEventProcessorTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data-prepper-plugins/split-event-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/splitevent/SplitEventProcessorTest.java b/data-prepper-plugins/split-event-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/splitevent/SplitEventProcessorTest.java index 8d1f14999e..7fc126fdf5 100644 --- a/data-prepper-plugins/split-event-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/splitevent/SplitEventProcessorTest.java +++ b/data-prepper-plugins/split-event-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/splitevent/SplitEventProcessorTest.java @@ -40,13 +40,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= import static org.mockito.Mockito.spy; ->>>>>>> 69f6a5f24 (Add support for spilt event processor) ->>>>>>> cbca931a8 (Add support for spilt event processor) +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify;