From 0421ba061ca3a5dab6d8f2a920d038400a3d8707 Mon Sep 17 00:00:00 2001 From: Bryan Bende Date: Mon, 16 Oct 2023 17:54:00 -0400 Subject: [PATCH] NIFI-1222 Fix StandardVersionedComponentSynchronizerTest for support branch --- .../StandardVersionedComponentSynchronizerTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizerTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizerTest.java index 21541be31dd5..0ec1e8df6655 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizerTest.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizerTest.java @@ -40,7 +40,6 @@ import org.apache.nifi.flow.ComponentType; import org.apache.nifi.flow.ConnectableComponent; import org.apache.nifi.flow.ConnectableComponentType; -import org.apache.nifi.flow.ExecutionEngine; import org.apache.nifi.flow.Position; import org.apache.nifi.flow.ScheduledState; import org.apache.nifi.flow.VersionedComponent; @@ -72,6 +71,7 @@ import org.apache.nifi.parameter.StandardParameterContextManager; import org.apache.nifi.processor.ProcessContext; import org.apache.nifi.processor.Relationship; +import org.apache.nifi.registry.ComponentVariableRegistry; import org.apache.nifi.registry.flow.mapping.FlowMappingOptions; import org.apache.nifi.scheduling.ExecutionNode; import org.apache.nifi.scheduling.SchedulingStrategy; @@ -1099,12 +1099,15 @@ public void testGetUpdatedParameterNames() throws FlowSynchronizationException, @Test public void testUpdateParameterContextWhenContextDoesNotExist() { + final ComponentVariableRegistry variableRegistry = mock(ComponentVariableRegistry.class); + when(variableRegistry.getVariableMap()).thenReturn(Collections.emptyMap()); + final ProcessGroup processGroup = mock(ProcessGroup.class); when(processGroup.getIdentifier()).thenReturn("pg1"); when(processGroup.getPosition()).thenReturn(new org.apache.nifi.connectable.Position(0, 0)); when(processGroup.getFlowFileConcurrency()).thenReturn(FlowFileConcurrency.UNBOUNDED); when(processGroup.getFlowFileOutboundPolicy()).thenReturn(FlowFileOutboundPolicy.BATCH_OUTPUT); - when(processGroup.getExecutionEngine()).thenReturn(ExecutionEngine.STANDARD); + when(processGroup.getVariableRegistry()).thenReturn(variableRegistry); final VersionedProcessGroup rootGroup = new VersionedProcessGroup(); rootGroup.setIdentifier("pg1"); @@ -1120,15 +1123,19 @@ public void testUpdateParameterContextWhenContextDoesNotExist() { @Test public void testUpdateParameterContextWhenContextDoesExist() { + final ComponentVariableRegistry variableRegistry = mock(ComponentVariableRegistry.class); + when(variableRegistry.getVariableMap()).thenReturn(Collections.emptyMap()); + final ProcessGroup processGroup = mock(ProcessGroup.class); when(processGroup.getIdentifier()).thenReturn("pg1"); when(processGroup.getPosition()).thenReturn(new org.apache.nifi.connectable.Position(0, 0)); when(processGroup.getFlowFileConcurrency()).thenReturn(FlowFileConcurrency.UNBOUNDED); when(processGroup.getFlowFileOutboundPolicy()).thenReturn(FlowFileOutboundPolicy.BATCH_OUTPUT); - when(processGroup.getExecutionEngine()).thenReturn(ExecutionEngine.STANDARD); + when(processGroup.getVariableRegistry()).thenReturn(variableRegistry); final VersionedParameterContext parameterContext = new VersionedParameterContext(); parameterContext.setName("My Params"); + parameterContext.setDescription("Description"); parameterContext.setParameters(Collections.emptySet()); final Map parameterContextMap = new HashMap<>();