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

Refactor test class setup and tearDown.

Browse Source 
Remove GemfireBeanFactoryLocator cleanup.  Rely on IntegrationTestsSupport to cleanup the GemfireBeanFactoryLocator state.

Rename setup/tearDown method from cleanUpBeanFactoryLocatorReferences to cleanupSecurityManagerProxyInstance.
This commit is contained in:
John Blum
2019-04-28 17:50:59 -07:00
parent 2a77937700
commit 71c93615d9
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-geode/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.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.support;
import static org.assertj.core.api.Assertions.assertThat;
@@ -28,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.data.gemfire.config.annotation.EnableSecurity;
import org.springframework.data.gemfire.config.annotation.PeerCacheApplication;
import org.springframework.data.gemfire.support.GemfireBeanFactoryLocator;
import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects;
import org.springframework.geode.core.util.ObjectUtils;
@@ -62,9 +60,7 @@ public class SecurityManagerProxyIntegrationTests extends IntegrationTestsSuppor
@BeforeClass
@AfterClass
public static void cleanUpBeanFactoryLocatorReferences() throws Exception {
GemfireBeanFactoryLocator.clear();
public static void cleanupSecurityManagerProxyInstance() {
ObjectUtils.doOperationSafely(() -> {
SecurityManagerProxy.getInstance().destroy();