[nifi] branch master updated: NIFI-6302: - Updating integration tests to verify pruned results.

[alopresto]

This is an automated email from the ASF dual-hosted git repository.

alopresto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 999cfdc  NIFI-6302: - Updating integration tests to verify pruned 
results.
999cfdc is described below

commit 999cfdcac9bde93b125a809340ab9cfea6936bd6
Author: Matt Gilman <matt.c.gil...@gmail.com>
AuthorDate: Thu May 23 10:29:37 2019 -0400

    NIFI-6302:
    - Updating integration tests to verify pruned results.
    
    This closes #3487.
    
    Signed-off-by: Andy LoPresto <alopre...@apache.org>
---
 .../accesscontrol/ITProcessGroupAccessControl.java | 34 +++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java
index 48061a8..7465b8b 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java
@@ -67,6 +67,9 @@ public class ITProcessGroupAccessControl {
         assertTrue(entity.getPermissions().getCanRead());
         assertFalse(entity.getPermissions().getCanWrite());
         assertNotNull(entity.getComponent());
+
+        // ensure the contents are not included
+        assertNull(entity.getComponent().getContents());
     }
 
     /**
@@ -80,6 +83,9 @@ public class ITProcessGroupAccessControl {
         assertTrue(entity.getPermissions().getCanRead());
         assertTrue(entity.getPermissions().getCanWrite());
         assertNotNull(entity.getComponent());
+
+        // ensure the contents are not included
+        assertNull(entity.getComponent().getContents());
     }
 
     /**
@@ -163,6 +169,9 @@ public class ITProcessGroupAccessControl {
         assertEquals(READ_WRITE_CLIENT_ID, 
responseEntity.getRevision().getClientId());
         assertEquals(version + 1, 
responseEntity.getRevision().getVersion().longValue());
         assertEquals(updatedName, responseEntity.getComponent().getName());
+
+        // ensure the contents are not included
+        assertNull(responseEntity.getComponent().getContents());
     }
 
     /**
@@ -194,6 +203,9 @@ public class ITProcessGroupAccessControl {
         assertEquals(AccessControlHelper.READ_WRITE_CLIENT_ID, 
responseEntity.getRevision().getClientId());
         assertEquals(version + 1, 
responseEntity.getRevision().getVersion().longValue());
         assertEquals(updatedName, responseEntity.getComponent().getName());
+
+        // ensure the contents are not included
+        assertNull(responseEntity.getComponent().getContents());
     }
 
     /**
@@ -237,6 +249,7 @@ public class ITProcessGroupAccessControl {
         // verify
         assertEquals(WRITE_CLIENT_ID, 
responseEntity.getRevision().getClientId());
         assertEquals(version + 1, 
responseEntity.getRevision().getVersion().longValue());
+        assertNull(responseEntity.getComponent());
     }
 
     /**
@@ -292,7 +305,14 @@ public class ITProcessGroupAccessControl {
      */
     @Test
     public void testReadWriteUserDeleteProcessGroup() throws Exception {
-        verifyDelete(helper.getReadWriteUser(), 
AccessControlHelper.READ_WRITE_CLIENT_ID, 200);
+        final Response response = verifyDelete(helper.getReadWriteUser(), 
AccessControlHelper.READ_WRITE_CLIENT_ID, 200);
+
+        // verify
+        final ProcessGroupEntity entity = 
response.readEntity(ProcessGroupEntity.class);
+        assertNotNull(entity.getComponent());
+
+        // ensure the contents are not included
+        assertNull(entity.getComponent().getContents());
     }
 
     /**
@@ -302,7 +322,11 @@ public class ITProcessGroupAccessControl {
      */
     @Test
     public void testWriteUserDeleteProcessGroup() throws Exception {
-        verifyDelete(helper.getWriteUser(), 
AccessControlHelper.WRITE_CLIENT_ID, 200);
+        final Response response = verifyDelete(helper.getWriteUser(), 
AccessControlHelper.WRITE_CLIENT_ID, 200);
+
+        // verify
+        final ProcessGroupEntity entity = 
response.readEntity(ProcessGroupEntity.class);
+        assertNull(entity.getComponent());
     }
 
     /**
@@ -417,7 +441,7 @@ public class ITProcessGroupAccessControl {
         return entity;
     }
 
-    private void verifyDelete(final NiFiTestUser user, final String clientId, 
final int responseCode) throws Exception {
+    private Response verifyDelete(final NiFiTestUser user, final String 
clientId, final int responseCode) throws Exception {
         final ProcessGroupEntity entity = createProcessGroup("Copy");
 
         // create the entity body
@@ -426,10 +450,12 @@ public class ITProcessGroupAccessControl {
         queryParams.put("clientId", clientId);
 
         // perform the request
-        Response response = user.testDelete(entity.getUri(), queryParams);
+        final Response response = user.testDelete(entity.getUri(), 
queryParams);
 
         // ensure the request is failed with a forbidden status code
         assertEquals(responseCode, response.getStatus());
+
+        return response;
     }
 
     @AfterClass