winterhazel commented on code in PR #11810:
URL: https://github.com/apache/cloudstack/pull/11810#discussion_r3005386183
##########
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java:
##########
@@ -1289,4 +1294,36 @@ public void testGetSnapshotImageStoreRefNotNull() {
Mockito.when(imageStoreDaoMock.findById(1L)).thenReturn(store);
Assert.assertNotNull(presetVariableHelperSpy.getSnapshotImageStoreRef(1L, 1L));
}
+
+ @Test
+ public void
getPresetVariableValueNetworkOfferingTestSetValuesAndReturnObject() {
+ NetworkOfferingVO networkOfferingVoMock =
Mockito.mock(NetworkOfferingVO.class);
+
Mockito.doReturn(networkOfferingVoMock).when(networkOfferingDaoMock).findByIdIncludingRemoved(Mockito.anyLong());
+ mockMethodValidateIfObjectIsNull();
+
+ GenericPresetVariable expected = getGenericPresetVariableForTests();
+
Mockito.doReturn(expected.getId()).when(networkOfferingVoMock).getUuid();
+
Mockito.doReturn(expected.getName()).when(networkOfferingVoMock).getName();
+
+ GenericPresetVariable result =
presetVariableHelperSpy.getPresetVariableValueNetworkOffering(1L);
+
+ assertPresetVariableIdAndName(expected, result);
+ validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"),
result);
+ }
+
+ @Test
+ public void
getPresetVariableValueVpcOfferingTestSetValuesAndReturnObject() {
+ VpcOfferingVO vpcOfferingVoMock = Mockito.mock(VpcOfferingVO.class);
+
Mockito.doReturn(vpcOfferingVoMock).when(vpcOfferingDao).findByIdIncludingRemoved(Mockito.anyLong());
+ mockMethodValidateIfObjectIsNull();
+
+ GenericPresetVariable expected = getGenericPresetVariableForTests();
+ Mockito.doReturn(expected.getId()).when(vpcOfferingVoMock).getUuid();
+ Mockito.doReturn(expected.getName()).when(vpcOfferingVoMock).getName();
+
+ GenericPresetVariable result =
presetVariableHelperSpy.getPresetVariableValueVpcOffering(1L);
+
+ assertPresetVariableIdAndName(expected, result);
+ validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"),
result);
Review Comment:
Same as above.
##########
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java:
##########
@@ -255,4 +261,22 @@ public String getState() {
public void setState(String state) {
this.state = state;
}
+
+ public GenericPresetVariable getNetworkOffering() {
+ return networkOffering;
+ }
+
+ public void setNetworkOffering(GenericPresetVariable networkOffering) {
+ this.networkOffering = networkOffering;
+ fieldNamesToIncludeInToString.add("networkOffering");
Review Comment:
```suggestion
```
This is not used anymore.
##########
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java:
##########
@@ -1289,4 +1294,36 @@ public void testGetSnapshotImageStoreRefNotNull() {
Mockito.when(imageStoreDaoMock.findById(1L)).thenReturn(store);
Assert.assertNotNull(presetVariableHelperSpy.getSnapshotImageStoreRef(1L, 1L));
}
+
+ @Test
+ public void
getPresetVariableValueNetworkOfferingTestSetValuesAndReturnObject() {
+ NetworkOfferingVO networkOfferingVoMock =
Mockito.mock(NetworkOfferingVO.class);
+
Mockito.doReturn(networkOfferingVoMock).when(networkOfferingDaoMock).findByIdIncludingRemoved(Mockito.anyLong());
+ mockMethodValidateIfObjectIsNull();
+
+ GenericPresetVariable expected = getGenericPresetVariableForTests();
+
Mockito.doReturn(expected.getId()).when(networkOfferingVoMock).getUuid();
+
Mockito.doReturn(expected.getName()).when(networkOfferingVoMock).getName();
+
+ GenericPresetVariable result =
presetVariableHelperSpy.getPresetVariableValueNetworkOffering(1L);
+
+ assertPresetVariableIdAndName(expected, result);
+ validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"),
result);
Review Comment:
This method does not exist anymore.
##########
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java:
##########
@@ -255,4 +261,22 @@ public String getState() {
public void setState(String state) {
this.state = state;
}
+
+ public GenericPresetVariable getNetworkOffering() {
+ return networkOffering;
+ }
+
+ public void setNetworkOffering(GenericPresetVariable networkOffering) {
+ this.networkOffering = networkOffering;
+ fieldNamesToIncludeInToString.add("networkOffering");
+ }
+
+ public GenericPresetVariable getVpcOffering() {
+ return vpcOffering;
+ }
+
+ public void setVpcOffering(GenericPresetVariable vpcOffering) {
+ this.vpcOffering = vpcOffering;
+ fieldNamesToIncludeInToString.add("vpcOffering");
Review Comment:
```suggestion
```
Same as above.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
