Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove uses of the org.apache.geode.management.internal.security.ResourceConstants class to refer to Security constants and properties.

Browse Source 
Resolves gh-70.
This commit is contained in:
John Blum
2020-02-21 18:51:35 -08:00
parent 49d5e65a9f
commit d266c1c660
7 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apache-geode-extensions/src/test/java/org/springframework/geode/security/TestAuthInitializeUnitTests.java
View File

@@ -13,18 +13,18 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
package org.springframework.geode.security;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.junit.Test;
import org.springframework.geode.util.GeodeConstants;
/**
* Unit tests for {@link TestAuthInitialize}.
* Unit Tests for {@link TestAuthInitialize}.
*
* @author John Blum
* @see java.util.Properties
@@ -45,11 +45,11 @@ public class TestAuthInitializeUnitTests {
Properties securityProperties = new Properties();
if (isSet(username)) {
securityProperties.setProperty(ResourceConstants.USER_NAME, username);
securityProperties.setProperty(GeodeConstants.USERNAME, username);
}
if (isSet(password)) {
securityProperties.setProperty(ResourceConstants.PASSWORD, password);
securityProperties.setProperty(GeodeConstants.PASSWORD, password);
}
return securityProperties;
@@ -62,8 +62,8 @@ public class TestAuthInitializeUnitTests {
this.authInitialize.getCredentials(newSecurityProperties("testUser", "s3cr3t"));
assertThat(credentials).isNotNull();
assertThat(credentials.getProperty(ResourceConstants.USER_NAME)).isEqualTo("testUser");
assertThat(credentials.getProperty(ResourceConstants.PASSWORD)).isEqualTo("s3cr3t");
assertThat(credentials.getProperty(GeodeConstants.USERNAME)).isEqualTo("testUser");
assertThat(credentials.getProperty(GeodeConstants.PASSWORD)).isEqualTo("s3cr3t");
}
@Test
@@ -73,8 +73,8 @@ public class TestAuthInitializeUnitTests {
this.authInitialize.getCredentials(newSecurityProperties("testUser", null));
assertThat(credentials).isNotNull();
assertThat(credentials.getProperty(ResourceConstants.USER_NAME)).isEqualTo("testUser");
assertThat(credentials.getProperty(ResourceConstants.PASSWORD)).isEqualTo("test");
assertThat(credentials.getProperty(GeodeConstants.USERNAME)).isEqualTo("testUser");
assertThat(credentials.getProperty(GeodeConstants.PASSWORD)).isEqualTo("test");
}
@Test
@@ -84,8 +84,8 @@ public class TestAuthInitializeUnitTests {
this.authInitialize.getCredentials(newSecurityProperties(null, "s3cr3t"));
assertThat(credentials).isNotNull();
assertThat(credentials.getProperty(ResourceConstants.USER_NAME)).isEqualTo("test");
assertThat(credentials.getProperty(ResourceConstants.PASSWORD)).isEqualTo("s3cr3t");
assertThat(credentials.getProperty(GeodeConstants.USERNAME)).isEqualTo("test");
assertThat(credentials.getProperty(GeodeConstants.PASSWORD)).isEqualTo("s3cr3t");
}
@Test
@@ -95,7 +95,7 @@ public class TestAuthInitializeUnitTests {
this.authInitialize.getCredentials(newSecurityProperties(null, null));
assertThat(credentials).isNotNull();
assertThat(credentials.getProperty(ResourceConstants.USER_NAME)).isEqualTo("test");
assertThat(credentials.getProperty(ResourceConstants.PASSWORD)).isEqualTo("test");
assertThat(credentials.getProperty(GeodeConstants.USERNAME)).isEqualTo("test");
assertThat(credentials.getProperty(GeodeConstants.PASSWORD)).isEqualTo("test");
}
}

15
apache-geode-extensions/src/test/java/org/springframework/geode/security/TestSecurityManagerUnitTests.java
View File

@@ -13,7 +13,6 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
package org.springframework.geode.security;
import static org.assertj.core.api.Assertions.assertThat;
@@ -22,13 +21,15 @@ import static org.mockito.Mockito.mock;
import java.security.Principal;
import java.util.Properties;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.ResourcePermission;
import org.junit.Test;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.ResourcePermission;
import org.springframework.geode.util.GeodeConstants;
/**
* Unit tests for {@link org.springframework.geode.security.TestSecurityManager}.
* Unit Tests for {@link org.springframework.geode.security.TestSecurityManager}.
*
* @author John Blum
* @see org.junit.Test
@@ -44,8 +45,8 @@ public class TestSecurityManagerUnitTests {
Properties securityProperties = new Properties();
securityProperties.setProperty(ResourceConstants.USER_NAME, username);
securityProperties.setProperty(ResourceConstants.PASSWORD, password);
securityProperties.setProperty(GeodeConstants.USERNAME, username);
securityProperties.setProperty(GeodeConstants.PASSWORD, password);
return securityProperties;
}