X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ncmp-service%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fncmp%2Fapi%2Fimpl%2Futils%2FCmHandleIdMapperSpec.groovy;h=1b323a216ef0a34fe89ced1e39c13b7a04e5c086;hb=814b882c6bf85a88c9135edb592e90d46af31f9a;hp=55ccdf3be571851a23e9b392705776985b2dcc41;hpb=02838ed3f79a57ed10af29e97979b02675646d51;p=cps.git

diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapperSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapperSpec.groovy
index 55ccdf3be..1b323a216 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapperSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapperSpec.groovy
@@ -43,7 +43,7 @@ class CmHandleIdMapperSpec extends Specification {
         ((Logger) LoggerFactory.getLogger(CmHandleIdMapper.class)).addAppender(logger)
         logger.start()
         mockCpsCmHandlerQueryService.getAllCmHandles() >> []
-        assert objectUnderTest.addMapping('my cmhandle id', 'my alternate id')
+        assert objectUnderTest.addMapping('cached cmhandle id', 'cached alternate id')
     }
 
     void cleanup() {
@@ -52,9 +52,9 @@ class CmHandleIdMapperSpec extends Specification {
 
     def 'Checking entries in the cache.'() {
         expect: 'the alternate id can be converted to cmhandle id'
-            assert objectUnderTest.alternateIdToCmHandleId('my alternate id') == 'my cmhandle id'
+            assert objectUnderTest.alternateIdToCmHandleId('cached alternate id') == 'cached cmhandle id'
         and: 'the cmhandle id can be converted to alternate id'
-            assert objectUnderTest.cmHandleIdToAlternateId('my cmhandle id') == 'my alternate id'
+            assert objectUnderTest.cmHandleIdToAlternateId('cached cmhandle id') == 'cached alternate id'
     }
 
     def 'Attempt adding #scenario alternate id.'() {
@@ -71,11 +71,11 @@ class CmHandleIdMapperSpec extends Specification {
 
     def 'Remove an entry from the cache.'() {
         when: 'removing an entry'
-            objectUnderTest.removeMapping('my cmhandle id')
+            objectUnderTest.removeMapping('cached cmhandle id')
         then: 'converting alternate id returns null'
-            assert objectUnderTest.alternateIdToCmHandleId('my alternate id') == null
+            assert objectUnderTest.alternateIdToCmHandleId('cached alternate id') == null
         and: 'converting cmhandle id returns null'
-            assert objectUnderTest.cmHandleIdToAlternateId('my cmhandle id') == null
+            assert objectUnderTest.cmHandleIdToAlternateId('cached cmhandle id') == null
     }
 
     def 'Attempt to remove a non-existing entry from the cache.'() {
@@ -89,22 +89,22 @@ class CmHandleIdMapperSpec extends Specification {
 
     def 'Cannot update existing alternate id.'() {
         given: 'attempt to update an existing alternate id'
-            objectUnderTest.addMapping('my cmhandle id', 'other id')
+            objectUnderTest.addMapping('cached cmhandle id', 'other id')
         expect: 'still returns the original alternate id'
-            assert objectUnderTest.cmHandleIdToAlternateId('my cmhandle id') == 'my alternate id'
+            assert objectUnderTest.cmHandleIdToAlternateId('cached cmhandle id') == 'cached alternate id'
         and: 'converting other alternate id returns null'
             assert objectUnderTest.alternateIdToCmHandleId('other id') == null
         and: 'a warning is logged with the original alternate id'
             def lastLoggingEvent = logger.list[1]
             assert lastLoggingEvent.level == Level.WARN
-            assert lastLoggingEvent.formattedMessage.contains('my alternate id')
+            assert lastLoggingEvent.formattedMessage.contains('id was added to the cache already')
     }
 
     def 'Update existing alternate id with the same value.'() {
         expect: 'update an existing alternate id with the same value returns false (no update)'
-            assert objectUnderTest.addMapping('my cmhandle id', 'my alternate id') == false
+            assert objectUnderTest.addMapping('cached cmhandle id', 'cached alternate id') == false
         and: 'conversion still returns the original alternate id'
-            assert objectUnderTest.cmHandleIdToAlternateId('my cmhandle id') == 'my alternate id'
+            assert objectUnderTest.cmHandleIdToAlternateId('cached cmhandle id') == 'cached alternate id'
     }
 
     def 'Initializing cache #scenario.'() {
@@ -123,4 +123,16 @@ class CmHandleIdMapperSpec extends Specification {
             'without alternate id'    | [new NcmpServiceCmHandle(cmHandleId: 'ch-1')]                       || null                | null
             'with blank alternate id' | [new NcmpServiceCmHandle(cmHandleId: 'ch-1', alternateId: ' ')]     || null                | null
     }
+
+    def 'Checking caches for duplicated values when: #scenario.'() {
+        expect: 'duplicate checks works as intended'
+            assert objectUnderTest.isDuplicateId(cmHandleId, alternateId) == expectDuplicate
+        where: 'the following values are given'
+            scenario                                             | cmHandleId           | alternateId           || expectDuplicate
+            'new cm handle'                                      | 'new ch-1'           | 'alt-1'               || false
+            'cm handle with already assigned other alternate id' | 'cached cmhandle id' | 'alt-1'               || true
+            'alternate id already assigned to other cm handle'   | 'ch-1'               | 'cached alternate id' || true
+            'no alternate id provided'                           | 'ch-1'               | null                  || false
+            'cm handle with already assigned same alternate id'  | 'ch-1'               | 'alt-1'               || false
+    }
 }
\ No newline at end of file