From: Ittay Stern <ittay.stern@att.com>
Date: Wed, 12 Dec 2018 11:22:20 +0000 (+0000)
Subject: Merge "Make CategoryParameter.getOptions() unmodifiable"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=13022570337843e0112dcce93e2d7609992e20e9;p=sandbox-vid.git

Merge "Make CategoryParameter.getOptions() unmodifiable"
---

13022570337843e0112dcce93e2d7609992e20e9
diff --cc vid-app-common/src/test/java/org/onap/vid/services/CategoryParameterServiceImplTest.java
index 7a4263c7,7992cbb1..3492a754
--- a/vid-app-common/src/test/java/org/onap/vid/services/CategoryParameterServiceImplTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/CategoryParameterServiceImplTest.java
@@@ -155,12 -158,13 +156,13 @@@ public class CategoryParameterServiceIm
      @Test
      public void deleteCategoryOption_happyPath() {
          CategoryParameter categoryParameter = createCategoryParameter(CATEGORY_NAME, true);
+         CategoryParameter anotherCategoryParameter = createCategoryParameter(CATEGORY_NAME, true);
          CategoryParameterOption categoryParameterOption =
-             new CategoryParameterOption(APP_ID_VID, OPTION_NAME, categoryParameter);
-         categoryParameter.getOptions().add(categoryParameterOption);
+             new CategoryParameterOption(APP_ID_VID, OPTION_NAME, anotherCategoryParameter);
+         categoryParameter.addOption(categoryParameterOption);
          List<CategoryParameter> aList = createCategoryParametersList(categoryParameter);
  
 -        doReturn(aList).when(dataAccessService).getList(anyObject(), anyString(), anyString(), anyObject());
 +        doReturn(aList).when(dataAccessService).getList(any(), anyString(), any(), any());
  
          testSubject.deleteCategoryOption(CATEGORY_NAME, categoryParameterOption);
  
@@@ -171,12 -175,13 +173,13 @@@
      @Test
      public void getCategoryParametersTest() {
          CategoryParameter categoryParameter = createCategoryParameter(CATEGORY_NAME, true);
+         CategoryParameter anotherCategoryParameter = createCategoryParameter(CATEGORY_NAME, true);
          CategoryParameterOption categoryParameterOption =
-             new CategoryParameterOption(APP_ID_VID, OPTION_NAME, categoryParameter);
-         categoryParameter.getOptions().add(categoryParameterOption);
+             new CategoryParameterOption(APP_ID_VID, OPTION_NAME, anotherCategoryParameter);
+         categoryParameter.addOption(categoryParameterOption);
          List<CategoryParameter> aList = createCategoryParametersList(categoryParameter);
  
 -        doReturn(aList).when(dataAccessService).getList(anyObject(), anyString(), anyString(), anyObject());
 +        doReturn(aList).when(dataAccessService).getList(any(), anyString(), any(), any());
  
          CategoryParametersResponse response = testSubject.getCategoryParameters(Family.PARAMETER_STANDARDIZATION);