Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NIFI-10793 Comment is not populated when process group is created via… #6653

Closed
wants to merge 3 commits into from
Closed

NIFI-10793 Comment is not populated when process group is created via… #6653

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7ebc43
NIFI-10793 Comment is not populated when process group is created via…
krisztina-zsihovszki Nov 11, 2022
c8c3852
NIFI-10793 Unit test was changed according to review comments
krisztina-zsihovszki Nov 16, 2022
617f94d
NIFI-10793 Minor change in unit test
krisztina-zsihovszki Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java
View file
Open in desktop
Expand Up @@ -82,6 +82,10 @@ public ProcessGroup createProcessGroup(String parentGroupId, ProcessGroupDTO pro
group.setPosition(new Position(processGroup.getPosition().getX(), processGroup.getPosition().getY()));
}

if (processGroup.getComments() != null) {
group.setComments(processGroup.getComments());
}

final ParameterContextReferenceEntity parameterContextReference = processGroup.getParameterContext();
if (parameterContextReference != null && parameterContextReference.getId() != null) {
final ParameterContext parameterContext = flowController.getFlowManager().getParameterContextManager().getParameterContext(parameterContextReference.getId());
Expand Down
82 changes: 82 additions & 0 deletions .../nifi-web-api/src/test/java/org/apache/nifi/web/dao/impl/TestStandardProcessGroupDAO.java
View file
Open in desktop
@@ -0,0 +1,82 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.nifi.web.dao.impl;
Copy link
Contributor

@tpalfy tpalfy Nov 14, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general mock is best left to be used for logic, not data. Data structures can simply be created.

/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You 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.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.nifi.web.dao.impl;

import org.apache.nifi.connectable.Position;
import org.apache.nifi.controller.FlowController;
import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.parameter.ParameterContext;
import org.apache.nifi.web.api.dto.PositionDTO;
import org.apache.nifi.web.api.dto.ProcessGroupDTO;
import org.apache.nifi.web.api.entity.ParameterContextReferenceEntity;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

public class TestStandardProcessGroupDAO {
    private static final String PARENT_PROCESS_GROUP_ID = "parentId";
    private static final String PROCESS_GROUP_ID = "pgId";
    private static final String PROCESS_GROUP_NAME = "pgName";
    private static final String PROCESS_GROUP_COMMENTS = "This is a comment";
    private static final String PARAMETER_CONTEXT_ID = "paramContext";

    private StandardProcessGroupDAO testSubject;

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
    private FlowController flowController;

    @Mock
    private ProcessGroup parentProcessGroup;
    @Mock
    private ParameterContext parameterContext;

    @BeforeEach
    void setUp() {
        MockitoAnnotations.openMocks(this);

        testSubject = new StandardProcessGroupDAO();
        testSubject.setFlowController(flowController);

        when(flowController
                .getFlowManager()
                .getGroup(PARENT_PROCESS_GROUP_ID)
        ).thenReturn(parentProcessGroup);

        when(flowController
                .getFlowManager()
                .getParameterContextManager()
                .getParameterContext(PARAMETER_CONTEXT_ID)
        ).thenReturn(parameterContext);
    }

    @Test
    public void testCreateProcessGroup() {
        // GIVEN
        ParameterContextReferenceEntity parameterContextReferenceEntity = new ParameterContextReferenceEntity();
        parameterContextReferenceEntity.setId(PARAMETER_CONTEXT_ID);

        ProcessGroupDTO processGroupDTO = new ProcessGroupDTO();
        processGroupDTO.setId(PROCESS_GROUP_ID);
        processGroupDTO.setName(PROCESS_GROUP_NAME);
        processGroupDTO.setComments(PROCESS_GROUP_COMMENTS);
        processGroupDTO.setPosition(new PositionDTO(10.0, 20.0));
        processGroupDTO.setParameterContext(parameterContextReferenceEntity);

        // WHEN
        ProcessGroup createdProcessGroup = testSubject.createProcessGroup(PARENT_PROCESS_GROUP_ID, processGroupDTO);

        // THEN
        verify(createdProcessGroup).setParent(parentProcessGroup);
        verify(createdProcessGroup).setParameterContext(parameterContext);
        verify(createdProcessGroup).setName(PROCESS_GROUP_NAME);
        verify(createdProcessGroup).setComments(PROCESS_GROUP_COMMENTS);
        verify(createdProcessGroup).setPosition(any(Position.class));

        verify(parentProcessGroup).addProcessGroup(createdProcessGroup);
    }
}


import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import org.apache.nifi.connectable.Position;
import org.apache.nifi.controller.FlowController;
import org.apache.nifi.controller.flow.FlowManager;
import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.parameter.ParameterContext;
import org.apache.nifi.parameter.ParameterContextManager;
import org.apache.nifi.web.api.dto.PositionDTO;
import org.apache.nifi.web.api.dto.ProcessGroupDTO;
import org.apache.nifi.web.api.entity.ParameterContextReferenceEntity;
import org.junit.Test;

public class TestStandardProcessGroupDAO {
private static final String PARENT_PROCESS_GROUP_ID = "parentId";
private static final String PROCESS_GROUP_ID = "pgId";
private static final String PROCESS_GROUP_NAME = "pgName";
private static final String PROCESS_GROUP_COMMENTS = "This is a comment";
private static final String PARAMETER_CONTEXT_ID = "paramContext";

@Test
public void testCreateProcessGroup() {
final StandardProcessGroupDAO dao = new StandardProcessGroupDAO();
final FlowController flowController = mock(FlowController.class);
final FlowManager flowManager = mock(FlowManager.class);
when(flowController.getFlowManager()).thenReturn(flowManager);
dao.setFlowController(flowController);

final ProcessGroup parentProcessGroup = mock(ProcessGroup.class);
when(flowManager.getGroup(PARENT_PROCESS_GROUP_ID)).thenReturn(parentProcessGroup);

final ParameterContextReferenceEntity parameterContextReferenceEntity = mock(ParameterContextReferenceEntity.class);
final ParameterContextManager parameterContextManager = mock(ParameterContextManager.class);
final ParameterContext parameterContext = mock(ParameterContext.class);

final ProcessGroupDTO processGroupDTO = mock(ProcessGroupDTO.class);
when(processGroupDTO.getId()).thenReturn(PROCESS_GROUP_ID);
when(processGroupDTO.getName()).thenReturn(PROCESS_GROUP_NAME);
when(processGroupDTO.getComments()).thenReturn(PROCESS_GROUP_COMMENTS);
final PositionDTO position = mock(PositionDTO.class);
when(processGroupDTO.getPosition()).thenReturn(position);

when(flowManager.getParameterContextManager()).thenReturn(parameterContextManager);
when(parameterContextManager.getParameterContext(PARAMETER_CONTEXT_ID)).thenReturn(parameterContext);
when(processGroupDTO.getParameterContext()).thenReturn(parameterContextReferenceEntity);
when(parameterContextReferenceEntity.getId()).thenReturn(PARAMETER_CONTEXT_ID);

final ProcessGroup childProcessGroup = mock(ProcessGroup.class);
when(flowManager.createProcessGroup(PROCESS_GROUP_ID)).thenReturn(childProcessGroup);

dao.createProcessGroup(PARENT_PROCESS_GROUP_ID, processGroupDTO);

verify(childProcessGroup).setName(PROCESS_GROUP_NAME);
verify(childProcessGroup).setComments(PROCESS_GROUP_COMMENTS);
verify(childProcessGroup).setPosition(any(Position.class));
verify(childProcessGroup).setParameterContext(parameterContext);
verify(childProcessGroup).setParent(parentProcessGroup);
verify(parentProcessGroup).addProcessGroup(childProcessGroup);
}
}