From: Toine Siebelink <toine.siebelink@est.tech>
Date: Thu, 8 Feb 2024 16:36:52 +0000 (+0000)
Subject: Merge "Revert "Introduce Hazelcast for alternateId-cmHandle relation pt. 2 - error... 
X-Git-Tag: 3.4.4~33
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=590a3ee140e06a979aaf49f55bb4f8e3c7ce8e17;hp=-c;p=cps.git

Merge "Revert "Introduce Hazelcast for alternateId-cmHandle relation pt. 2 - error collection""
---

590a3ee140e06a979aaf49f55bb4f8e3c7ce8e17
diff --combined cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/utils/CmHandleIdMapperSpec.groovy
index 1b323a216,0a2962e98..55ccdf3be
--- 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 +43,7 @@@ class CmHandleIdMapperSpec extends Spec
          ((Logger) LoggerFactory.getLogger(CmHandleIdMapper.class)).addAppender(logger)
          logger.start()
          mockCpsCmHandlerQueryService.getAllCmHandles() >> []
-         assert objectUnderTest.addMapping('cached cmhandle id', 'cached alternate id')
+         assert objectUnderTest.addMapping('my cmhandle id', 'my alternate id')
      }
  
      void cleanup() {
@@@ -52,9 -52,9 +52,9 @@@
  
      def 'Checking entries in the cache.'() {
          expect: 'the alternate id can be converted to cmhandle id'
-             assert objectUnderTest.alternateIdToCmHandleId('cached alternate id') == 'cached cmhandle id'
+             assert objectUnderTest.alternateIdToCmHandleId('my alternate id') == 'my cmhandle id'
          and: 'the cmhandle id can be converted to alternate id'
-             assert objectUnderTest.cmHandleIdToAlternateId('cached cmhandle id') == 'cached alternate id'
+             assert objectUnderTest.cmHandleIdToAlternateId('my cmhandle id') == 'my alternate id'
      }
  
      def 'Attempt adding #scenario alternate id.'() {
@@@ -71,40 -71,31 +71,40 @@@
  
      def 'Remove an entry from the cache.'() {
          when: 'removing an entry'
-             objectUnderTest.removeMapping('cached cmhandle id')
+             objectUnderTest.removeMapping('my cmhandle id')
          then: 'converting alternate id returns null'
-             assert objectUnderTest.alternateIdToCmHandleId('cached alternate id') == null
+             assert objectUnderTest.alternateIdToCmHandleId('my alternate id') == null
          and: 'converting cmhandle id returns null'
-             assert objectUnderTest.cmHandleIdToAlternateId('cached cmhandle id') == null
+             assert objectUnderTest.cmHandleIdToAlternateId('my cmhandle id') == null
      }
  
 +    def 'Attempt to remove a non-existing entry from the cache.'() {
 +        when: 'removing an entry that is not cached'
 +            objectUnderTest.removeMapping('non-cached cmhandle id')
 +        then: 'deleting from the cmhandle cache returns null'
 +            assert alternateIdPerCmHandle.remove('non-cached cmhandle id') == null
 +        and: 'removal from the alternate id cache is skipped'
 +            0 * cmHandlePerAlternateId.remove(_)
 +    }
 +
      def 'Cannot update existing alternate id.'() {
          given: 'attempt to update an existing alternate id'
-             objectUnderTest.addMapping('cached cmhandle id', 'other id')
+             objectUnderTest.addMapping('my cmhandle id', 'other id')
          expect: 'still returns the original alternate id'
-             assert objectUnderTest.cmHandleIdToAlternateId('cached cmhandle id') == 'cached alternate id'
+             assert objectUnderTest.cmHandleIdToAlternateId('my cmhandle id') == 'my 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('id was added to the cache already')
+             assert lastLoggingEvent.formattedMessage.contains('my alternate id')
      }
  
      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('cached cmhandle id', 'cached alternate id') == false
+             assert objectUnderTest.addMapping('my cmhandle id', 'my alternate id') == false
          and: 'conversion still returns the original alternate id'
-             assert objectUnderTest.cmHandleIdToAlternateId('cached cmhandle id') == 'cached alternate id'
+             assert objectUnderTest.cmHandleIdToAlternateId('my cmhandle id') == 'my alternate id'
      }
  
      def 'Initializing cache #scenario.'() {
@@@ -123,16 -114,4 +123,4 @@@
              '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
-     }
  }