Merge "Add tests for coverage in subscription files"

Author: toine-at-est

cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/datajobs/subscription/cache/CmSubscriptionConfig.java

@@ -241,7 +241,17 @@ class CmSubscriptionHandlerImplSpec extends Specification {
             'data node selector for other dmi' | 'someOtherDmi' || 0
     }
 
-    def 'Log update when subscription status is REJECTED'() {
+    def 'Ignoring data node selector with no FDN prefix.'() {
+        given: 'the persistence service returns data node selector with no FDN prefix'
+            def myDataNodeSelectors = ['/noFdnPrefix'].asList()
+            mockCmSubscriptionPersistenceService.getInactiveDataNodeSelectors('someSubId') >> myDataNodeSelectors
+        when: 'method to update subscription status is called'
+            objectUnderTest.updateCmSubscriptionStatus('someSubId', 'someDmiServiceName', ACCEPTED)
+        then: 'update status is not delegated to persistence service'
+            0 * mockCmSubscriptionPersistenceService.updateCmSubscriptionStatus('/noFdnPrefix', ACCEPTED)
+    }
+
+    def 'Update subscription status to REJECTED'() {
         given: 'dmi service name and subscription id'
             def myDmi = 'myDmi'
             def mySubscriptionId = 'mySubscriptionId'

cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/datajobs/subscription/ncmp/CmSubscriptionHandlerImplSpec.groovy

@@ -20,15 +20,12 @@
 
 package org.onap.cps.ncmp.impl.datajobs.subscription.ncmp
 
-import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.Logger
-import ch.qos.logback.classic.spi.ILoggingEvent
-import ch.qos.logback.core.read.ListAppender
 import com.fasterxml.jackson.databind.ObjectMapper
+import org.onap.cps.ncmp.impl.datajobs.subscription.client_to_ncmp.DataJob
 import org.onap.cps.ncmp.impl.datajobs.subscription.client_to_ncmp.DataJobSubscriptionOperationInEvent
+import org.onap.cps.ncmp.impl.datajobs.subscription.client_to_ncmp.Event
 import org.onap.cps.ncmp.impl.utils.JexParser
 import org.onap.cps.ncmp.utils.TestUtils
-import org.slf4j.LoggerFactory
 import spock.lang.Specification
 
 class NcmpInEventConsumerSpec extends Specification {
@@ -70,6 +67,18 @@ class NcmpInEventConsumerSpec extends Specification {
             1 * mockCmSubscriptionHandler.deleteSubscription("myDataJobId")
     }
 
+    def 'Consuming subscription request with unknown event type.'() {
+        given: 'a subscription event with invalid event type'
+            def invalidEvent = new DataJobSubscriptionOperationInEvent(event:new Event(dataJob: new DataJob(id:'someId')), eventType: 'invalidEventType')
+        when: 'the event is consumed'
+            objectUnderTest.consumeSubscriptionEvent(invalidEvent)
+        then: 'no error thrown'
+            noExceptionThrown()
+        and: 'request was not delegated to be handled as CREATE or DELETE'
+            0 * mockCmSubscriptionHandler.deleteSubscription(_)
+            0 * mockCmSubscriptionHandler.createSubscription(_)
+    }
+
     def getDataNodeSelectorsAsXpaths(event) {
         return JexParser.toXpaths(event.event.dataJob.productionJobDefinition.targetSelector.dataNodeSelector)
     }