From 671bfa0444f752761b34b9ce47c3ef8c2fa4b5e0 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 29 Feb 2016 15:44:46 -0600 Subject: [PATCH] Revert "Fix GemFire compile in Eclipse" This reverts commit 8bf3a251bb5166187e6de9aa4b40f9432ca7d947. since the fixes to the tests are incorrect. --- ...AbstractGemFireOperationsSessionRepositoryTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-session/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTest.java b/spring-session/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTest.java index 016fa22..b39a423 100644 --- a/spring-session/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTest.java +++ b/spring-session/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTest.java @@ -299,7 +299,7 @@ public class AbstractGemFireOperationsSessionRepositoryTest { } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings("unchecked") public void afterCreatedWithNonSessionTypeDoesNotPublishSessionCreatedEvent() { TestGemFireOperationsSessionRepository sessionRepository = new TestGemFireOperationsSessionRepository(mockGemfireOperations) { @Override protected void handleCreated(final String sessionId, final ExpiringSession session) { @@ -307,12 +307,12 @@ public class AbstractGemFireOperationsSessionRepositoryTest { } }; - EntryEvent mockEntryEvent = mock(EntryEvent.class); + EntryEvent mockEntryEvent = mock(EntryEvent.class); when(mockEntryEvent.getKey()).thenReturn("abc123"); when(mockEntryEvent.getNewValue()).thenReturn(new Object()); - sessionRepository.afterCreate(mockEntryEvent); + sessionRepository.afterCreate((EntryEvent) mockEntryEvent); verify(mockEntryEvent, never()).getKey(); verify(mockEntryEvent, times(1)).getNewValue(); @@ -427,7 +427,7 @@ public class AbstractGemFireOperationsSessionRepositoryTest { EntryEvent mockEntryEvent = mock(EntryEvent.class); when(mockEntryEvent.getKey()).thenReturn(sessionId); - when(mockEntryEvent.getOldValue()).thenReturn(null); + when(mockEntryEvent.getOldValue()).thenReturn(new Object()); sessionRepository.setApplicationEventPublisher(mockApplicationEventPublisher); sessionRepository.afterDestroy((EntryEvent) mockEntryEvent); @@ -548,7 +548,7 @@ public class AbstractGemFireOperationsSessionRepositoryTest { EntryEvent mockEntryEvent = mock(EntryEvent.class); when(mockEntryEvent.getKey()).thenReturn(sessionId); - when(mockEntryEvent.getOldValue()).thenReturn(null); + when(mockEntryEvent.getOldValue()).thenReturn(new Object()); sessionRepository.setApplicationEventPublisher(mockApplicationEventPublisher); sessionRepository.afterInvalidate((EntryEvent) mockEntryEvent);