From bfcb48fb63b4ef85bbae7013b47d157662f4f134 Mon Sep 17 00:00:00 2001
From: David Webb <dwebb@prowaveconsulting.com>
Date: Tue, 21 Jan 2014 15:56:43 -0500
Subject: [PATCH] Merged DATACASS-71 to master.

---
 ...tyPlaceholderNamespaceCreatingXmlConfigTest.java | 13 +++++--------
 ...holderNamespaceCreatingXmlConfigTest-context.xml |  2 +-
 .../config/CassandraNamespaceTests-context.xml      |  2 +-
 .../UserRepositoryIntegrationTests-context.xml      |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java
index eebe70ac6..93d8bd205 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java
@@ -9,7 +9,7 @@ import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cassandra.core.CassandraOperations;
-import org.springframework.cassandra.test.integration.AbstractEmbeddedCassandraIntegrationTest;
+import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest;
 import org.springframework.cassandra.test.integration.config.IntegrationTestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -18,15 +18,10 @@ import com.datastax.driver.core.Session;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
-public class PropertyPlaceholderNamespaceCreatingXmlConfigTest extends AbstractEmbeddedCassandraIntegrationTest {
+public class PropertyPlaceholderNamespaceCreatingXmlConfigTest extends AbstractKeyspaceCreatingIntegrationTest {
 
 	private static Logger log = LoggerFactory.getLogger(PropertyPlaceholderNamespaceCreatingXmlConfigTest.class);
 
-	@Override
-	protected String keyspace() {
-		return "ppncxcx";
-	}
-
 	@Inject
 	Session s;
 
@@ -36,8 +31,10 @@ public class PropertyPlaceholderNamespaceCreatingXmlConfigTest extends AbstractE
 	@Test
 	public void test() {
 		IntegrationTestUtils.assertSession(s);
-		IntegrationTestUtils.assertKeyspaceExists(keyspace(), s);
+
+		IntegrationTestUtils.assertKeyspaceExists("ppncxct", s);
 
 		assertNotNull(ops);
 	}
+
 }
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml
index 81d7ff8ce..81fbb2471 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml
+++ b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml
@@ -53,7 +53,7 @@
 			send-buffer-size="${socket.sendBufferSize}"
 		 />
 		<cassandra:keyspace name="${keyspace.name}" action="${keyspace.action}"/>
-		<cassandra:keyspace name="Foo" action="CREATE_DROP" durable-writes="true">
+		<cassandra:keyspace name="Foo123" action="CREATE_DROP" durable-writes="true">
 			<cassandra:replication class="NETWORK_TOPOLOGY_STRATEGY">
 				<cassandra:data-center replication-factor="${dc1.rf}" name="${dc1.name}"/>
 				<cassandra:data-center replication-factor="${dc1.rf}" name="${dc2.name}"/>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml
index 56723073e..c536d25c6 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml
@@ -20,7 +20,7 @@
 			min-simultaneous-requests="25" max-simultaneous-requests="100"
 			core-connections="1" max-connections="2" />
 		<cassandra-base:socket-options
-			connect-timeout-mls="5000" keep-alive="true" reuse-address="true"
+			connect-timeout-millis="5000" keep-alive="true" reuse-address="true"
 			so-linger="60" tcp-no-delay="true" receive-buffer-size="65536"
 			send-buffer-size="65536" />
 	</cassandra:cluster>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml
index 3601a030b..0b7d750d8 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml
@@ -22,7 +22,7 @@
 			min-simultaneous-requests="25" max-simultaneous-requests="100"
 			core-connections="1" max-connections="2" />
 		<cassandra-base:socket-options
-			connect-timeout-mls="5000" keep-alive="true" reuse-address="true"
+			connect-timeout-millis="5000" keep-alive="true" reuse-address="true"
 			so-linger="60" tcp-no-delay="true" receive-buffer-size="65536"
 			send-buffer-size="65536" />
 	</cassandra:cluster>