X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=inline;f=cps-service%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fnotification%2FCpsDataUpdateEventFactorySpec.groovy;h=5b13fa516aa48934d74a68aa37d38af7a7393a3a;hb=21fa4f207e7d36befc49a3f4926dc4f52678a45e;hp=67ed3d90fa224a928dac063c34873aebfc2010e1;hpb=5ffd70d6cb68373389198a7c3fe5acb80c53e7a0;p=cps.git

diff --git a/cps-service/src/test/groovy/org/onap/cps/notification/CpsDataUpdateEventFactorySpec.groovy b/cps-service/src/test/groovy/org/onap/cps/notification/CpsDataUpdateEventFactorySpec.groovy
index 67ed3d90f..5b13fa516 100644
--- a/cps-service/src/test/groovy/org/onap/cps/notification/CpsDataUpdateEventFactorySpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/notification/CpsDataUpdateEventFactorySpec.groovy
@@ -36,27 +36,22 @@ import spock.lang.Specification
 class CpsDataUpdateEventFactorySpec extends Specification {
 
     def mockCpsDataService = Mock(CpsDataService)
-    def mockCpsAdminService = Mock(CpsAdminService)
 
-    def objectUnderTest = new CpsDataUpdatedEventFactory(mockCpsDataService, mockCpsAdminService)
+    def objectUnderTest = new CpsDataUpdatedEventFactory(mockCpsDataService)
 
-    def myDataspaceName = 'my-dataspace'
-    def myAnchorName = 'my-anchorname'
-    def mySchemasetName = 'my-schemaset-name'
     def dateTimeFormat = 'yyyy-MM-dd\'T\'HH:mm:ss.SSSZ'
 
     def 'Create a CPS data updated event successfully: #scenario'() {
-        given: 'cps admin service is able to return anchor details'
-            mockCpsAdminService.getAnchor(myDataspaceName, myAnchorName) >>
-                new Anchor(myAnchorName, myDataspaceName, mySchemasetName)
+        given: 'an anchor which has been updated'
+            def anchor = new Anchor('my-anchorname', 'my-dataspace', 'my-schemaset-name')
         and: 'cps data service returns the data node details'
             def xpath = '/'
             def dataNode = new DataNodeBuilder().withXpath(xpath).withLeaves(['leafName': 'leafValue']).build()
             mockCpsDataService.getDataNode(
-                myDataspaceName, myAnchorName, xpath, FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS) >> dataNode
+                'my-dataspace', 'my-anchorname', xpath, FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS) >> dataNode
         when: 'CPS data updated event is created'
-            def cpsDataUpdatedEvent = objectUnderTest.createCpsDataUpdatedEvent(myDataspaceName,
-                myAnchorName, DateTimeUtility.toOffsetDateTime(inputObservedTimestamp), Operation.CREATE)
+            def cpsDataUpdatedEvent = objectUnderTest.createCpsDataUpdatedEvent(anchor,
+                    DateTimeUtility.toOffsetDateTime(inputObservedTimestamp), Operation.CREATE)
         then: 'CPS data updated event is created with correct envelope'
             with(cpsDataUpdatedEvent) {
                 type == 'org.onap.cps.data-updated-event'
@@ -72,10 +67,10 @@ class CpsDataUpdateEventFactorySpec extends Specification {
                     assert observedTimestamp == inputObservedTimestamp
                 else
                     assert OffsetDateTime.now().minusSeconds(20).isBefore(
-                        DateTimeUtility.toOffsetDateTime(observedTimestamp))
-                assert anchorName == myAnchorName
-                assert dataspaceName == myDataspaceName
-                assert schemaSetName == mySchemasetName
+                            DateTimeUtility.toOffsetDateTime(observedTimestamp))
+                assert anchorName == 'my-anchorname'
+                assert dataspaceName == 'my-dataspace'
+                assert schemaSetName == 'my-schemaset-name'
                 assert operation == Content.Operation.CREATE
                 assert data == new Data().withAdditionalProperty('leafName', 'leafValue')
             }
@@ -86,6 +81,33 @@ class CpsDataUpdateEventFactorySpec extends Specification {
             'missing observed timestamp'    | null
     }
 
+    def 'Create a delete CPS data updated event successfully'() {
+        given: 'an anchor which has been deleted'
+            def anchor = new Anchor('my-anchorname', 'my-dataspace', 'my-schemaset-name')
+            def deletionTimestamp = '2021-01-01T23:00:00.345-0400'
+        when: 'a delete root data node event is created'
+            def cpsDataUpdatedEvent = objectUnderTest.createCpsDataUpdatedEvent(anchor,
+                    DateTimeUtility.toOffsetDateTime(deletionTimestamp), Operation.DELETE)
+        then: 'CPS data updated event is created with correct envelope'
+            with(cpsDataUpdatedEvent) {
+                type == 'org.onap.cps.data-updated-event'
+                source == new URI('urn:cps:org.onap.cps')
+                schema == new URI('urn:cps:org.onap.cps:data-updated-event-schema:v1')
+                StringUtils.hasText(id)
+                content != null
+            }
+        and: 'correct content'
+            with(cpsDataUpdatedEvent.content) {
+                assert isExpectedDateTimeFormat(observedTimestamp): "$observedTimestamp is not in $dateTimeFormat format"
+                assert observedTimestamp == deletionTimestamp
+                assert anchorName == 'my-anchorname'
+                assert dataspaceName == 'my-dataspace'
+                assert schemaSetName == 'my-schemaset-name'
+                assert operation == Content.Operation.DELETE
+                assert data == null
+            }
+    }
+
     def isExpectedDateTimeFormat(String observedTimestamp) {
         try {
             DateTimeFormatter.ofPattern(dateTimeFormat).parse(observedTimestamp)