Add integration tests for Hazelcast client use case

Fixes gh-356

spring-session/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,77 +13,50 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.session.hazelcast;
 
-import static org.assertj.core.api.Assertions.*;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.session.ExpiringSession;
-import org.springframework.session.SessionRepository;
-import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.util.SocketUtils;
-
-import com.hazelcast.config.Config;
-import com.hazelcast.config.NetworkConfig;
-import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
+import org.junit.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.session.ExpiringSession;
+import org.springframework.session.SessionRepository;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests that check the underlying data source - in this case
- * Hazelcast.
+ * Abstract base class for Hazelcast integration tests.
  * 
  * @author Tommy Ludwig
+ * @author Vedran Pavic
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-@WebAppConfiguration
-public class HazelcastRepositoryITests<S extends ExpiringSession> {
+public abstract class AbstractHazelcastRepositoryITests<S extends ExpiringSession> {
 
 	@Autowired
 	private HazelcastInstance hazelcast;
-	
+
 	@Autowired
 	private SessionRepository<S> repository;
-	
+
 	@Test
 	public void createAndDestorySession() {
 		S sessionToSave = repository.createSession();
 		String sessionId = sessionToSave.getId();
-		
+
 		IMap<String, S> hazelcastMap = hazelcast.getMap("spring:session:sessions");
-		
+
 		assertThat(hazelcastMap.size()).isEqualTo(0);
-		
+
 		repository.save(sessionToSave);
-		
+
 		assertThat(hazelcastMap.size()).isEqualTo(1);
 		assertThat(hazelcastMap.get(sessionId)).isEqualTo(sessionToSave);
-		
+
 		repository.delete(sessionId);
-		
+
 		assertThat(hazelcastMap.size()).isEqualTo(0);
 	}
 
-	@EnableHazelcastHttpSession
-	@Configuration
-	static class HazelcastSessionConfig {
-
-		@Bean
-		public HazelcastInstance embeddedHazelcast() {
-			Config hazelcastConfig = new Config();
-			NetworkConfig netConfig = new NetworkConfig();
-			netConfig.setPort(SocketUtils.findAvailableTcpPort());
-			hazelcastConfig.setNetworkConfig(netConfig);
-			return Hazelcast.newHazelcastInstance(hazelcastConfig);
-		}
-	}
-
 }

spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.session.hazelcast;
+
+import com.hazelcast.client.HazelcastClient;
+import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.HazelcastInstance;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.ExpiringSession;
+import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.util.SocketUtils;
+
+/**
+ * Integration tests that check the underlying data source - in this case
+ * Hazelcast Client.
+ *
+ * @author Vedran Pavic
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@WebAppConfiguration
+public class HazelcastClientRepositoryITests<S extends ExpiringSession>
+		extends AbstractHazelcastRepositoryITests<S> {
+
+	private static final int PORT = SocketUtils.findAvailableTcpPort();
+
+	@BeforeClass
+	public static void setup() {
+		HazelcastITestUtils.embeddedHazelcastServer(PORT);
+	}
+
+	@AfterClass
+	public static void teardown() {
+		Hazelcast.shutdownAll();
+	}
+
+	@Configuration
+	@EnableHazelcastHttpSession
+	static class HazelcastSessionConfig {
+
+		@Bean
+		public HazelcastInstance embeddedHazelcastClient() {
+			ClientConfig clientConfig = new ClientConfig();
+			clientConfig.getNetworkConfig()
+					.addAddress("127.0.0.1:" + PORT);
+			return HazelcastClient.newHazelcastClient(clientConfig);
+		}
+
+	}
+
+}

spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.session.hazelcast;
+
+import com.hazelcast.config.Config;
+import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.HazelcastInstance;
+
+import org.springframework.util.SocketUtils;
+
+/**
+ * Utility class for Hazelcast integration tests.
+ *
+ * @author Vedran Pavic
+ */
+public class HazelcastITestUtils {
+
+	/**
+	 * Creates {@link HazelcastInstance} for use in integration tests.
+	 * @param port the port for Hazelcast to bind to
+	 * @return the Hazelcast instance
+	 */
+	public static HazelcastInstance embeddedHazelcastServer(int port) {
+		Config config = new Config();
+		config.getNetworkConfig()
+				.setPort(port);
+		return Hazelcast.newHazelcastInstance(config);
+	}
+
+	/**
+	 * Creates {@link HazelcastInstance} for use in integration tests.
+	 * @return the Hazelcast instance
+	 */
+	public static HazelcastInstance embeddedHazelcastServer() {
+		return embeddedHazelcastServer(SocketUtils.findAvailableTcpPort());
+	}
+
+}

spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.session.hazelcast;
+
+import com.hazelcast.core.HazelcastInstance;
+import org.junit.runner.RunWith;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.ExpiringSession;
+import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+/**
+ * Integration tests that check the underlying data source - in this case
+ * Hazelcast Server.
+ *
+ * @author Tommy Ludwig
+ * @author Vedran Pavic
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@WebAppConfiguration
+public class HazelcastServerRepositoryITests<S extends ExpiringSession>
+		extends AbstractHazelcastRepositoryITests<S> {
+
+	@EnableHazelcastHttpSession
+	@Configuration
+	static class HazelcastSessionConfig {
+
+		@Bean
+		public HazelcastInstance embeddedHazelcastServer() {
+			return HazelcastITestUtils.embeddedHazelcastServer();
+		}
+
+	}
+
+}

spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,15 +36,11 @@ import org.springframework.session.data.SessionEventRegistry;
 import org.springframework.session.events.SessionCreatedEvent;
 import org.springframework.session.events.SessionDeletedEvent;
 import org.springframework.session.events.SessionExpiredEvent;
-import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
+import org.springframework.session.hazelcast.HazelcastITestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.util.SocketUtils;
 
-import com.hazelcast.config.Config;
-import com.hazelcast.config.NetworkConfig;
-import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 
 /**
@@ -169,11 +165,7 @@ public class EnableHazelcastHttpSessionEventsTests<S extends ExpiringSession> {
 		
 		@Bean
 		public HazelcastInstance embeddedHazelcast() {
-			Config hazelcastConfig = new Config();
-			NetworkConfig netConfig = new NetworkConfig();
-			netConfig.setPort(SocketUtils.findAvailableTcpPort());
-			hazelcastConfig.setNetworkConfig(netConfig);
-			return Hazelcast.newHazelcastInstance(hazelcastConfig);
+			return HazelcastITestUtils.embeddedHazelcastServer();
 		}
 		
 		@Bean