[geode] branch develop updated: GEODE-4303: Add assertions to nil test.

[pr...@apache.org]

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

prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 6267bb5  GEODE-4303: Add assertions to nil test.
6267bb5 is described below

commit 6267bb510a3d8009e24d8357736f05725ae39e98
Author: Patrick Rhomberg <Pu...@users.noreply.github.com>
AuthorDate: Wed Jan 17 15:29:28 2018 -0800

    GEODE-4303: Add assertions to nil test.
    
    * Slight correction of test logic.
---
 .../internal/security/ResourcePermissionTest.java  | 42 +++++++++++++---------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
index 54db58e..48f93d8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.management.internal.security;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -30,11 +31,9 @@ import org.apache.geode.test.junit.categories.UnitTest;
 
 @Category({UnitTest.class, SecurityTest.class})
 public class ResourcePermissionTest {
-  private ResourcePermission context;
-
   @Test
   public void testEmptyConstructor() {
-    context = new ResourcePermission();
+    ResourcePermission context = new ResourcePermission();
     assertEquals(Resource.NULL, context.getResource());
     assertEquals(Operation.NULL, context.getOperation());
     assertEquals(ResourcePermission.ALL, context.getTarget());
@@ -42,13 +41,13 @@ public class ResourcePermissionTest {
 
   @Test
   public void testIsPermission() {
-    context = new ResourcePermission();
+    ResourcePermission context = new ResourcePermission();
     assertTrue(context instanceof WildcardPermission);
   }
 
   @Test
   public void testConstructor() {
-    context = new ResourcePermission();
+    ResourcePermission context = new ResourcePermission();
     assertEquals(Resource.NULL, context.getResource());
     assertEquals(Operation.NULL, context.getOperation());
     assertEquals(ResourcePermission.ALL, context.getTarget());
@@ -95,7 +94,7 @@ public class ResourcePermissionTest {
 
   @Test
   public void testToString() {
-    context = new ResourcePermission();
+    ResourcePermission context = new ResourcePermission();
     assertEquals("NULL:NULL", context.toString());
 
     context = new ResourcePermission(Resource.DATA, Operation.MANAGE);
@@ -110,16 +109,25 @@ public class ResourcePermissionTest {
 
   @Test
   public void testImplies() {
-    WildcardPermission role = new WildcardPermission("*:read");
-    role.implies(new ResourcePermission(Resource.DATA, Operation.READ));
-    role.implies(new ResourcePermission(Resource.CLUSTER, Operation.READ));
-
-    role = new WildcardPermission("*:read:*");
-    role.implies(new ResourcePermission(Resource.DATA, Operation.READ, "testRegion"));
-    role.implies(new ResourcePermission(Resource.CLUSTER, Operation.READ, "anotherRegion", "key1"));
-
-    role = new WildcardPermission("data:*:testRegion");
-    role.implies(new ResourcePermission(Resource.DATA, Operation.READ, "testRegion"));
-    role.implies(new ResourcePermission(Resource.DATA, Operation.WRITE, "testRegion"));
+    // If caseSensitive=false, the permission string becomes lower-case, which will cause failures
+    // when testing implication against our (case sensitive) resources, e.g., DATA
+
+    WildcardPermission context = new WildcardPermission("*:READ", true);
+    assertThat(context.implies(new ResourcePermission(Resource.DATA, Operation.READ))).isTrue();
+    assertThat(context.implies(new ResourcePermission(Resource.CLUSTER, Operation.READ))).isTrue();
+
+    context = new WildcardPermission("*:READ:*", true);
+    assertThat(context.implies(new ResourcePermission(Resource.DATA, Operation.READ, "testRegion")))
+        .isTrue();
+    assertThat(context
+        .implies(new ResourcePermission(Resource.CLUSTER, Operation.READ, "anotherRegion", "key1")))
+            .isTrue();
+
+    context = new WildcardPermission("DATA:*:testRegion", true);
+    assertThat(context.implies(new ResourcePermission(Resource.DATA, Operation.READ, "testRegion")))
+        .isTrue();
+    assertThat(
+        context.implies(new ResourcePermission(Resource.DATA, Operation.WRITE, "testRegion")))
+            .isTrue();
   }
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].