1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
package org.openecomp.sdc.be.components.merge.group;
import fj.data.Either;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.openecomp.sdc.be.auditing.impl.AuditingManager;
import org.openecomp.sdc.be.components.merge.property.DataDefinitionsValuesMergingBusinessLogic;
import org.openecomp.sdc.be.components.utils.GroupDefinitionBuilder;
import org.openecomp.sdc.be.components.utils.ResourceBuilder;
import org.openecomp.sdc.be.dao.api.ActionStatus;
import org.openecomp.sdc.be.datatypes.enums.CreatedFrom;
import org.openecomp.sdc.be.impl.ComponentsUtils;
import org.openecomp.sdc.be.model.GroupDefinition;
import org.openecomp.sdc.be.model.Resource;
import org.openecomp.sdc.be.model.jsontitan.operations.GroupsOperation;
import java.util.List;
import java.util.stream.Stream;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
@RunWith(MockitoJUnitRunner.class)
public class GroupPropertiesMergeCommandTest {
private GroupPropertiesMergeCommand testInstance;
@Mock
private DataDefinitionsValuesMergingBusinessLogic mergeBusinessLogic;
@Mock
private GroupsOperation groupsOperation;
@Captor
private ArgumentCaptor<List<GroupDefinition>> updatedGroupsCaptor;
private GroupDefinition newGroup1, newGroup2, newGroup3;
private GroupDefinition prevGroup1, prevGroup2, prevGroup3;
private Resource prevResource, newResource;
@Before
public void setUp() throws Exception {
testInstance = new GroupPropertiesMergeCommand(groupsOperation, new ComponentsUtils(mock(AuditingManager.class)), mergeBusinessLogic);
newGroup1 = createVspGroupWithProperties("group1Id", "group1New", "prop1", "prop2");
newGroup2 = createUserGroupWithProperties("group2Id", "group2New", "prop3", "prop4");
newGroup3 = createVspGroupWithProperties("group3Id", "group3New");
prevGroup1 = createVspGroupWithProperties("group1Id", "group1Old", "prop1", "prop2");
prevGroup2 = createUserGroupWithProperties("group2Id", "group2Old", "prop3", "prop4");
prevGroup3 = createVspGroupWithProperties("group3Id", "group3Old");
prevResource = new ResourceBuilder()
.addGroup(prevGroup1)
.addGroup(prevGroup2)
.addGroup(prevGroup3)
.addInput("input1")
.addInput("input2")
.build();
newResource = new ResourceBuilder()
.addGroup(newGroup1)
.addGroup(newGroup2)
.addGroup(newGroup3)
.addInput("input1")
.build();
}
@Test
public void whenNewComponentHasNoGroups_returnOk() {
ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, new Resource());
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
}
@Test
public void whenOldComponentHasNoGroups_returnOk() {
ActionStatus mergeStatus = testInstance.mergeComponents(new Resource(), newResource);
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
}
@Test
public void whenOldOrNewGroupHasNoProperties_noNeedToMergeItsProperties() {
GroupDefinition oldGrpNoProps = createVspGroupWithProperties("grp1", "grp1");
GroupDefinition newGrpWithProps = createVspGroupWithProperties("grp1", "grp1", "prop1", "prop2");
GroupDefinition oldGrpWithProps = createVspGroupWithProperties("grp2", "grp2", "prop3");
GroupDefinition newGrpNoProps = createVspGroupWithProperties("grp2", "grp2");
Resource prevResource = createResourceWithGroups(oldGrpNoProps, oldGrpWithProps);
Resource newResource = createResourceWithGroups(newGrpWithProps, newGrpNoProps);
ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
}
@Test
public void whenNewGroupIsUserDefined_itWasAlreadyMergedInEarlierCommand_noNeedToMerge() {
GroupDefinition oldUserDefinedGrp = createUserGroupWithProperties("grp1", "grp1", "prop1");
GroupDefinition newUserDefinedGrp = createVspGroupWithProperties("grp1", "grp1", "prop1");
Resource prevResource = createResourceWithGroups(oldUserDefinedGrp);
Resource newResource = createResourceWithGroups(newUserDefinedGrp);
ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
}
@Test
public void whenNewGroupWasntExistInPrevVersion_noMergeRequired_matchByInvariantName() {
GroupDefinition oldGrp = createUserGroupWithProperties("grp1", "grp1", "prop1");
GroupDefinition newGrp = createVspGroupWithProperties("newGrp1", "grp1", "prop1");
Resource prevResource = createResourceWithGroups(oldGrp);
Resource newResource = createResourceWithGroups(newGrp);
ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
verifyZeroInteractions(mergeBusinessLogic, groupsOperation);
}
@Test
public void mergeGroupProperties_updateGroupsAfterMerge_mergeOnlyGroups() {
when(groupsOperation.updateGroups(eq(newResource), updatedGroupsCaptor.capture(), eq(false))).thenReturn(Either.left(null));
ActionStatus mergeStatus = testInstance.mergeComponents(prevResource, newResource);
assertThat(mergeStatus).isEqualTo(ActionStatus.OK);
verify(mergeBusinessLogic).mergeInstanceDataDefinitions(prevGroup1.getProperties(), prevResource.getInputs(), newGroup1.getProperties(), newResource.getInputs());
assertThat(updatedGroupsCaptor.getValue())
.containsExactly(newGroup1);
}
private GroupDefinition createUserGroupWithProperties(String invariantName, String groupName, String ... propsNames) {
return createGroupWithProperties(invariantName, groupName, CreatedFrom.UI, propsNames);
}
private GroupDefinition createVspGroupWithProperties(String invariantName, String groupName, String ... propsNames) {
return createGroupWithProperties(invariantName, groupName, CreatedFrom.CSAR, propsNames);
}
private GroupDefinition createGroupWithProperties(String invariantName, String groupName, CreatedFrom createdFrom, String ... propsNames) {
GroupDefinitionBuilder groupDefinitionBuilder = GroupDefinitionBuilder.create()
.setUniqueId(invariantName)
.setName(groupName)
.setCreatedFrom(createdFrom)
.setInvariantName(invariantName);
Stream.of(propsNames).forEach(groupDefinitionBuilder::addProperty);
return groupDefinitionBuilder.build();
}
private Resource createResourceWithGroups(GroupDefinition ... groups) {
ResourceBuilder resourceBuilder = new ResourceBuilder();
Stream.of(groups).forEach(resourceBuilder::addGroup);
return resourceBuilder.build();
}
}
|
