diff --git a/pom.xml b/pom.xml index 6813a1ac2..c26cb4405 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,7 @@ 1.01 multi 1.13.0.BUILD-SNAPSHOT + 3.5.2 @@ -202,6 +203,13 @@ ${multithreadedtc.version} test + + + org.assertj + assertj-core + ${assertj} + test + @@ -210,6 +218,12 @@ com.datastax.cassandra cassandra-driver-core + + + org.assertj + assertj-core + test + diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java old mode 100644 new mode 100755 index 37998822d..b473a9d4d --- a/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java @@ -16,28 +16,15 @@ package org.springframework.cassandra.config; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import static org.mockito.Mockito.isA; import org.junit.Test; import org.mockito.Matchers; import org.springframework.test.util.ReflectionTestUtils; -import com.datastax.driver.core.AuthProvider; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Configuration; -import com.datastax.driver.core.JdkSSLOptions; -import com.datastax.driver.core.PlainTextAuthProvider; -import com.datastax.driver.core.PoolingOptions; -import com.datastax.driver.core.ProtocolOptions; +import com.datastax.driver.core.*; import com.datastax.driver.core.ProtocolOptions.Compression; -import com.datastax.driver.core.ProtocolVersion; -import com.datastax.driver.core.QueryOptions; -import com.datastax.driver.core.SSLOptions; -import com.datastax.driver.core.SocketOptions; -import com.datastax.driver.core.TimestampGenerator; import com.datastax.driver.core.policies.AddressTranslator; import com.datastax.driver.core.policies.ExponentialReconnectionPolicy; import com.datastax.driver.core.policies.LoadBalancingPolicy; @@ -65,10 +52,10 @@ public class CassandraCqlClusterFactoryBeanUnitTests { CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); bean.afterPropertiesSet(); - assertThat(bean.getObject(), is(not(nullValue()))); - assertThat(bean.getObject().isClosed(), is(false)); - assertThat(getConfiguration(bean).getMetricsOptions(), is(not(nullValue()))); - assertThat(getConfiguration(bean).getMetricsOptions().isJMXReportingEnabled(), is(true)); + assertThat(bean.getObject()).isNotNull(); + assertThat(bean.getObject().isClosed()).isFalse(); + assertThat(getConfiguration(bean).getMetricsOptions()).isNotNull(); + assertThat(getConfiguration(bean).getMetricsOptions().isJMXReportingEnabled()).isTrue(); } /** @@ -82,7 +69,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.afterPropertiesSet(); bean.destroy(); - assertThat(bean.getObject().isClosed(), is(true)); + assertThat(bean.getObject().isClosed()).isTrue(); } /** @@ -98,7 +85,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setCompressionType(compressionType); bean.afterPropertiesSet(); - assertThat(getProtocolOptions(bean).getCompression(), is(Compression.LZ4)); + assertThat(getProtocolOptions(bean).getCompression()).isEqualTo(Compression.LZ4); } /** @@ -114,7 +101,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setCompressionType(compressionType); bean.afterPropertiesSet(); - assertThat(getProtocolOptions(bean).getCompression(), is(Compression.SNAPPY)); + assertThat(getConfiguration(bean).getProtocolOptions().getCompression()).isEqualTo(Compression.SNAPPY); } /** @@ -130,7 +117,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setPoolingOptions(poolingOptions); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getPoolingOptions(), is(poolingOptions)); + assertThat(getConfiguration(bean).getPoolingOptions()).isEqualTo(poolingOptions); } /** @@ -146,7 +133,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setSocketOptions(socketOptions); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getSocketOptions(), is(socketOptions)); + assertThat(getConfiguration(bean).getSocketOptions()).isEqualTo(socketOptions); } /** @@ -162,7 +149,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setQueryOptions(queryOptions); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getQueryOptions(), is(queryOptions)); + assertThat(getConfiguration(bean).getQueryOptions()).isEqualTo(queryOptions); } /** @@ -177,8 +164,8 @@ public class CassandraCqlClusterFactoryBeanUnitTests { CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getQueryOptions(), is(not(nullValue()))); - assertThat(getConfiguration(bean).getQueryOptions(), is(not(queryOptions))); + assertThat(getConfiguration(bean).getQueryOptions()).isNotNull(); + assertThat(getConfiguration(bean).getQueryOptions()).isNotEqualTo(queryOptions); } /** @@ -194,7 +181,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setAuthProvider(authProvider); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getProtocolOptions().getAuthProvider(), is(authProvider)); + assertThat(getConfiguration(bean).getProtocolOptions().getAuthProvider()).isEqualTo(authProvider); } /** @@ -212,7 +199,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.afterPropertiesSet(); AuthProvider result = getConfiguration(bean).getProtocolOptions().getAuthProvider(); - assertThat(result, is(equalTo(authProvider))); + assertThat(result).isEqualTo(authProvider); } /** @@ -229,9 +216,9 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.afterPropertiesSet(); AuthProvider result = getConfiguration(bean).getProtocolOptions().getAuthProvider(); - assertThat(result, is(not(nullValue()))); - assertThat(ReflectionTestUtils.getField(result, "username"), is(equalTo((Object) "user"))); - assertThat(ReflectionTestUtils.getField(result, "password"), is(equalTo((Object) "password"))); + assertThat(result).isNotNull(); + assertThat(ReflectionTestUtils.getField(result, "username")).isEqualTo((Object) "user"); + assertThat(ReflectionTestUtils.getField(result, "password")).isEqualTo((Object) "password"); } /** @@ -247,7 +234,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setLoadBalancingPolicy(loadBalancingPolicy); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getPolicies().getLoadBalancingPolicy(), is(loadBalancingPolicy)); + assertThat(getConfiguration(bean).getPolicies().getLoadBalancingPolicy()).isEqualTo(loadBalancingPolicy); } /** @@ -263,7 +250,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setReconnectionPolicy(reconnectionPolicy); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getPolicies().getReconnectionPolicy(), is(reconnectionPolicy)); + assertThat(getConfiguration(bean).getPolicies().getReconnectionPolicy()).isEqualTo(reconnectionPolicy); } /** @@ -277,8 +264,8 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setProtocolVersion(ProtocolVersion.V2); bean.afterPropertiesSet(); - assertThat(ReflectionTestUtils.getField(getConfiguration(bean).getProtocolOptions(), "initialProtocolVersion"), - is((Object) ProtocolVersion.V2)); + assertThat(getConfiguration(bean).getProtocolOptions()).extracting("initialProtocolVersion") + .contains(ProtocolVersion.V2); } /** @@ -295,7 +282,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setSslOptions(sslOptions); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getProtocolOptions().getSSLOptions(), is(sslOptions)); + assertThat(getConfiguration(bean).getProtocolOptions().getSSLOptions()).isEqualTo(sslOptions); } /** @@ -309,7 +296,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setMetricsEnabled(false); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getMetricsOptions().isEnabled(), is(false)); + assertThat(getConfiguration(bean).getMetricsOptions().isEnabled()).isFalse(); } /** @@ -323,7 +310,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setJmxReportingEnabled(false); bean.afterPropertiesSet(); - assertThat(getConfiguration(bean).getMetricsOptions().isJMXReportingEnabled(), is(false)); + assertThat(getConfiguration(bean).getMetricsOptions().isJMXReportingEnabled()).isFalse(); } @Test @@ -350,7 +337,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setAddressTranslator(mockAddressTranslator); bean.afterPropertiesSet(); - assertThat(getPolicies(bean).getAddressTranslator(), is(equalTo(mockAddressTranslator))); + assertThat(getPolicies(bean).getAddressTranslator()).isEqualTo(mockAddressTranslator); } /** @@ -361,10 +348,11 @@ public class CassandraCqlClusterFactoryBeanUnitTests { final Cluster.Builder mockClusterBuilder = mock(Cluster.Builder.class); - when(mockClusterBuilder.addContactPoints(Matchers.anyVararg())).thenReturn(mockClusterBuilder); + when(mockClusterBuilder.addContactPoints(Matchers. anyVararg())).thenReturn(mockClusterBuilder); CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean() { - @Override Cluster.Builder newClusterBuilder() { + @Override + Cluster.Builder newClusterBuilder() { return mockClusterBuilder; } }; @@ -384,10 +372,11 @@ public class CassandraCqlClusterFactoryBeanUnitTests { final Cluster.Builder mockClusterBuilder = mock(Cluster.Builder.class); - when(mockClusterBuilder.addContactPoints(Matchers.anyVararg())).thenReturn(mockClusterBuilder); + when(mockClusterBuilder.addContactPoints(Matchers. anyVararg())).thenReturn(mockClusterBuilder); CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean() { - @Override Cluster.Builder newClusterBuilder() { + @Override + Cluster.Builder newClusterBuilder() { return mockClusterBuilder; } }; @@ -410,7 +399,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setMaxSchemaAgreementWaitSeconds(20); bean.afterPropertiesSet(); - assertThat(getProtocolOptions(bean).getMaxSchemaAgreementWaitSeconds(), is(equalTo(20))); + assertThat(getProtocolOptions(bean).getMaxSchemaAgreementWaitSeconds()).isEqualTo(20); } /** @@ -425,7 +414,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setSpeculativeExecutionPolicy(mockSpeculativeExecutionPolicy); bean.afterPropertiesSet(); - assertThat(getPolicies(bean).getSpeculativeExecutionPolicy(), is(equalTo(mockSpeculativeExecutionPolicy))); + assertThat(getPolicies(bean).getSpeculativeExecutionPolicy()).isEqualTo(mockSpeculativeExecutionPolicy); } /** @@ -440,7 +429,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { bean.setTimestampGenerator(mockTimestampGenerator); bean.afterPropertiesSet(); - assertThat(getPolicies(bean).getTimestampGenerator(), is(equalTo(mockTimestampGenerator))); + assertThat(getPolicies(bean).getTimestampGenerator()).isEqualTo(mockTimestampGenerator); } private Policies getPolicies(CassandraCqlClusterFactoryBean bean) throws Exception { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java old mode 100644 new mode 100755 index 1c0ec18d6..cc342472b --- a/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.cassandra.config; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; @@ -41,8 +40,8 @@ import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; /** - * The CassandraCqlSessionFactoryBeanUnitTests class is a test suite of test cases testing the contract - * and functionality of the {@link CassandraCqlSessionFactoryBean} class. + * The CassandraCqlSessionFactoryBeanUnitTests class is a test suite of test cases testing the contract and + * functionality of the {@link CassandraCqlSessionFactoryBean} class. * * @author John Blum * @see org.springframework.cassandra.config.CassandraCqlSessionFactoryBean @@ -52,14 +51,11 @@ import com.datastax.driver.core.Session; @RunWith(MockitoJUnitRunner.class) public class CassandraCqlSessionFactoryBeanUnitTests { - @Rule - public ExpectedException exception = ExpectedException.none(); + @Rule public ExpectedException exception = ExpectedException.none(); - @Mock - private Cluster mockCluster; + @Mock private Cluster mockCluster; - @Mock - private Session mockSession; + @Mock private Session mockSession; private CassandraCqlSessionFactoryBean factoryBean; @@ -68,8 +64,8 @@ public class CassandraCqlSessionFactoryBeanUnitTests { } protected void assertNonNullEmptyCollection(Collection collection) { - assertThat(collection, is(notNullValue())); - assertThat(collection.isEmpty(), is(true)); + assertThat(collection).isNotNull(); + assertThat(collection.isEmpty()).isTrue(); } @Before @@ -79,13 +75,13 @@ public class CassandraCqlSessionFactoryBeanUnitTests { @Test public void cassandraCqlSessionFactoryBeanIsSingleton() { - assertThat(factoryBean.isSingleton(), is(true)); + assertThat(factoryBean.isSingleton()).isTrue(); } @Test public void objectTypeWhenSessionHasNotBeenInitializedIsSessionClass() { - assertThat(factoryBean.getObject(), is(nullValue())); - assertEquals(Session.class, factoryBean.getObjectType()); + assertThat(factoryBean.getObject()).isNull(); + assertThat(factoryBean. getObjectType()).isEqualTo(Session.class); } @Test @@ -101,14 +97,14 @@ public class CassandraCqlSessionFactoryBeanUnitTests { factoryBean.setKeyspaceName("TestKeyspace"); factoryBean.setStartupScripts(expectedStartupScripts); - assertThat(factoryBean.getKeyspaceName(), is(equalTo("TestKeyspace"))); - assertThat(factoryBean.getStartupScripts(), is(equalTo(expectedStartupScripts))); + assertThat(factoryBean.getKeyspaceName()).isEqualTo("TestKeyspace"); + assertThat(factoryBean.getStartupScripts()).isEqualTo(expectedStartupScripts); factoryBean.afterPropertiesSet(); - assertEquals(mockSession.getClass(), factoryBean.getObjectType()); - assertThat(factoryBean.getObject(), is(equalTo(mockSession))); - assertThat(factoryBean.getSession(), is(equalTo(mockSession))); + assertThat(factoryBean.getObjectType()).isEqualTo(mockSession.getClass()); + assertThat(factoryBean.getObject()).isEqualTo(mockSession); + assertThat(factoryBean.getSession()).isEqualTo(mockSession); InOrder inOrder = inOrder(factoryBean); @@ -125,7 +121,7 @@ public class CassandraCqlSessionFactoryBeanUnitTests { factoryBean.setCluster(mockCluster); - assertThat(factoryBean.connect(null), is(equalTo(mockSession))); + assertThat(factoryBean.connect(null)).isEqualTo(mockSession); verify(mockCluster, times(1)).connect(); verify(mockCluster, never()).connect(anyString()); @@ -137,7 +133,7 @@ public class CassandraCqlSessionFactoryBeanUnitTests { factoryBean.setCluster(mockCluster); - assertThat(factoryBean.connect("TestKeyspace"), is(equalTo(mockSession))); + assertThat(factoryBean.connect("TestKeyspace")).isEqualTo(mockSession); verify(mockCluster, never()).connect(); verify(mockCluster, times(1)).connect(eq("TestKeyspace")); @@ -165,15 +161,15 @@ public class CassandraCqlSessionFactoryBeanUnitTests { @Test public void isConnectedWithNullSessionIsFalse() { - assertThat(factoryBean.getObject(), is(nullValue())); - assertThat(factoryBean.isConnected(), is(false)); + assertThat(factoryBean.getObject()).isNull(); + assertThat(factoryBean.isConnected()).isFalse(); } @Test public void isConnectedWithClosedSessionIsFalse() { doReturn(mockSession).when(factoryBean).getObject(); when(mockSession.isClosed()).thenReturn(true); - assertThat(factoryBean.isConnected(), is(false)); + assertThat(factoryBean.isConnected()).isFalse(); verify(mockSession, times(1)).isClosed(); } @@ -181,56 +177,64 @@ public class CassandraCqlSessionFactoryBeanUnitTests { public void isConnectedWithOpenSessionIsTrue() { doReturn(mockSession).when(factoryBean).getObject(); when(mockSession.isClosed()).thenReturn(false); - assertThat(factoryBean.isConnected(), is(true)); + assertThat(factoryBean.isConnected()).isTrue(); verify(mockSession, times(1)).isClosed(); } @Test public void setAndGetCluster() { factoryBean.setCluster(mockCluster); - assertThat(factoryBean.getCluster(), is(equalTo(mockCluster))); + assertThat(factoryBean.getCluster()).isEqualTo(mockCluster); } @Test public void setClusterToNullThrowsIllegalArgumentException() { - exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage("Cluster must not be null"); - factoryBean.setCluster(null); + try { + factoryBean.setCluster(null); + fail("Missing IllegalArgumentException"); + } catch (IllegalArgumentException e) { + assertThat(e).hasMessageContaining("Cluster must not be null"); + } + } @Test public void getClusterWhenUninitializedThrowsIllegalStateException() { - exception.expect(IllegalStateException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage("Cluster was not properly initialized"); - factoryBean.getCluster(); + try { + factoryBean.getCluster(); + fail("Missing IllegalStateException"); + } catch (IllegalStateException e) { + assertThat(e).hasMessageContaining("Cluster was not properly initialized"); + } } @Test public void setAndGetKeyspaceName() { - assertThat(factoryBean.getKeyspaceName(), is(nullValue())); + assertThat(factoryBean.getKeyspaceName()).isNull(); factoryBean.setKeyspaceName("TEST"); - assertThat(factoryBean.getKeyspaceName(), is(equalTo("TEST"))); + assertThat(factoryBean.getKeyspaceName()).isEqualTo("TEST"); factoryBean.setKeyspaceName(null); - assertThat(factoryBean.getKeyspaceName(), is(nullValue())); + assertThat(factoryBean.getKeyspaceName()).isNull(); } @Test public void getSessionWhenUninitializedThrowsIllegalStateException() { - exception.expect(IllegalStateException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage(is(equalTo("Session was not properly initialized"))); - assertThat(factoryBean.getObject(), is(nullValue())); + assertThat(factoryBean.getObject()).isNull(); + + try { + factoryBean.getSession(); + fail("Missing IllegalStateException"); + } catch (IllegalStateException e) { + assertThat(e).hasMessageContaining("Session was not properly initialized"); + } - factoryBean.getSession(); } @Test @@ -243,8 +247,7 @@ public class CassandraCqlSessionFactoryBeanUnitTests { List actualStartupScripts = factoryBean.getStartupScripts(); - assertThat(actualStartupScripts, is(not(sameInstance(expectedStartupScripts)))); - assertThat(actualStartupScripts, is(equalTo(expectedStartupScripts))); + assertThat(actualStartupScripts).isNotSameAs(expectedStartupScripts).isEqualTo(expectedStartupScripts); factoryBean.setStartupScripts(null); @@ -259,23 +262,21 @@ public class CassandraCqlSessionFactoryBeanUnitTests { List actualStartupScripts = factoryBean.getStartupScripts(); - assertThat(actualStartupScripts, is(notNullValue())); - assertThat(actualStartupScripts, is(not(sameInstance(startupScripts)))); - assertThat(actualStartupScripts, is(equalTo(startupScripts))); + assertThat(actualStartupScripts).isEqualTo(startupScripts).isNotSameAs(startupScripts); startupScripts.add("/path/to/another.cql"); actualStartupScripts = factoryBean.getStartupScripts(); - assertThat(actualStartupScripts, is(not(equalTo(startupScripts)))); - assertThat(actualStartupScripts.size(), is(equalTo(1))); - assertThat(actualStartupScripts.get(0), is(equalTo(startupScripts.get(0)))); + assertThat(actualStartupScripts).isNotEqualTo(startupScripts); + assertThat(actualStartupScripts).hasSize(1); + assertThat(actualStartupScripts.get(0)).isEqualTo(startupScripts.get(0)); try { exception.expect(UnsupportedOperationException.class); actualStartupScripts.add("/path/to/yetAnother.cql"); } finally { - assertThat(actualStartupScripts.size(), is(equalTo(1))); + assertThat(actualStartupScripts).hasSize(1); } } @@ -289,8 +290,7 @@ public class CassandraCqlSessionFactoryBeanUnitTests { List actualShutdownScripts = factoryBean.getShutdownScripts(); - assertThat(actualShutdownScripts, is(not(sameInstance(expectedShutdownScripts)))); - assertThat(actualShutdownScripts, is(equalTo(expectedShutdownScripts))); + assertThat(actualShutdownScripts).isEqualTo(expectedShutdownScripts).isNotSameAs(expectedShutdownScripts); factoryBean.setShutdownScripts(null); @@ -305,23 +305,20 @@ public class CassandraCqlSessionFactoryBeanUnitTests { List actualShutdownScripts = factoryBean.getShutdownScripts(); - assertThat(actualShutdownScripts, is(notNullValue())); - assertThat(actualShutdownScripts, is(not(sameInstance(shutdownScripts)))); - assertThat(actualShutdownScripts, is(equalTo(shutdownScripts))); + assertThat(actualShutdownScripts).isEqualTo(shutdownScripts).isNotSameAs(shutdownScripts); shutdownScripts.add("/path/to/corruptSession.cql"); actualShutdownScripts = factoryBean.getShutdownScripts(); - assertThat(actualShutdownScripts, is(not(sameInstance(shutdownScripts)))); - assertThat(actualShutdownScripts, is(not(equalTo(shutdownScripts)))); - assertThat(actualShutdownScripts.size(), is(equalTo(1))); + assertThat(actualShutdownScripts).isNotEqualTo(shutdownScripts); + assertThat(actualShutdownScripts).hasSize(1); try { exception.expect(UnsupportedOperationException.class); actualShutdownScripts.add("/path/to/blowUpCluster.cql"); } finally { - assertThat(actualShutdownScripts.size(), is(equalTo(1))); + assertThat(actualShutdownScripts).hasSize(1); } } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java old mode 100644 new mode 100755 index 4a0e65917..791a6fcc4 --- a/spring-cql/src/test/java/org/springframework/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java @@ -15,15 +15,14 @@ */ package org.springframework.cassandra.config; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import static org.junit.Assume.assumeNotNull; +import static org.assertj.core.api.Assertions.*; +import static org.junit.Assume.*; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.same; -import static org.springframework.util.ReflectionUtils.invokeMethod; +import static org.springframework.util.ReflectionUtils.*; import java.lang.reflect.Method; import java.util.concurrent.Executor; @@ -36,10 +35,10 @@ import org.mockito.Spy; import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; +import org.springframework.util.ReflectionUtils; import com.datastax.driver.core.HostDistance; import com.datastax.driver.core.PoolingOptions; -import org.springframework.util.ReflectionUtils; /** * Unit tests for {@link PoolingOptionsFactoryBean}. @@ -66,18 +65,18 @@ public class PoolingOptionsFactoryBeanUnitTests { @Test public void getObjectReturnsNullWhenNotInitialized() throws Exception { - assertThat(poolingOptionsFactoryBean.getObject(), is(nullValue(PoolingOptions.class))); + assertThat(poolingOptionsFactoryBean.getObject()).isNull(); } @Test @SuppressWarnings("unchecked") public void getObjectTypeReturnsPoolingOptionsClassWhenNotInitialized() { - assertThat((Class) poolingOptionsFactoryBean.getObjectType(), is(equalTo(PoolingOptions.class))); + assertThat((Class) poolingOptionsFactoryBean.getObjectType()).isEqualTo(PoolingOptions.class); } @Test public void isSingletonIsTrue() { - assertThat(poolingOptionsFactoryBean.isSingleton(), is(true)); + assertThat(poolingOptionsFactoryBean.isSingleton()).isTrue(); } /** @@ -100,18 +99,18 @@ public class PoolingOptionsFactoryBeanUnitTests { poolingOptionsFactoryBean.setRemoteMaxSimultaneousRequests(100); poolingOptionsFactoryBean.setRemoteMinSimultaneousRequests(50); - assertThat(poolingOptionsFactoryBean.getHeartbeatIntervalSeconds(), is(equalTo(15))); - assertThat(poolingOptionsFactoryBean.getIdleTimeoutSeconds(), is(equalTo(120))); - assertThat(poolingOptionsFactoryBean.getInitializationExecutor(), is(equalTo(mockExecutor))); - assertThat(poolingOptionsFactoryBean.getLocalCoreConnections(), is(equalTo(50))); - assertThat(poolingOptionsFactoryBean.getLocalMaxConnections(), is(equalTo(1000))); - assertThat(poolingOptionsFactoryBean.getLocalMaxSimultaneousRequests(), is(equalTo(200))); - assertThat(poolingOptionsFactoryBean.getLocalMinSimultaneousRequests(), is(equalTo(100))); - assertThat(poolingOptionsFactoryBean.getPoolTimeoutMilliseconds(), is(equalTo(300))); - assertThat(poolingOptionsFactoryBean.getRemoteCoreConnections(), is(equalTo(25))); - assertThat(poolingOptionsFactoryBean.getRemoteMaxConnections(), is(equalTo(250))); - assertThat(poolingOptionsFactoryBean.getRemoteMaxSimultaneousRequests(), is(equalTo(100))); - assertThat(poolingOptionsFactoryBean.getRemoteMinSimultaneousRequests(), is(equalTo(50))); + assertThat(poolingOptionsFactoryBean.getHeartbeatIntervalSeconds()).isEqualTo(15); + assertThat(poolingOptionsFactoryBean.getIdleTimeoutSeconds()).isEqualTo(120); + assertThat(poolingOptionsFactoryBean.getInitializationExecutor()).isEqualTo(mockExecutor); + assertThat(poolingOptionsFactoryBean.getLocalCoreConnections()).isEqualTo(50); + assertThat(poolingOptionsFactoryBean.getLocalMaxConnections()).isEqualTo(1000); + assertThat(poolingOptionsFactoryBean.getLocalMaxSimultaneousRequests()).isEqualTo(200); + assertThat(poolingOptionsFactoryBean.getLocalMinSimultaneousRequests()).isEqualTo(100); + assertThat(poolingOptionsFactoryBean.getPoolTimeoutMilliseconds()).isEqualTo(300); + assertThat(poolingOptionsFactoryBean.getRemoteCoreConnections()).isEqualTo(25); + assertThat(poolingOptionsFactoryBean.getRemoteMaxConnections()).isEqualTo(250); + assertThat(poolingOptionsFactoryBean.getRemoteMaxSimultaneousRequests()).isEqualTo(100); + assertThat(poolingOptionsFactoryBean.getRemoteMinSimultaneousRequests()).isEqualTo(50); } /** @@ -137,12 +136,12 @@ public class PoolingOptionsFactoryBeanUnitTests { poolingOptionsFactoryBean.setLocalMinSimultaneousRequests(5); poolingOptionsFactoryBean.setPoolTimeoutMilliseconds(180); - assertThat(poolingOptionsFactoryBean.getObject(), is(nullValue(PoolingOptions.class))); + assertThat(poolingOptionsFactoryBean.getObject()).isNull(); poolingOptionsFactoryBean.afterPropertiesSet(); - assertThat(poolingOptionsFactoryBean.getObject(), is(sameInstance(poolingOptionsSpy))); - assertThat(poolingOptionsFactoryBean.getObjectType(), is(equalTo((Class) poolingOptionsSpy.getClass()))); + assertThat(poolingOptionsFactoryBean.getObject()).isSameAs(poolingOptionsSpy); + assertThat(poolingOptionsFactoryBean.getObjectType()).isEqualTo(poolingOptionsSpy.getClass()); verify(poolingOptionsSpy).setHeartbeatIntervalSeconds(eq(60)); verify(poolingOptionsSpy).setIdleTimeoutSeconds(eq(300)); @@ -181,12 +180,12 @@ public class PoolingOptionsFactoryBeanUnitTests { poolingOptionsFactoryBean.setRemoteMaxSimultaneousRequests(20); poolingOptionsFactoryBean.setRemoteMinSimultaneousRequests(5); - assertThat(poolingOptionsFactoryBean.getObject(), is(nullValue(PoolingOptions.class))); + assertThat(poolingOptionsFactoryBean.getObject()).isNull(); poolingOptionsFactoryBean.afterPropertiesSet(); - assertThat(poolingOptionsFactoryBean.getObject(), is(sameInstance(poolingOptionsSpy))); - assertThat(poolingOptionsFactoryBean.getObjectType(), is(equalTo((Class) poolingOptionsSpy.getClass()))); + assertThat(poolingOptionsFactoryBean.getObject()).isSameAs(poolingOptionsSpy); + assertThat(poolingOptionsFactoryBean.getObjectType()).isEqualTo(poolingOptionsSpy.getClass()); verify(poolingOptionsSpy).setHeartbeatIntervalSeconds(eq(33)); verify(poolingOptionsSpy).setIdleTimeoutSeconds(eq(112)); @@ -208,11 +207,9 @@ public class PoolingOptionsFactoryBeanUnitTests { @Test public void afterPropertiesSetInitializesMaxQueueSize() throws Exception { - Method setMaxQueueSize = ReflectionUtils - .findMethod(PoolingOptions.class, "setMaxQueueSize", int.class); + Method setMaxQueueSize = ReflectionUtils.findMethod(PoolingOptions.class, "setMaxQueueSize", int.class); - Method getMaxQueueSize = ReflectionUtils - .findMethod(PoolingOptions.class, "getMaxQueueSize"); + Method getMaxQueueSize = ReflectionUtils.findMethod(PoolingOptions.class, "getMaxQueueSize"); assumeNotNull(setMaxQueueSize); @@ -227,9 +224,9 @@ public class PoolingOptionsFactoryBeanUnitTests { poolingOptionsFactoryBean.afterPropertiesSet(); - assertThat(poolingOptionsFactoryBean.getObject(), is(sameInstance(poolingOptionsSpy))); - assertThat(poolingOptionsFactoryBean.getObjectType(), is(equalTo((Class) poolingOptionsSpy.getClass()))); - assertThat(invokeMethod(getMaxQueueSize, poolingOptionsSpy), is(equalTo((Object) 1234))); + assertThat(poolingOptionsFactoryBean.getObject()).isSameAs(poolingOptionsSpy); + assertThat(poolingOptionsFactoryBean.getObjectType()).isEqualTo(poolingOptionsSpy.getClass()); + assertThat(invokeMethod(getMaxQueueSize, poolingOptionsSpy)).isEqualTo(1234); } /** @@ -260,21 +257,21 @@ public class PoolingOptionsFactoryBeanUnitTests { poolingOptionsFactoryBean.setRemoteMaxSimultaneousRequests(127); poolingOptionsFactoryBean.setRemoteMinSimultaneousRequests(111); - assertThat(poolingOptionsFactoryBean.getObject(), is(nullValue(PoolingOptions.class))); + assertThat(poolingOptionsFactoryBean.getObject()).isNull(); poolingOptionsFactoryBean.afterPropertiesSet(); PoolingOptions poolingOptions = poolingOptionsFactoryBean.getObject(); - assertThat(poolingOptions, is(notNullValue(PoolingOptions.class))); - assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.LOCAL), is(equalTo(100))); - assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.LOCAL), is(equalTo(200))); - assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.LOCAL), is(equalTo(99))); - assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.LOCAL), is(equalTo(97))); - assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.REMOTE), is(equalTo(110))); - assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.REMOTE), is(equalTo(210))); - assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.REMOTE), is(equalTo(127))); - assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.REMOTE), is(equalTo(111))); + assertThat(poolingOptions).isNotNull(); + assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.LOCAL)).isEqualTo(100); + assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.LOCAL)).isEqualTo(200); + assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.LOCAL)).isEqualTo(99); + assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.LOCAL)).isEqualTo(97); + assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.REMOTE)).isEqualTo(110); + assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.REMOTE)).isEqualTo(210); + assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.REMOTE)).isEqualTo(127); + assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.REMOTE)).isEqualTo(111); verify(poolingOptions).setMaxConnectionsPerHost(eq(HostDistance.LOCAL), eq(200)); verify(poolingOptions).setCoreConnectionsPerHost(eq(HostDistance.LOCAL), eq(100)); @@ -304,11 +301,11 @@ public class PoolingOptionsFactoryBeanUnitTests { PoolingOptionsFactoryBean.HostDistancePoolingOptions poolingOptions = poolingOptionsFactoryBean .newLocalHostDistancePoolingOptions(); - assertThat(poolingOptions.getHostDistance(), is(equalTo(HostDistance.LOCAL))); - assertThat(poolingOptions.getCoreConnectionsPerHost(), is(equalTo(50))); - assertThat(poolingOptions.getMaxConnectionsPerHost(), is(equalTo(500))); - assertThat(poolingOptions.getMaxRequestsPerConnection(), is(equalTo(1000))); - assertThat(poolingOptions.getNewConnectionThreshold(), is(equalTo(100))); + assertThat(poolingOptions.getHostDistance()).isEqualTo(HostDistance.LOCAL); + assertThat(poolingOptions.getCoreConnectionsPerHost()).isEqualTo(50); + assertThat(poolingOptions.getMaxConnectionsPerHost()).isEqualTo(500); + assertThat(poolingOptions.getMaxRequestsPerConnection()).isEqualTo(1000); + assertThat(poolingOptions.getNewConnectionThreshold()).isEqualTo(100); } /** @@ -329,11 +326,11 @@ public class PoolingOptionsFactoryBeanUnitTests { PoolingOptionsFactoryBean.HostDistancePoolingOptions poolingOptions = poolingOptionsFactoryBean .newRemoteHostDistancePoolingOptions(); - assertThat(poolingOptions.getHostDistance(), is(equalTo(HostDistance.REMOTE))); - assertThat(poolingOptions.getCoreConnectionsPerHost(), is(equalTo(20))); - assertThat(poolingOptions.getMaxConnectionsPerHost(), is(equalTo(200))); - assertThat(poolingOptions.getMaxRequestsPerConnection(), is(equalTo(400))); - assertThat(poolingOptions.getNewConnectionThreshold(), is(equalTo(40))); + assertThat(poolingOptions.getHostDistance()).isEqualTo(HostDistance.REMOTE); + assertThat(poolingOptions.getCoreConnectionsPerHost()).isEqualTo(20); + assertThat(poolingOptions.getMaxConnectionsPerHost()).isEqualTo(200); + assertThat(poolingOptions.getMaxRequestsPerConnection()).isEqualTo(400); + assertThat(poolingOptions.getNewConnectionThreshold()).isEqualTo(40); } /** @@ -359,8 +356,8 @@ public class PoolingOptionsFactoryBeanUnitTests { } }; - assertThat(poolingOptionsFactoryBean.configureLocalHostDistancePoolingOptions(poolingOptionsSpy), - is(sameInstance(poolingOptionsSpy))); + assertThat(poolingOptionsFactoryBean.configureLocalHostDistancePoolingOptions(poolingOptionsSpy)) + .isSameAs(poolingOptionsSpy); verify(mockHostDistancePoolingOptions).configure(same(poolingOptionsSpy)); } @@ -388,8 +385,8 @@ public class PoolingOptionsFactoryBeanUnitTests { } }; - assertThat(poolingOptionsFactoryBean.configureRemoteHostDistancePoolingOptions(poolingOptionsSpy), - is(sameInstance(poolingOptionsSpy))); + assertThat(poolingOptionsFactoryBean.configureRemoteHostDistancePoolingOptions(poolingOptionsSpy)) + .isSameAs(poolingOptionsSpy); verify(mockHostDistancePoolingOptions).configure(same(poolingOptionsSpy)); } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/java/AbstractClusterConfigurationUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/config/java/AbstractClusterConfigurationUnitTests.java old mode 100644 new mode 100755 index a31cd924d..d8db161c5 --- a/spring-cql/src/test/java/org/springframework/cassandra/config/java/AbstractClusterConfigurationUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/config/java/AbstractClusterConfigurationUnitTests.java @@ -16,9 +16,7 @@ package org.springframework.cassandra.config.java; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; -import static org.mockito.Mockito.isA; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Collections; @@ -30,19 +28,9 @@ import org.springframework.cassandra.config.ClusterBuilderConfigurer; import org.springframework.cassandra.config.CompressionType; import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification; import org.springframework.cassandra.core.keyspace.DropKeyspaceSpecification; -import org.springframework.test.util.ReflectionTestUtils; -import com.datastax.driver.core.AuthProvider; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Configuration; -import com.datastax.driver.core.PlainTextAuthProvider; -import com.datastax.driver.core.PoolingOptions; -import com.datastax.driver.core.ProtocolOptions; +import com.datastax.driver.core.*; import com.datastax.driver.core.ProtocolOptions.Compression; -import com.datastax.driver.core.ProtocolVersion; -import com.datastax.driver.core.QueryOptions; -import com.datastax.driver.core.SocketOptions; -import com.datastax.driver.core.TimestampGenerator; import com.datastax.driver.core.policies.AddressTranslator; import com.datastax.driver.core.policies.ExponentialReconnectionPolicy; import com.datastax.driver.core.policies.LoadBalancingPolicy; @@ -74,10 +62,10 @@ public class AbstractClusterConfigurationUnitTests { AbstractClusterConfiguration clusterConfiguration = new AbstractClusterConfiguration() {}; Cluster cluster = getCluster(clusterConfiguration); - assertThat(cluster, is(not(nullValue()))); - assertThat(cluster.isClosed(), is(false)); - assertThat(getConfiguration(cluster).getMetricsOptions(), is(not(nullValue()))); - assertThat(getConfiguration(cluster).getMetricsOptions().isJMXReportingEnabled(), is(true)); + assertThat(cluster).isNotNull(); + assertThat(cluster.isClosed()).isFalse(); + assertThat(getConfiguration(cluster).getMetricsOptions()).isNotNull(); + assertThat(getConfiguration(cluster).getMetricsOptions().isJMXReportingEnabled()).isTrue(); } /** @@ -97,7 +85,7 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(getConfiguration(cluster).getProtocolOptions().getCompression(), is(Compression.SNAPPY)); + assertThat(getConfiguration(cluster).getProtocolOptions().getCompression()).isEqualTo(Compression.SNAPPY); } /** @@ -117,7 +105,7 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(getConfiguration(cluster).getPoolingOptions(), is(poolingOptions)); + assertThat(getConfiguration(cluster).getPoolingOptions()).isEqualTo(poolingOptions); } /** @@ -137,7 +125,7 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(getConfiguration(cluster).getSocketOptions(), is(socketOptions)); + assertThat(getConfiguration(cluster).getSocketOptions()).isEqualTo(socketOptions); } /** @@ -157,7 +145,7 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(getConfiguration(cluster).getQueryOptions(), is(queryOptions)); + assertThat(getConfiguration(cluster).getQueryOptions()).isEqualTo(queryOptions); } /** @@ -177,7 +165,7 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(getConfiguration(cluster).getProtocolOptions().getAuthProvider(), is(authProvider)); + assertThat(getConfiguration(cluster).getProtocolOptions().getAuthProvider()).isEqualTo(authProvider); } /** @@ -197,7 +185,7 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(getPolicies(cluster).getLoadBalancingPolicy(), is(loadBalancingPolicy)); + assertThat(getConfiguration(cluster).getPolicies().getLoadBalancingPolicy()).isEqualTo(loadBalancingPolicy); } /** @@ -217,7 +205,7 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(getPolicies(cluster).getReconnectionPolicy(), is(reconnectionPolicy)); + assertThat(getConfiguration(cluster).getPolicies().getReconnectionPolicy()).isEqualTo(reconnectionPolicy); } /** @@ -235,8 +223,8 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(ReflectionTestUtils.getField(getConfiguration(cluster).getProtocolOptions(), "initialProtocolVersion"), - is((Object) ProtocolVersion.V2)); + assertThat(getConfiguration(cluster).getProtocolOptions()).extracting("initialProtocolVersion") + .contains(ProtocolVersion.V2); } /** @@ -254,7 +242,7 @@ public class AbstractClusterConfigurationUnitTests { }; Cluster cluster = getCluster(clusterConfiguration); - assertThat(getConfiguration(cluster).getMetricsOptions().isEnabled(), is(false)); + assertThat(getConfiguration(cluster).getMetricsOptions().isEnabled()).isFalse(); } /** @@ -272,7 +260,7 @@ public class AbstractClusterConfigurationUnitTests { } }; - assertThat(clusterConfiguration.cluster().getKeyspaceCreations(), is(equalTo(specification))); + assertThat(clusterConfiguration.cluster().getKeyspaceCreations()).isEqualTo(specification); } /** @@ -290,7 +278,7 @@ public class AbstractClusterConfigurationUnitTests { } }; - assertThat(clusterConfiguration.cluster().getKeyspaceDrops(), is(equalTo(specification))); + assertThat(clusterConfiguration.cluster().getKeyspaceDrops()).isEqualTo(specification); } /** @@ -307,7 +295,7 @@ public class AbstractClusterConfigurationUnitTests { } }; - assertThat(clusterConfiguration.cluster().getStartupScripts(), is(equalTo(scripts))); + assertThat(clusterConfiguration.cluster().getStartupScripts()).isEqualTo(scripts); } /** @@ -324,7 +312,7 @@ public class AbstractClusterConfigurationUnitTests { } }; - assertThat(clusterConfiguration.cluster().getShutdownScripts(), is(equalTo(scripts))); + assertThat(clusterConfiguration.cluster().getShutdownScripts()).isEqualTo(scripts); } /** @@ -332,17 +320,17 @@ public class AbstractClusterConfigurationUnitTests { */ @Test public void shouldSetAddressTranslator() throws Exception { - + final AddressTranslator mockAddressTranslator = mock(AddressTranslator.class); AbstractClusterConfiguration clusterConfiguration = new AbstractClusterConfiguration() { - @Override protected AddressTranslator getAddressTranslator() { + @Override + protected AddressTranslator getAddressTranslator() { return mockAddressTranslator; } }; - assertThat(getPolicies(getCluster(clusterConfiguration)).getAddressTranslator(), - is(equalTo(mockAddressTranslator))); + assertThat(getPolicies(getCluster(clusterConfiguration)).getAddressTranslator()).isEqualTo(mockAddressTranslator); } /** @@ -350,17 +338,17 @@ public class AbstractClusterConfigurationUnitTests { */ @Test public void shouldSetAndApplyClusterBuilderConfigurer() throws Exception { - + final ClusterBuilderConfigurer mockClusterBuilderConfigurer = mock(ClusterBuilderConfigurer.class); AbstractClusterConfiguration clusterConfiguration = new AbstractClusterConfiguration() { - @Override protected ClusterBuilderConfigurer getClusterBuilderConfigurer() { + @Override + protected ClusterBuilderConfigurer getClusterBuilderConfigurer() { return mockClusterBuilderConfigurer; } }; - assertThat(getCluster(clusterConfiguration), is(notNullValue(Cluster.class))); - + assertThat(getCluster(clusterConfiguration)).isNotNull(); verify(mockClusterBuilderConfigurer, times(1)).configure(isA(Cluster.Builder.class)); } @@ -370,14 +358,15 @@ public class AbstractClusterConfigurationUnitTests { */ @Test public void shouldSetClusterName() throws Exception { - + AbstractClusterConfiguration clusterConfiguration = new AbstractClusterConfiguration() { - @Override protected String getClusterName() { + @Override + protected String getClusterName() { return "testCluster"; } }; - assertThat(getCluster(clusterConfiguration).getClusterName(), is(equalTo("testCluster"))); + assertThat(getCluster(clusterConfiguration).getClusterName()).isEqualTo("testCluster"); } /** @@ -385,15 +374,15 @@ public class AbstractClusterConfigurationUnitTests { */ @Test public void shouldSetMaxSchemaAgreementWaitInSeconds() throws Exception { - + AbstractClusterConfiguration clusterConfiguration = new AbstractClusterConfiguration() { - @Override protected int getMaxSchemaAgreementWaitSeconds() { + @Override + protected int getMaxSchemaAgreementWaitSeconds() { return 30; } }; - assertThat(getProtocolOptions(getCluster(clusterConfiguration)).getMaxSchemaAgreementWaitSeconds(), - is(equalTo(30))); + assertThat(getProtocolOptions(getCluster(clusterConfiguration)).getMaxSchemaAgreementWaitSeconds()).isEqualTo(30); } /** @@ -401,17 +390,18 @@ public class AbstractClusterConfigurationUnitTests { */ @Test public void shouldSetSpeculativeExecutionPolicy() throws Exception { - + final SpeculativeExecutionPolicy mockSpeculativeExecutionPolicy = mock(SpeculativeExecutionPolicy.class); AbstractClusterConfiguration clusterConfiguration = new AbstractClusterConfiguration() { - @Override protected SpeculativeExecutionPolicy getSpeculativeExecutionPolicy() { + @Override + protected SpeculativeExecutionPolicy getSpeculativeExecutionPolicy() { return mockSpeculativeExecutionPolicy; } }; - assertThat(getPolicies(getCluster(clusterConfiguration)).getSpeculativeExecutionPolicy(), - is(equalTo(mockSpeculativeExecutionPolicy))); + assertThat(getPolicies(getCluster(clusterConfiguration)).getSpeculativeExecutionPolicy()) + .isEqualTo(mockSpeculativeExecutionPolicy); } /** @@ -419,17 +409,17 @@ public class AbstractClusterConfigurationUnitTests { */ @Test public void shouldSetTimestampGenerator() throws Exception { - + final TimestampGenerator mockTimestampGenerator = mock(TimestampGenerator.class); AbstractClusterConfiguration clusterConfiguration = new AbstractClusterConfiguration() { - @Override protected TimestampGenerator getTimestampGenerator() { + @Override + protected TimestampGenerator getTimestampGenerator() { return mockTimestampGenerator; } }; - assertThat(getPolicies(getCluster(clusterConfiguration)).getTimestampGenerator(), - is(equalTo(mockTimestampGenerator))); + assertThat(getPolicies(getCluster(clusterConfiguration)).getTimestampGenerator()).isEqualTo(mockTimestampGenerator); } private Policies getPolicies(Cluster cluster) { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParserUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParserUnitTests.java old mode 100644 new mode 100755 index 8e1e4fe0e..f298672e3 --- a/spring-cql/src/test/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParserUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParserUnitTests.java @@ -15,9 +15,7 @@ */ package org.springframework.cassandra.config.xml; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.cassandra.support.BeanDefinitionTestUtils.*; @@ -62,7 +60,7 @@ public class CassandraCqlClusterParserUnitTests { when(mockElement.getAttribute(eq(CassandraCqlClusterParser.ID_ATTRIBUTE))).thenReturn("test"); - assertThat(parser.resolveId(mockElement, null, null), is(equalTo("test"))); + assertThat(parser.resolveId(mockElement, null, null)).isEqualTo("test"); verify(mockElement).getAttribute(eq(CassandraCqlClusterParser.ID_ATTRIBUTE)); } @@ -74,7 +72,7 @@ public class CassandraCqlClusterParserUnitTests { when(mockElement.getAttribute(eq(CassandraCqlClusterParser.ID_ATTRIBUTE))).thenReturn(""); - assertThat(parser.resolveId(mockElement, null, null), is(equalTo(DefaultCqlBeanNames.CLUSTER))); + assertThat(parser.resolveId(mockElement, null, null)).isEqualTo(DefaultCqlBeanNames.CLUSTER); verify(mockElement).getAttribute(eq(CassandraCqlClusterParser.ID_ATTRIBUTE)); } @@ -112,41 +110,41 @@ public class CassandraCqlClusterParserUnitTests { CassandraCqlClusterParser parser = new CassandraCqlClusterParser() { @Override - protected void parseChildElements(Element element, ParserContext parserContext, - BeanDefinitionBuilder builder) { - } + protected void parseChildElements(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {} }; - AbstractBeanDefinition beanDefinition = parser.parseInternal(mockElement, mockParserContext( - mockContainingBeanDefinition)); + AbstractBeanDefinition beanDefinition = parser.parseInternal(mockElement, + mockParserContext(mockContainingBeanDefinition)); - assertThat(beanDefinition, is(notNullValue(BeanDefinition.class))); - assertThat(beanDefinition.getBeanClassName(), is(equalTo(CassandraCqlClusterFactoryBean.class.getName()))); - assertThat(beanDefinition.getDestroyMethodName(), is(equalTo("destroy"))); - assertThat((Element) beanDefinition.getSource(), is(equalTo(mockElement))); - assertThat(beanDefinition.isLazyInit(), is(false)); - assertThat(getPropertyValueAsString(beanDefinition, "addressTranslator"), is(equalTo("testAddressTranslator"))); - assertThat(getPropertyValueAsString(beanDefinition, "authProvider"), is(equalTo("testAuthInfoProvider"))); - assertThat(getPropertyValueAsString(beanDefinition, "clusterBuilderConfigurer"), is(equalTo("testClusterBuilderConfigurer"))); - assertThat(getPropertyValueAsString(beanDefinition, "hostStateListener"), is(equalTo("testHostStateListener"))); - assertThat(getPropertyValueAsString(beanDefinition, "latencyTracker"), is(equalTo("testLatencyTracker"))); - assertThat(getPropertyValueAsString(beanDefinition, "loadBalancingPolicy"), is(equalTo("testLoadBalancingPolicy"))); - assertThat(getPropertyValueAsString(beanDefinition, "nettyOptions"), is(equalTo("testNettyOptions"))); - assertThat(getPropertyValueAsString(beanDefinition, "reconnectionPolicy"), is(equalTo("testReconnectionPolicy"))); - assertThat(getPropertyValueAsString(beanDefinition, "retryPolicy"), is(equalTo("testRetryPolicy"))); - assertThat(getPropertyValueAsString(beanDefinition, "speculativeExecutionPolicy"), is(equalTo("testSpeculativeExecutionPolicy"))); - assertThat(getPropertyValueAsString(beanDefinition, "sslOptions"), is(equalTo("testSslOptions"))); - assertThat(getPropertyValueAsString(beanDefinition, "timestampGenerator"), is(equalTo("testTimestampGenerator"))); - assertThat(getPropertyValueAsString(beanDefinition, "clusterName"), is(equalTo("testCluster"))); - assertThat(getPropertyValueAsString(beanDefinition, "contactPoints"), is(equalTo("skullbox"))); - assertThat(getPropertyValueAsString(beanDefinition, "compressionType"), is(equalTo("SNAPPY"))); - assertThat(getPropertyValueAsString(beanDefinition, "jmxReportingEnabled"), is(equalTo("true"))); - assertThat(getPropertyValueAsString(beanDefinition, "maxSchemaAgreementWaitSeconds"), is(equalTo("30"))); - assertThat(getPropertyValueAsString(beanDefinition, "metricsEnabled"), is(equalTo("true"))); - assertThat(getPropertyValueAsString(beanDefinition, "password"), is(equalTo("p@55w0rd"))); - assertThat(getPropertyValueAsString(beanDefinition, "port"), is(equalTo("12345"))); - assertThat(getPropertyValueAsString(beanDefinition, "sslEnabled"), is(equalTo("true"))); - assertThat(getPropertyValueAsString(beanDefinition, "username"), is(equalTo("jonDoe"))); + assertThat(beanDefinition).isNotNull(); + assertThat(beanDefinition.getBeanClassName()).isEqualTo(CassandraCqlClusterFactoryBean.class.getName()); + assertThat(beanDefinition.getDestroyMethodName()).isEqualTo("destroy"); + assertThat((Element) beanDefinition.getSource()).isEqualTo(mockElement); + assertThat(beanDefinition.isLazyInit()).isFalse(); + assertThat(getPropertyValueAsString(beanDefinition, "addressTranslator")).isEqualTo("testAddressTranslator"); + assertThat(getPropertyValueAsString(beanDefinition, "authProvider")).isEqualTo("testAuthInfoProvider"); + assertThat(getPropertyValueAsString(beanDefinition, "clusterBuilderConfigurer")) + .isEqualTo("testClusterBuilderConfigurer"); + assertThat(getPropertyValueAsString(beanDefinition, "hostStateListener")).isEqualTo("testHostStateListener"); + assertThat(getPropertyValueAsString(beanDefinition, "latencyTracker")).isEqualTo("testLatencyTracker"); + assertThat(getPropertyValueAsString(beanDefinition, "loadBalancingPolicy")).isEqualTo("testLoadBalancingPolicy"); + assertThat(getPropertyValueAsString(beanDefinition, "nettyOptions")).isEqualTo("testNettyOptions"); + assertThat(getPropertyValueAsString(beanDefinition, "reconnectionPolicy")).isEqualTo("testReconnectionPolicy"); + assertThat(getPropertyValueAsString(beanDefinition, "retryPolicy")).isEqualTo("testRetryPolicy"); + assertThat(getPropertyValueAsString(beanDefinition, "speculativeExecutionPolicy")) + .isEqualTo("testSpeculativeExecutionPolicy"); + assertThat(getPropertyValueAsString(beanDefinition, "sslOptions")).isEqualTo("testSslOptions"); + assertThat(getPropertyValueAsString(beanDefinition, "timestampGenerator")).isEqualTo("testTimestampGenerator"); + assertThat(getPropertyValueAsString(beanDefinition, "clusterName")).isEqualTo("testCluster"); + assertThat(getPropertyValueAsString(beanDefinition, "contactPoints")).isEqualTo("skullbox"); + assertThat(getPropertyValueAsString(beanDefinition, "compressionType")).isEqualTo("SNAPPY"); + assertThat(getPropertyValueAsString(beanDefinition, "jmxReportingEnabled")).isEqualTo("true"); + assertThat(getPropertyValueAsString(beanDefinition, "maxSchemaAgreementWaitSeconds")).isEqualTo("30"); + assertThat(getPropertyValueAsString(beanDefinition, "metricsEnabled")).isEqualTo("true"); + assertThat(getPropertyValueAsString(beanDefinition, "password")).isEqualTo("p@55w0rd"); + assertThat(getPropertyValueAsString(beanDefinition, "port")).isEqualTo("12345"); + assertThat(getPropertyValueAsString(beanDefinition, "sslEnabled")).isEqualTo("true"); + assertThat(getPropertyValueAsString(beanDefinition, "username")).isEqualTo("jonDoe"); verify(mockContainingBeanDefinition).getScope(); verify(mockElement).getAttribute(eq("address-translator-ref")); @@ -202,20 +200,21 @@ public class CassandraCqlClusterParserUnitTests { BeanDefinition poolingOptionsBeanDefinition = getPropertyValue(beanDefinition, "poolingOptions"); - assertThat(poolingOptionsBeanDefinition, is(notNullValue(BeanDefinition.class))); - assertThat(poolingOptionsBeanDefinition.getBeanClassName(), is(equalTo(PoolingOptionsFactoryBean.class.getName()))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "heartbeatIntervalSeconds"), is(equalTo("15"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "idleTimeoutSeconds"), is(equalTo("120"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "initializationExecutor"), is(equalTo("testExecutor"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "poolTimeoutMilliseconds"), is(equalTo("60000"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localCoreConnections"), is(equalTo("50"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMaxConnections"), is(equalTo("200"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMaxSimultaneousRequests"), is(equalTo("50"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMinSimultaneousRequests"), is(equalTo("5"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteCoreConnections"), is(nullValue())); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMaxConnections"), is(nullValue())); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMaxSimultaneousRequests"), is(nullValue())); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMinSimultaneousRequests"), is(nullValue())); + assertThat(poolingOptionsBeanDefinition).isNotNull(); + assertThat(poolingOptionsBeanDefinition.getBeanClassName()).isEqualTo(PoolingOptionsFactoryBean.class.getName()); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "heartbeatIntervalSeconds")).isEqualTo("15"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "idleTimeoutSeconds")).isEqualTo("120"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "initializationExecutor")) + .isEqualTo("testExecutor"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "poolTimeoutMilliseconds")).isEqualTo("60000"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localCoreConnections")).isEqualTo("50"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMaxConnections")).isEqualTo("200"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMaxSimultaneousRequests")).isEqualTo("50"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMinSimultaneousRequests")).isEqualTo("5"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteCoreConnections")).isNull(); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMaxConnections")).isNull(); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMaxSimultaneousRequests")).isNull(); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMinSimultaneousRequests")).isNull(); verify(mockElement).getChildNodes(); verify(mockElement).getAttribute(eq("heartbeat-interval-seconds")); @@ -258,22 +257,21 @@ public class CassandraCqlClusterParserUnitTests { BeanDefinition poolingOptionsBeanDefinition = getPropertyValue(beanDefinition, "poolingOptions"); - assertThat(poolingOptionsBeanDefinition, is(notNullValue(BeanDefinition.class))); - assertThat(poolingOptionsBeanDefinition.getBeanClassName(), is(equalTo(PoolingOptionsFactoryBean.class.getName()))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "heartbeatIntervalSeconds"), is(equalTo("15"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "idleTimeoutSeconds"), is(equalTo("120"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "initializationExecutor"), is(equalTo("testExecutor"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "poolTimeoutMilliseconds"), is(equalTo("60000"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localCoreConnections"), is(nullValue())); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMaxConnections"), is(nullValue())); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMaxSimultaneousRequests"), is(nullValue())); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMinSimultaneousRequests"), is(nullValue())); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteCoreConnections"), is(equalTo("50"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMaxConnections"), is(equalTo("200"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMaxSimultaneousRequests"), is(equalTo( - "50"))); - assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMinSimultaneousRequests"), is(equalTo( - "5"))); + assertThat(poolingOptionsBeanDefinition).isNotNull(); + assertThat(poolingOptionsBeanDefinition.getBeanClassName()).isEqualTo(PoolingOptionsFactoryBean.class.getName()); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "heartbeatIntervalSeconds")).isEqualTo("15"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "idleTimeoutSeconds")).isEqualTo("120"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "initializationExecutor")) + .isEqualTo("testExecutor"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "poolTimeoutMilliseconds")).isEqualTo("60000"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localCoreConnections")).isNull(); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMaxConnections")).isNull(); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMaxSimultaneousRequests")).isNull(); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "localMinSimultaneousRequests")).isNull(); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteCoreConnections")).isEqualTo("50"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMaxConnections")).isEqualTo("200"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMaxSimultaneousRequests")).isEqualTo("50"); + assertThat(getPropertyValueAsString(poolingOptionsBeanDefinition, "remoteMinSimultaneousRequests")).isEqualTo("5"); verify(mockElement).getChildNodes(); verify(mockElement).getAttribute(eq("heartbeat-interval-seconds")); @@ -307,8 +305,7 @@ public class CassandraCqlClusterParserUnitTests { when(mockShutdownCqlOne.getTextContent()).thenReturn("DROP KEYSPACE test;"); when(mockShutdownCqlTwo.getTextContent()).thenReturn("DROP USER jblum;"); - NodeList mockNodeList = mockNodeList(mockStartupCqlOne, mockStartupCqlTwo, - mockShutdownCqlOne, mockShutdownCqlTwo); + NodeList mockNodeList = mockNodeList(mockStartupCqlOne, mockStartupCqlTwo, mockShutdownCqlOne, mockShutdownCqlTwo); when(mockElement.getChildNodes()).thenReturn(mockNodeList); @@ -319,10 +316,10 @@ public class CassandraCqlClusterParserUnitTests { BeanDefinition beanDefinition = builder.getBeanDefinition(); List startupScripts = getPropertyValue(beanDefinition, "startupScripts"); - assertThat(startupScripts, contains("CREATE KEYSPACE test;", "CREATE TABLE test.table;")); + assertThat(startupScripts).contains("CREATE KEYSPACE test;", "CREATE TABLE test.table;"); List shutdownScripts = getPropertyValue(beanDefinition, "shutdownScripts"); - assertThat(shutdownScripts, contains("DROP KEYSPACE test;", "DROP USER jblum;")); + assertThat(shutdownScripts).contains("DROP KEYSPACE test;", "DROP USER jblum;"); } /** @@ -342,18 +339,18 @@ public class CassandraCqlClusterParserUnitTests { BeanDefinition beanDefinition = builder.getBeanDefinition(); - assertThat(getPropertyValueAsString(beanDefinition, "heartbeatIntervalSeconds"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "idleTimeoutSeconds"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "initializationExecutor"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "poolTimeoutMilliseconds"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "localCoreConnections"), is(equalTo("50"))); - assertThat(getPropertyValueAsString(beanDefinition, "localMaxConnections"), is(equalTo("200"))); - assertThat(getPropertyValueAsString(beanDefinition, "localMaxSimultaneousRequests"), is(equalTo("50"))); - assertThat(getPropertyValueAsString(beanDefinition, "localMinSimultaneousRequests"), is(equalTo("5"))); - assertThat(getPropertyValueAsString(beanDefinition, "remoteCoreConnections"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "remoteMaxConnections"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "remoteMaxSimultaneousRequests"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "remoteMinSimultaneousRequests"), is(nullValue())); + assertThat(getPropertyValueAsString(beanDefinition, "heartbeatIntervalSeconds")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "idleTimeoutSeconds")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "initializationExecutor")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "poolTimeoutMilliseconds")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "localCoreConnections")).isEqualTo("50"); + assertThat(getPropertyValueAsString(beanDefinition, "localMaxConnections")).isEqualTo("200"); + assertThat(getPropertyValueAsString(beanDefinition, "localMaxSimultaneousRequests")).isEqualTo("50"); + assertThat(getPropertyValueAsString(beanDefinition, "localMinSimultaneousRequests")).isEqualTo("5"); + assertThat(getPropertyValueAsString(beanDefinition, "remoteCoreConnections")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "remoteMaxConnections")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "remoteMaxSimultaneousRequests")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "remoteMinSimultaneousRequests")).isNull(); verify(mockElement, never()).getAttribute(eq("heartbeat-interval-seconds")); verify(mockElement, never()).getAttribute(eq("idle-timeout-seconds")); @@ -382,18 +379,18 @@ public class CassandraCqlClusterParserUnitTests { BeanDefinition beanDefinition = builder.getBeanDefinition(); - assertThat(getPropertyValueAsString(beanDefinition, "heartbeatIntervalSeconds"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "idleTimeoutSeconds"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "initializationExecutor"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "poolTimeoutMilliseconds"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "localCoreConnections"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "localMaxConnections"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "localMaxSimultaneousRequests"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "localMinSimultaneousRequests"), is(nullValue())); - assertThat(getPropertyValueAsString(beanDefinition, "remoteCoreConnections"), is(equalTo("50"))); - assertThat(getPropertyValueAsString(beanDefinition, "remoteMaxConnections"), is(equalTo("200"))); - assertThat(getPropertyValueAsString(beanDefinition, "remoteMaxSimultaneousRequests"), is(equalTo("50"))); - assertThat(getPropertyValueAsString(beanDefinition, "remoteMinSimultaneousRequests"), is(equalTo("5"))); + assertThat(getPropertyValueAsString(beanDefinition, "heartbeatIntervalSeconds")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "idleTimeoutSeconds")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "initializationExecutor")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "poolTimeoutMilliseconds")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "localCoreConnections")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "localMaxConnections")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "localMaxSimultaneousRequests")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "localMinSimultaneousRequests")).isNull(); + assertThat(getPropertyValueAsString(beanDefinition, "remoteCoreConnections")).isEqualTo("50"); + assertThat(getPropertyValueAsString(beanDefinition, "remoteMaxConnections")).isEqualTo("200"); + assertThat(getPropertyValueAsString(beanDefinition, "remoteMaxSimultaneousRequests")).isEqualTo("50"); + assertThat(getPropertyValueAsString(beanDefinition, "remoteMinSimultaneousRequests")).isEqualTo("5"); verify(mockElement, never()).getAttribute(eq("heartbeat-interval-seconds")); verify(mockElement, never()).getAttribute(eq("idle-timeout-seconds")); @@ -412,7 +409,7 @@ public class CassandraCqlClusterParserUnitTests { public void parseScript() { when(mockElement.getTextContent()).thenReturn("CREATE TABLE schema.table;"); - assertThat(parser.parseScript(mockElement), is(equalTo("CREATE TABLE schema.table;"))); + assertThat(parser.parseScript(mockElement)).isEqualTo("CREATE TABLE schema.table;"); verify(mockElement).getTextContent(); } @@ -433,17 +430,17 @@ public class CassandraCqlClusterParserUnitTests { BeanDefinition beanDefinition = parser.newSocketOptionsBeanDefinition(mockElement, mockParserContext(null)); - assertThat(beanDefinition, is(notNullValue(BeanDefinition.class))); - assertThat(beanDefinition.getBeanClassName(), is(equalTo(SocketOptionsFactoryBean.class.getName()))); - assertThat((Element) beanDefinition.getSource(), is(equalTo(mockElement))); - assertThat(getPropertyValueAsString(beanDefinition, "connectTimeoutMillis"), is(equalTo("15000"))); - assertThat(getPropertyValueAsString(beanDefinition, "keepAlive"), is(equalTo("true"))); - assertThat(getPropertyValueAsString(beanDefinition, "readTimeoutMillis"), is(equalTo("20000"))); - assertThat(getPropertyValueAsString(beanDefinition, "receiveBufferSize"), is(equalTo("32768"))); - assertThat(getPropertyValueAsString(beanDefinition, "reuseAddress"), is(equalTo("true"))); - assertThat(getPropertyValueAsString(beanDefinition, "sendBufferSize"), is(equalTo("16384"))); - assertThat(getPropertyValueAsString(beanDefinition, "soLinger"), is(equalTo("false"))); - assertThat(getPropertyValueAsString(beanDefinition, "tcpNoDelay"), is(equalTo("true"))); + assertThat(beanDefinition).isNotNull(); + assertThat(beanDefinition.getBeanClassName()).isEqualTo(SocketOptionsFactoryBean.class.getName()); + assertThat((Element) beanDefinition.getSource()).isEqualTo(mockElement); + assertThat(getPropertyValueAsString(beanDefinition, "connectTimeoutMillis")).isEqualTo("15000"); + assertThat(getPropertyValueAsString(beanDefinition, "keepAlive")).isEqualTo("true"); + assertThat(getPropertyValueAsString(beanDefinition, "readTimeoutMillis")).isEqualTo("20000"); + assertThat(getPropertyValueAsString(beanDefinition, "receiveBufferSize")).isEqualTo("32768"); + assertThat(getPropertyValueAsString(beanDefinition, "reuseAddress")).isEqualTo("true"); + assertThat(getPropertyValueAsString(beanDefinition, "sendBufferSize")).isEqualTo("16384"); + assertThat(getPropertyValueAsString(beanDefinition, "soLinger")).isEqualTo("false"); + assertThat(getPropertyValueAsString(beanDefinition, "tcpNoDelay")).isEqualTo("true"); verify(mockElement).getAttribute(eq("connect-timeout-millis")); verify(mockElement).getAttribute(eq("keep-alive")); @@ -470,7 +467,8 @@ public class CassandraCqlClusterParserUnitTests { private ParserContext mockParserContext(BeanDefinition beanDefinition) { - XmlReaderContext readerContext = new XmlReaderContext(null, null, null, new PassThroughSourceExtractor(), null, null); + XmlReaderContext readerContext = new XmlReaderContext(null, null, null, new PassThroughSourceExtractor(), null, + null); return new ParserContext(readerContext, new BeanDefinitionParserDelegate(readerContext), beanDefinition); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/xml/ParsingUtilsUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/config/xml/ParsingUtilsUnitTests.java old mode 100644 new mode 100755 index 563198b6b..2af0756ea --- a/spring-cql/src/test/java/org/springframework/cassandra/config/xml/ParsingUtilsUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/config/xml/ParsingUtilsUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.cassandra.config.xml; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.cassandra.support.BeanDefinitionTestUtils.*; import org.junit.Rule; @@ -48,8 +47,8 @@ public class ParsingUtilsUnitTests { RuntimeBeanReference propertyValue = getPropertyValue(builder.getBeanDefinition(), "referenceProperty"); - assertThat(propertyValue, is(notNullValue(RuntimeBeanReference.class))); - assertThat(propertyValue.getBeanName(), is(equalTo("defaultBeanReference"))); + assertThat(propertyValue).isNotNull(); + assertThat(propertyValue.getBeanName()).isEqualTo("defaultBeanReference"); } /** @@ -63,8 +62,8 @@ public class ParsingUtilsUnitTests { BeanDefinition beanDefinition = builder.getRawBeanDefinition(); - assertThat(beanDefinition.getPropertyValues().contains("referenceProperty"), is(false)); - assertThat(beanDefinition.getPropertyValues().isEmpty(), is(true)); + assertThat(beanDefinition.getPropertyValues().contains("referenceProperty")).isFalse(); + assertThat(beanDefinition.getPropertyValues().isEmpty()).isTrue(); } /** @@ -78,7 +77,7 @@ public class ParsingUtilsUnitTests { String propertyValue = getPropertyValue(builder.getBeanDefinition(), "valueProperty"); - assertThat(propertyValue, is(equalTo("defaultValue"))); + assertThat(propertyValue).isEqualTo("defaultValue"); } /** @@ -92,8 +91,8 @@ public class ParsingUtilsUnitTests { BeanDefinition beanDefinition = builder.getRawBeanDefinition(); - assertThat(beanDefinition.getPropertyValues().contains("valueProperty"), is(false)); - assertThat(beanDefinition.getPropertyValues().isEmpty(), is(true)); + assertThat(beanDefinition.getPropertyValues().contains("valueProperty")).isFalse(); + assertThat(beanDefinition.getPropertyValues().isEmpty()).isTrue(); } /** @@ -107,8 +106,8 @@ public class ParsingUtilsUnitTests { RuntimeBeanReference propertyValue = getPropertyValue(builder.getBeanDefinition(), "referenceProperty"); - assertThat(propertyValue, is(notNullValue(RuntimeBeanReference.class))); - assertThat(propertyValue.getBeanName(), is(equalTo("reference"))); + assertThat(propertyValue).isNotNull(); + assertThat(propertyValue.getBeanName()).isEqualTo("reference"); } /** @@ -118,7 +117,6 @@ public class ParsingUtilsUnitTests { public void addRequiredReferencePropertyWithNoReferenceFails() { exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); exception.expectMessage("value required for property reference [referenceProperty] on class [null]"); ParsingUtils.addProperty(BeanDefinitionBuilder.genericBeanDefinition(), "referenceProperty", null, @@ -136,7 +134,7 @@ public class ParsingUtilsUnitTests { String propertyValue = getPropertyValue(builder.getBeanDefinition(), "valueProperty"); - assertThat(propertyValue, is(equalTo("value"))); + assertThat(propertyValue).isEqualTo("value"); } /** @@ -146,7 +144,6 @@ public class ParsingUtilsUnitTests { public void addRequiredValuePropertyWithNoValueFails() { exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); exception.expectMessage("value required for property [valueProperty] on class [null]"); ParsingUtils.addProperty(BeanDefinitionBuilder.genericBeanDefinition(), "valueProperty", null, "defaultValue", true, @@ -160,7 +157,6 @@ public class ParsingUtilsUnitTests { public void addPropertyThrowsIllegalArgumentExceptionForNullBuilder() { exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); exception.expectMessage("BeanDefinitionBuilder must not be null"); ParsingUtils.addProperty(null, "propertyName", "value", "defaultValue", false, false); @@ -173,7 +169,6 @@ public class ParsingUtilsUnitTests { public void addPropertyThrowsIllegalArgumentExceptionForNullPropertyName() { exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); exception.expectMessage("Property name must not be null"); ParsingUtils.addProperty(BeanDefinitionBuilder.genericBeanDefinition(), null, "value", "defaultValue", false, true); diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/CachedPreparedStatementCreatorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/CachedPreparedStatementCreatorUnitTests.java old mode 100644 new mode 100755 index 46ca6b4a6..c66e3581c --- a/spring-cql/src/test/java/org/springframework/cassandra/core/CachedPreparedStatementCreatorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/CachedPreparedStatementCreatorUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.cassandra.core; import static edu.umd.cs.mtc.TestFramework.*; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.*; @@ -82,7 +81,7 @@ public class CachedPreparedStatementCreatorUnitTests { PreparedStatement result = cachedPreparedStatementCreator.createPreparedStatement(sessionMock); - assertThat(result, is(sameInstance(preparedStatement))); + assertThat(result).isSameAs(preparedStatement); verify(sessionMock).prepare("my cql"); } @@ -99,7 +98,7 @@ public class CachedPreparedStatementCreatorUnitTests { PreparedStatement result = cachedPreparedStatementCreator.createPreparedStatement(sessionMock); - assertThat(result, is(sameInstance(preparedStatement))); + assertThat(result).isSameAs(preparedStatement); verify(sessionMock, times(1)).prepare("my cql"); } @@ -150,7 +149,7 @@ public class CachedPreparedStatementCreatorUnitTests { preparedStatementCreator.createPreparedStatement(session); - assertThat(atomicInteger.get(), is(1)); + assertThat(atomicInteger.get()).isEqualTo(1); } public void thread2() { @@ -159,7 +158,7 @@ public class CachedPreparedStatementCreatorUnitTests { preparedStatementCreator.createPreparedStatement(session); - assertThat(atomicInteger.get(), is(1)); + assertThat(atomicInteger.get()).isEqualTo(1); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/ConsistencyLevelResolverUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/ConsistencyLevelResolverUnitTests.java index f567706e0..1ab994de0 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/ConsistencyLevelResolverUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/ConsistencyLevelResolverUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.core; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -86,6 +85,6 @@ public class ConsistencyLevelResolverUnitTests { */ @Test public void shouldResolveCorrectly() { - assertThat(ConsistencyLevelResolver.resolve(from), is(equalTo(expected))); + assertThat(ConsistencyLevelResolver.resolve(from)).isEqualTo(expected); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/CqlTemplateUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/CqlTemplateUnitTests.java old mode 100644 new mode 100755 index 48eb53036..250bd455d --- a/spring-cql/src/test/java/org/springframework/cassandra/core/CqlTemplateUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/CqlTemplateUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Iterator; @@ -93,7 +92,7 @@ public class CqlTemplateUnitTests { } }); - assertThat(result, is(equalTo("test"))); + assertThat(result).isEqualTo("test"); verify(mockSession, times(1)).execute(eq("test")); } @@ -119,16 +118,18 @@ public class CqlTemplateUnitTests { */ @Test public void doExecuteInSessionCallbackTranslatesToCassandraUncategorizedException() { - exception.expect(CassandraUncategorizedException.class); - exception.expectCause(org.hamcrest.Matchers.isA(DriverException.class)); - exception.expectMessage(containsString("test")); - template.doExecute(new SessionCallback() { - @Override - public String doInSession(Session session) throws DataAccessException { - throw new DriverException("test"); - } - }); + try { + template.doExecute(new SessionCallback() { + @Override + public String doInSession(Session session) throws DataAccessException { + throw new DriverException("test"); + } + }); + fail("Missing CassandraUncategorizedException"); + } catch (CassandraUncategorizedException e) { + assertThat(e).hasMessageContaining("test").hasRootCauseInstanceOf(DriverException.class); + } } /** @@ -136,25 +137,29 @@ public class CqlTemplateUnitTests { */ @Test public void doExecuteInSessionCallbackTranslatesToCassandraUncategorizedDataAccessException() { - exception.expect(CassandraUncategorizedDataAccessException.class); - exception.expectCause(org.hamcrest.Matchers.isA(Error.class)); - exception.expectMessage(containsString("test")); - template.doExecute(new SessionCallback() { - @Override - public String doInSession(Session session) throws DataAccessException { - throw new Error("test"); - } - }); + try { + template.doExecute(new SessionCallback() { + @Override + public String doInSession(Session session) throws DataAccessException { + throw new Error("test"); + } + }); + fail("Missing CassandraUncategorizedException"); + } catch (CassandraUncategorizedDataAccessException e) { + assertThat(e).hasMessageContaining("test").hasCauseInstanceOf(Error.class); + } } @Test public void doExecuteWithNullSessionCallbackThrowsIllegalArgumentException() { - exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage("SessionCallback must not be null"); - template.doExecute((SessionCallback) null); + try { + template.doExecute((SessionCallback) null); + fail("Missing IllegalArgumentException"); + } catch (IllegalArgumentException e) { + assertThat(e).hasMessageContaining("SessionCallback must not be null"); + } } @Test @@ -165,7 +170,7 @@ public class CqlTemplateUnitTests { ResultSet resultSet = template.doExecuteQueryReturnResultSet("SELECT * FROM Customers"); - assertThat(resultSet, is(equalTo(mockResultSet))); + assertThat(resultSet).isEqualTo(mockResultSet); verify(mockSession, times(1)).execute(eq("SELECT * FROM Customers")); verifyZeroInteractions(mockResultSet); @@ -180,7 +185,7 @@ public class CqlTemplateUnitTests { ResultSet resultSet = template.doExecuteQueryReturnResultSet(mockSelect); - assertThat(resultSet, is(equalTo(mockResultSet))); + assertThat(resultSet).isEqualTo(mockResultSet); verify(mockSession, times(1)).execute(eq(mockSelect)); verifyZeroInteractions(mockResultSet); @@ -205,14 +210,14 @@ public class CqlTemplateUnitTests { template = new CqlTemplate() { @Override T columnToObject(Row row, ColumnDefinitions.Definition columnDefinition) { - assertThat(row, is(sameInstance(mockRow))); - assertThat(columnDefinition, is(sameInstance(mockColumnDefinition))); + assertThat(row).isSameAs(mockRow); + assertThat(columnDefinition).isSameAs(mockColumnDefinition); return (T) "test"; } }; - assertThat(String.valueOf(template.firstColumnToObject(mockRow)), is(equalTo("test"))); + assertThat(String.valueOf(template.firstColumnToObject(mockRow))).isEqualTo("test"); verify(mockRow, times(1)).getColumnDefinitions(); verify(mockColumnDefinitions, times(1)).iterator(); @@ -235,7 +240,7 @@ public class CqlTemplateUnitTests { when(mockColumnDefinitions.iterator()).thenReturn(mockIterator); when(mockIterator.hasNext()).thenReturn(false); - assertThat(template.firstColumnToObject(mockRow), is(nullValue(Object.class))); + assertThat(template.firstColumnToObject(mockRow)).isNull(); verify(mockRow, times(1)).getColumnDefinitions(); verify(mockColumnDefinitions, times(1)).iterator(); @@ -257,7 +262,7 @@ public class CqlTemplateUnitTests { when(mockResultSet.isExhausted()).thenReturn(true); when(mockRowMapper.mapRow(eq(mockRow), eq(0))).thenReturn("test"); - assertThat(template.processOne(mockResultSet, mockRowMapper), is(equalTo("test"))); + assertThat(template.processOne(mockResultSet, mockRowMapper)).isEqualTo("test"); verify(mockResultSet, times(1)).one(); verify(mockResultSet, times(1)).isExhausted(); @@ -277,12 +282,11 @@ public class CqlTemplateUnitTests { when(mockResultSet.one()).thenReturn(null); try { - exception.expect(IncorrectResultSizeDataAccessException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage(containsString("expected 1, actual 0")); template.processOne(mockResultSet, mockRowMapper); - + fail("Missing IncorrectResultSizeDataAccessException"); + } catch (IncorrectResultSizeDataAccessException e) { + assertThat(e).hasMessageContaining("expected 1, actual 0"); } finally { verify(mockResultSet, times(1)).one(); verify(mockResultSet, never()).isExhausted(); @@ -304,12 +308,10 @@ public class CqlTemplateUnitTests { when(mockResultSet.isExhausted()).thenReturn(false); try { - exception.expect(IncorrectResultSizeDataAccessException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage("ResultSet size exceeds 1"); - template.processOne(mockResultSet, mockRowMapper); - + fail("Missing IncorrectResultSizeDataAccessException"); + } catch (IncorrectResultSizeDataAccessException e) { + assertThat(e).hasMessage("ResultSet size exceeds 1"); } finally { verify(mockResultSet, times(1)).one(); verify(mockResultSet, times(1)).isExhausted(); @@ -328,8 +330,6 @@ public class CqlTemplateUnitTests { try { exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); - template.processOne(null, mockRowMapper); } finally { verifyZeroInteractions(mockRowMapper); @@ -351,15 +351,14 @@ public class CqlTemplateUnitTests { template = new CqlTemplate() { @Override protected Object firstColumnToObject(Row row) { - assertThat(row, is(equalTo(mockRow))); + assertThat(row).isEqualTo(mockRow); return 1L; } }; Number value = template.processOne(mockResultSet, Long.class); - assertThat(value, is(instanceOf(Long.class))); - assertThat(value.longValue(), is(equalTo(1L))); + assertThat(value).isInstanceOf(Long.class).isEqualTo(1L); verify(mockResultSet, times(1)).one(); verify(mockResultSet, times(1)).isExhausted(); @@ -377,12 +376,10 @@ public class CqlTemplateUnitTests { when(mockResultSet.one()).thenReturn(null); try { - exception.expect(IncorrectResultSizeDataAccessException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage(containsString("expected 1, actual 0")); - template.processOne(mockResultSet, Integer.class); - + fail("Missing IncorrectResultSizeDataAccessException"); + } catch (IncorrectResultSizeDataAccessException e) { + assertThat(e).hasMessageContaining("expected 1, actual 0"); } finally { verify(mockResultSet, times(1)).one(); verify(mockResultSet, never()).isExhausted(); @@ -402,12 +399,11 @@ public class CqlTemplateUnitTests { when(mockResultSet.isExhausted()).thenReturn(false); try { - exception.expect(IncorrectResultSizeDataAccessException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage(containsString("ResultSet size exceeds 1")); - template.processOne(mockResultSet, Double.class); + fail("Missing IncorrectResultSizeDataAccessException"); + } catch (IncorrectResultSizeDataAccessException e) { + assertThat(e).hasMessageContaining("ResultSet size exceeds 1"); } finally { verify(mockResultSet, times(1)).one(); verify(mockResultSet, times(1)).isExhausted(); @@ -421,7 +417,6 @@ public class CqlTemplateUnitTests { @Test public void processOneWithRequiredTypePassingNullResultSetThrowsIllegalArgumentException() { exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); template.processOne(null, String.class); } @@ -465,8 +460,7 @@ public class CqlTemplateUnitTests { @Test public void addStatementQueryOptionsShouldAddDriverQueryOptions() { - QueryOptions queryOptions = QueryOptions.builder() - .consistencyLevel(ConsistencyLevel.EACH_QUORUM) // + QueryOptions queryOptions = QueryOptions.builder().consistencyLevel(ConsistencyLevel.EACH_QUORUM) // .retryPolicy(FallthroughRetryPolicy.INSTANCE) // .build(); @@ -555,8 +549,7 @@ public class CqlTemplateUnitTests { .consistencyLevel(ConsistencyLevel.EACH_QUORUM) // .retryPolicy(FallthroughRetryPolicy.INSTANCE) // .ttl(10) // - .tracing(false) - .build(); + .tracing(false).build(); template.addWriteOptions(mockUpdate, writeOptions); diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java index 149e865a3..632e79cf1 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.core; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import java.util.concurrent.TimeUnit; @@ -48,13 +47,13 @@ public class QueryOptionsUnitTests { .tracing(true)// .build(); // - assertThat((Class) queryOptions.getClass(), is(equalTo((Class) QueryOptions.class))); - assertThat(queryOptions.getRetryPolicy(), is(RetryPolicy.DEFAULT)); - assertThat(queryOptions.getConsistencyLevel(), is(nullValue())); - assertThat(queryOptions.getDriverConsistencyLevel(), is(ConsistencyLevel.ANY)); - assertThat(queryOptions.getReadTimeout(), is(1000L)); - assertThat(queryOptions.getFetchSize(), is(10)); - assertThat(queryOptions.getTracing(), is(true)); + assertThat(queryOptions.getClass()).isEqualTo(QueryOptions.class); + assertThat(queryOptions.getRetryPolicy()).isEqualTo(RetryPolicy.DEFAULT); + assertThat(queryOptions.getConsistencyLevel()).isNull(); + assertThat(queryOptions.getDriverConsistencyLevel()).isEqualTo(ConsistencyLevel.ANY); + assertThat(queryOptions.getReadTimeout()).isEqualTo(1000); + assertThat(queryOptions.getFetchSize()).isEqualTo(10); + assertThat(queryOptions.getTracing()).isTrue(); } /** @@ -67,8 +66,8 @@ public class QueryOptionsUnitTests { .retryPolicy(new LoggingRetryPolicy(DefaultRetryPolicy.INSTANCE)) // .build(); // - assertThat(writeOptions.getRetryPolicy(), is(nullValue())); - assertThat(writeOptions.getDriverRetryPolicy(), is(instanceOf(LoggingRetryPolicy.class))); + assertThat(writeOptions.getRetryPolicy()).isNull(); + assertThat(writeOptions.getDriverRetryPolicy()).isInstanceOf(LoggingRetryPolicy.class); } /** @@ -81,8 +80,8 @@ public class QueryOptionsUnitTests { .retryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY) // .build(); // - assertThat(writeOptions.getRetryPolicy(), is(RetryPolicy.DOWNGRADING_CONSISTENCY)); - assertThat(writeOptions.getDriverRetryPolicy(), is(nullValue())); + assertThat(writeOptions.getRetryPolicy()).isEqualTo(RetryPolicy.DOWNGRADING_CONSISTENCY); + assertThat(writeOptions.getDriverRetryPolicy()).isNull(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java index 2b7943c6c..06d74d3c5 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.core; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import java.util.concurrent.TimeUnit; @@ -46,13 +45,13 @@ public class WriteOptionsUnitTests { .withTracing()// .build(); // - assertThat(writeOptions.getTtl(), is(123)); - assertThat(writeOptions.getRetryPolicy(), is(RetryPolicy.DEFAULT)); - assertThat(writeOptions.getConsistencyLevel(), is(nullValue())); - assertThat(writeOptions.getDriverConsistencyLevel(), is(com.datastax.driver.core.ConsistencyLevel.ANY)); - assertThat(writeOptions.getReadTimeout(), is(1L)); - assertThat(writeOptions.getFetchSize(), is(10)); - assertThat(writeOptions.getTracing(), is(true)); + assertThat(writeOptions.getTtl()).isEqualTo(123); + assertThat(writeOptions.getRetryPolicy()).isEqualTo(RetryPolicy.DEFAULT); + assertThat(writeOptions.getConsistencyLevel()).isNull(); + assertThat(writeOptions.getDriverConsistencyLevel()).isEqualTo(com.datastax.driver.core.ConsistencyLevel.ANY); + assertThat(writeOptions.getReadTimeout()).isEqualTo(1); + assertThat(writeOptions.getFetchSize()).isEqualTo(10); + assertThat(writeOptions.getTracing()).isTrue(); } /** @@ -63,9 +62,9 @@ public class WriteOptionsUnitTests { WriteOptions writeOptions = WriteOptions.builder().readTimeout(1, TimeUnit.MINUTES).build(); - assertThat(writeOptions.getReadTimeout(), is(60L * 1000L)); - assertThat(writeOptions.getFetchSize(), is(nullValue())); - assertThat(writeOptions.getTracing(), is(nullValue())); + assertThat(writeOptions.getReadTimeout()).isEqualTo(60L * 1000L); + assertThat(writeOptions.getFetchSize()).isNull(); + assertThat(writeOptions.getTracing()).isNull(); } /** @@ -76,9 +75,8 @@ public class WriteOptionsUnitTests { QueryOptions writeOptions = QueryOptions.builder().retryPolicy(FallthroughRetryPolicy.INSTANCE).build(); - assertThat(writeOptions.getRetryPolicy(), is(nullValue())); - assertThat(writeOptions.getDriverRetryPolicy(), - is(equalTo((com.datastax.driver.core.policies.RetryPolicy) FallthroughRetryPolicy.INSTANCE))); + assertThat(writeOptions.getRetryPolicy()).isNull(); + assertThat(writeOptions.getDriverRetryPolicy()).isEqualTo(FallthroughRetryPolicy.INSTANCE); } /** @@ -89,8 +87,8 @@ public class WriteOptionsUnitTests { QueryOptions writeOptions = QueryOptions.builder().retryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY).build(); - assertThat(writeOptions.getRetryPolicy(), is(RetryPolicy.DOWNGRADING_CONSISTENCY)); - assertThat(writeOptions.getDriverRetryPolicy(), is(nullValue())); + assertThat(writeOptions.getRetryPolicy()).isEqualTo(RetryPolicy.DOWNGRADING_CONSISTENCY); + assertThat(writeOptions.getDriverRetryPolicy()).isNull(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/CqlIdentifierUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/CqlIdentifierUnitTests.java old mode 100644 new mode 100755 index 0209e72ca..75ba52efb --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/CqlIdentifierUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/CqlIdentifierUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.cql; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.cassandra.core.cql.CqlIdentifier.*; import org.junit.Test; @@ -36,8 +36,8 @@ public class CqlIdentifierUnitTests { for (String id : ids) { CqlIdentifier cqlId = cqlId(id); - assertFalse(cqlId.isQuoted()); - assertEquals(id.toLowerCase(), cqlId.toCql()); + assertThat(cqlId.isQuoted()).isFalse(); + assertThat(cqlId.toCql()).isEqualTo(id.toLowerCase()); } } @@ -48,8 +48,8 @@ public class CqlIdentifierUnitTests { for (String id : ids) { CqlIdentifier cqlId = quotedCqlId(id); - assertTrue(cqlId.isQuoted()); - assertEquals("\"" + id + "\"", cqlId.toCql()); + assertThat(cqlId.isQuoted()).isTrue(); + assertThat(cqlId.toCql()).isEqualTo("\"" + id + "\""); } } @@ -58,12 +58,12 @@ public class CqlIdentifierUnitTests { for (ReservedKeyword id : ReservedKeyword.values()) { CqlIdentifier cqlId = cqlId(id.name()); - assertTrue(cqlId.isQuoted()); - assertEquals("\"" + id.name() + "\"", cqlId.toCql()); + assertThat(cqlId.isQuoted()).isTrue(); + assertThat(cqlId.toCql()).isEqualTo("\"" + id.name() + "\""); cqlId = cqlId(id.name().toLowerCase()); - assertTrue(cqlId.isQuoted()); - assertEquals("\"" + id.name().toLowerCase() + "\"", cqlId.toCql()); + assertThat(cqlId.isQuoted()).isTrue(); + assertThat(cqlId.toCql()).isEqualTo("\"" + id.name().toLowerCase() + "\""); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java old mode 100644 new mode 100755 index 4c302d5d3..b7cf0a461 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.HashMap; import java.util.Map; @@ -39,20 +39,20 @@ public class AlterKeyspaceCqlGeneratorUnitTests { * Asserts that the preamble is first & correctly formatted in the given CQL string. */ public static void assertPreamble(String tableName, String cql) { - assertTrue(cql.startsWith("ALTER KEYSPACE " + tableName + " ")); + assertThat(cql.startsWith("ALTER KEYSPACE " + tableName + " ")).isTrue(); } private static void assertReplicationMap(Map replicationMap, String cql) { - assertTrue(cql.contains(" WITH replication = { ")); + assertThat(cql.contains(" WITH replication = { ")).isTrue(); for (Map.Entry entry : replicationMap.entrySet()) { String keyValuePair = "'" + entry.getKey().getName() + "' : '" + entry.getValue().toString() + "'"; - assertTrue(cql.contains(keyValuePair)); + assertThat(cql.contains(keyValuePair)).isTrue(); } } public static void assertDurableWrites(Boolean durableWrites, String cql) { - assertTrue(cql.contains(" AND durable_writes = " + durableWrites)); + assertThat(cql.contains(" AND durable_writes = " + durableWrites)).isTrue(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java old mode 100644 new mode 100755 index c647ae052..ed17c5fc0 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.LinkedHashMap; import java.util.Map; @@ -58,14 +57,14 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea session.execute( "CREATE TABLE addamsFamily (name varchar PRIMARY KEY, gender varchar,\n" + " lastknownlocation bigint);"); - AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily") - .alter("lastKnownLocation", DataType.varint()); + AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily").alter("lastKnownLocation", + DataType.varint()); execute(spec); ColumnMetadata column = getTableMetadata("addamsFamily").getColumn("lastKnownLocation"); - assertThat(column.getType(), is(equalTo(DataType.varint()))); + assertThat(column.getType()).isEqualTo(DataType.varint()); } /** @@ -77,14 +76,14 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea session.execute( "CREATE TABLE addamsFamily (name varchar PRIMARY KEY, gender varchar,\n" + " lastknownlocation list);"); - AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily") - .alter("lastKnownLocation", DataType.list(DataType.varchar())); + AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily").alter("lastKnownLocation", + DataType.list(DataType.varchar())); execute(spec); ColumnMetadata column = getTableMetadata("addamsFamily").getColumn("lastKnownLocation"); - assertThat(column.getType(), is(equalTo((DataType) DataType.list(DataType.varchar())))); + assertThat(column.getType()).isEqualTo((DataType) DataType.list(DataType.varchar())); } /** @@ -96,14 +95,14 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea session.execute( "CREATE TABLE addamsFamily (name varchar PRIMARY KEY, gender varchar,\n" + " lastknownlocation varchar);"); - AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily") - .add("gravesite", DataType.varchar()); + AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily").add("gravesite", + DataType.varchar()); execute(spec); ColumnMetadata column = getTableMetadata("addamsFamily").getColumn("gravesite"); - assertThat(column.getType(), is(equalTo(DataType.varchar()))); + assertThat(column.getType()).isEqualTo(DataType.varchar()); } /** @@ -114,14 +113,14 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea session.execute("CREATE TABLE users (user_name varchar PRIMARY KEY);"); - AlterTableSpecification spec = AlterTableSpecification.alterTable("users") - .add("top_places", DataType.list(DataType.ascii())); + AlterTableSpecification spec = AlterTableSpecification.alterTable("users").add("top_places", + DataType.list(DataType.ascii())); execute(spec); ColumnMetadata column = getTableMetadata("users").getColumn("top_places"); - assertThat(column.getType(), is(equalTo((DataType) DataType.list(DataType.ascii())))); + assertThat(column.getType()).isEqualTo((DataType) DataType.list(DataType.ascii())); } /** @@ -136,7 +135,7 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea execute(spec); - assertThat(getTableMetadata("addamsfamily").getColumn("gender"), is(nullValue())); + assertThat(getTableMetadata("addamsfamily").getColumn("gender")).isNull(); } /** @@ -151,8 +150,8 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea execute(spec); - assertThat(getTableMetadata("addamsfamily").getColumn("name"), is(nullValue())); - assertThat(getTableMetadata("addamsfamily").getColumn("newname"), is(notNullValue())); + assertThat(getTableMetadata("addamsfamily").getColumn("name")).isNull(); + assertThat(getTableMetadata("addamsfamily").getColumn("newname")).isNotNull(); } /** @@ -171,8 +170,8 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea execute(spec); - assertThat(getTableMetadata("users").getOptions().getCaching().get("keys"), is(equalTo("NONE"))); - assertThat(getTableMetadata("users").getOptions().getCaching().get("rows_per_partition"), is(equalTo("15"))); + assertThat(getTableMetadata("users").getOptions().getCaching().get("keys")).isEqualTo("NONE"); + assertThat(getTableMetadata("users").getOptions().getCaching().get("rows_per_partition")).isEqualTo("15"); } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java old mode 100644 new mode 100755 index 30643d814..948f68d10 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.LinkedHashMap; import java.util.Map; @@ -44,10 +43,10 @@ public class AlterTableCqlGeneratorUnitTests { @Test public void alterTableAlterColumnType() { - AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily") - .alter("lastKnownLocation", DataType.uuid()); + AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily").alter("lastKnownLocation", + DataType.uuid()); - assertThat(toCql(spec), is(equalTo("ALTER TABLE addamsfamily ALTER lastknownlocation TYPE uuid;"))); + assertThat(toCql(spec)).isEqualTo("ALTER TABLE addamsfamily ALTER lastknownlocation TYPE uuid;"); } /** @@ -56,10 +55,10 @@ public class AlterTableCqlGeneratorUnitTests { @Test public void alterTableAlterListColumnType() { - AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily") - .alter("lastKnownLocation", DataType.list(DataType.ascii())); + AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily").alter("lastKnownLocation", + DataType.list(DataType.ascii())); - assertThat(toCql(spec), is(equalTo("ALTER TABLE addamsfamily ALTER lastknownlocation TYPE list;"))); + assertThat(toCql(spec)).isEqualTo("ALTER TABLE addamsfamily ALTER lastknownlocation TYPE list;"); } /** @@ -68,10 +67,10 @@ public class AlterTableCqlGeneratorUnitTests { @Test public void alterTableAddColumn() { - AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily") - .add("gravesite", DataType.varchar()); + AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily").add("gravesite", + DataType.varchar()); - assertThat(toCql(spec), is(equalTo("ALTER TABLE addamsfamily ADD gravesite varchar;"))); + assertThat(toCql(spec)).isEqualTo("ALTER TABLE addamsfamily ADD gravesite varchar;"); } /** @@ -80,10 +79,10 @@ public class AlterTableCqlGeneratorUnitTests { @Test public void alterTableAddListColumn() { - AlterTableSpecification spec = AlterTableSpecification.alterTable("users") - .add("top_places", DataType.list(DataType.ascii())); + AlterTableSpecification spec = AlterTableSpecification.alterTable("users").add("top_places", + DataType.list(DataType.ascii())); - assertThat(toCql(spec), is(equalTo("ALTER TABLE users ADD top_places list;"))); + assertThat(toCql(spec)).isEqualTo("ALTER TABLE users ADD top_places list;"); } /** @@ -94,7 +93,7 @@ public class AlterTableCqlGeneratorUnitTests { AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily").drop("gender"); - assertThat(toCql(spec), is(equalTo("ALTER TABLE addamsfamily DROP gender;"))); + assertThat(toCql(spec)).isEqualTo("ALTER TABLE addamsfamily DROP gender;"); } /** @@ -103,10 +102,9 @@ public class AlterTableCqlGeneratorUnitTests { @Test public void alterTableRenameColumn() { - AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily") - .rename("firstname", "lastname"); + AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily").rename("firstname", "lastname"); - assertThat(toCql(spec), is(equalTo("ALTER TABLE addamsfamily RENAME firstname TO lastname;"))); + assertThat(toCql(spec)).isEqualTo("ALTER TABLE addamsfamily RENAME firstname TO lastname;"); } /** @@ -118,8 +116,8 @@ public class AlterTableCqlGeneratorUnitTests { AlterTableSpecification spec = AlterTableSpecification.alterTable("addamsFamily") .with(TableOption.READ_REPAIR_CHANCE, 0.2f).with(TableOption.COMMENT, "A most excellent and useful table"); - assertThat(toCql(spec), is(equalTo( - "ALTER TABLE addamsfamily WITH read_repair_chance = 0.2 AND comment = 'A most excellent and useful table';"))); + assertThat(toCql(spec)).isEqualTo( + "ALTER TABLE addamsfamily WITH read_repair_chance = 0.2 AND comment = 'A most excellent and useful table';"); } /** @@ -132,8 +130,8 @@ public class AlterTableCqlGeneratorUnitTests { .add("top_places", DataType.list(DataType.ascii())).add("other", DataType.list(DataType.ascii())) .with(TableOption.COMMENT, "A most excellent and useful table"); - assertThat(toCql(spec), is(equalTo( - "ALTER TABLE addamsfamily ADD top_places list ADD other list WITH comment = 'A most excellent and useful table';"))); + assertThat(toCql(spec)).isEqualTo( + "ALTER TABLE addamsfamily ADD top_places list ADD other list WITH comment = 'A most excellent and useful table';"); } /** @@ -148,8 +146,8 @@ public class AlterTableCqlGeneratorUnitTests { AlterTableSpecification spec = AlterTableSpecification.alterTable("users").with(TableOption.CACHING, cachingMap); - assertThat(toCql(spec), - is(equalTo("ALTER TABLE users WITH caching = { 'keys' : 'none', 'rows_per_partition' : '15' };"))); + assertThat(toCql(spec)) + .isEqualTo("ALTER TABLE users WITH caching = { 'keys' : 'none', 'rows_per_partition' : '15' };"); } private String toCql(AlterTableSpecification spec) { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java old mode 100644 new mode 100755 index b513a30b7..cbd15a0da --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.cassandra.core.keyspace.CreateIndexSpecification; @@ -32,7 +32,7 @@ public class CreateIndexCqlGeneratorUnitTests { * Asserts that the preamble is first & correctly formatted in the given CQL string. */ public static void assertPreamble(String indexName, String tableName, String cql) { - assertTrue(cql.startsWith("CREATE INDEX " + indexName + " ON " + tableName)); + assertThat(cql.startsWith("CREATE INDEX " + indexName + " ON " + tableName)).isTrue(); } /** @@ -41,7 +41,7 @@ public class CreateIndexCqlGeneratorUnitTests { * @param columnName IE, "(foo)" */ public static void assertColumn(String columnName, String cql) { - assertTrue(cql.contains("(" + columnName + ")")); + assertThat(cql.contains("(" + columnName + ")")).isTrue(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java old mode 100644 new mode 100755 index 67545fe77..0fb0a478b --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.HashMap; import java.util.Map; @@ -40,21 +40,21 @@ public class CreateKeyspaceCqlGeneratorUnitTests { * Asserts that the preamble is first & correctly formatted in the given CQL string. */ public static void assertPreamble(String keyspaceName, String cql) { - assertTrue(cql.startsWith("CREATE KEYSPACE " + keyspaceName + " ")); + assertThat(cql.startsWith("CREATE KEYSPACE " + keyspaceName + " ")).isTrue(); } private static void assertReplicationMap(Map replicationMap, String cql) { - assertTrue(cql.contains(" WITH replication = { ")); + assertThat(cql.contains(" WITH replication = { ")).isTrue(); for (Map.Entry entry : replicationMap.entrySet()) { String keyValuePair = "'" + entry.getKey().getName() + "' : " + (entry.getKey().quotesValue() ? "'" : "") + entry.getValue().toString() + (entry.getKey().quotesValue() ? "'" : ""); - assertTrue(cql.contains(keyValuePair)); + assertThat(cql.contains(keyValuePair)).isTrue(); } } public static void assertDurableWrites(Boolean durableWrites, String cql) { - assertTrue(cql.contains(" AND durable_writes = " + durableWrites)); + assertThat(cql.contains(" AND durable_writes = " + durableWrites)).isTrue(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java old mode 100644 new mode 100755 index bef0347a0..025f3b987 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.cassandra.core.cql.CqlIdentifier.*; import java.util.ArrayList; @@ -54,7 +54,7 @@ public class CreateTableCqlGeneratorUnitTests { * Asserts that the preamble is first & correctly formatted in the given CQL string. */ public static void assertPreamble(CqlIdentifier tableName, String cql) { - assertTrue(cql.startsWith("CREATE TABLE " + tableName + " ")); + assertThat(cql.startsWith("CREATE TABLE " + tableName + " ")).isTrue(); } /** @@ -63,7 +63,7 @@ public class CreateTableCqlGeneratorUnitTests { * @param primaryKeyString IE, "foo", "foo, bar, baz", "(foo, bar), baz", etc */ public static void assertPrimaryKey(String primaryKeyString, String cql) { - assertTrue(cql.contains(", PRIMARY KEY (" + primaryKeyString + "))")); + assertThat(cql.contains(", PRIMARY KEY (" + primaryKeyString + "))")).isTrue(); } /** @@ -72,7 +72,7 @@ public class CreateTableCqlGeneratorUnitTests { * @param columnSpec IE, "foo text, bar blob" */ public static void assertColumns(String columnSpec, String cql) { - assertTrue(cql.contains("(" + columnSpec + ",")); + assertThat(cql.contains("(" + columnSpec + ",")).isTrue(); } /** @@ -80,7 +80,7 @@ public class CreateTableCqlGeneratorUnitTests { */ public static void assertStringOption(String name, String value, String cql) { log.info(name + " -> " + value); - assertTrue(cql.contains(name + " = '" + value + "'")); + assertThat(cql.contains(name + " = '" + value + "'")).isTrue(); } /** @@ -88,12 +88,12 @@ public class CreateTableCqlGeneratorUnitTests { */ public static void assertDoubleOption(String name, Double value, String cql) { log.info(name + " -> " + value); - assertTrue(cql.contains(name + " = " + value)); + assertThat(cql.contains(name + " = " + value)).isTrue(); } public static void assertLongOption(String name, Long value, String cql) { log.info(name + " -> " + value); - assertTrue(cql.contains(name + " = " + value)); + assertThat(cql.contains(name + " = " + value)).isTrue(); } /** @@ -101,7 +101,7 @@ public class CreateTableCqlGeneratorUnitTests { */ public static void assertNullOption(String name, String cql) { log.info(name); - assertTrue(cql.contains(" " + name + " ")); + assertThat(cql.contains(" " + name + " ")).isTrue(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java old mode 100644 new mode 100755 index f047ff16d..ca0a353f9 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.cassandra.core.keyspace.DropIndexSpecification; @@ -32,7 +32,7 @@ public class DropIndexCqlGeneratorUnitTests { * Asserts that the preamble is first & correctly formatted in the given CQL string. */ public static void assertStatement(String indexName, boolean ifExists, String cql) { - assertTrue(cql.equals("DROP INDEX " + (ifExists ? "IF EXISTS " : "") + indexName + ";")); + assertThat(cql.equals("DROP INDEX " + (ifExists ? "IF EXISTS " : "") + indexName + ";")).isTrue(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java old mode 100644 new mode 100755 index dab693a78..fc9806739 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.cassandra.core.keyspace.DropKeyspaceSpecification; @@ -34,7 +34,7 @@ public class DropKeyspaceCqlGeneratorUnitTests { * Asserts that the preamble is first & correctly formatted in the given CQL string. */ public static void assertStatement(String tableName, String cql) { - assertTrue(cql.equals("DROP KEYSPACE " + tableName + ";")); + assertThat(cql.equals("DROP KEYSPACE " + tableName + ";")).isTrue(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java old mode 100644 new mode 100755 index 7a72bede4..54a5ebb38 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.cassandra.core.keyspace.DropTableSpecification; @@ -32,7 +32,7 @@ public class DropTableCqlGeneratorUnitTests { * Asserts that the preamble is first & correctly formatted in the given CQL string. */ public static void assertStatement(String tableName, boolean ifExists, String cql) { - assertTrue(cql.equals("DROP TABLE " + (ifExists ? "IF EXISTS " : "") + tableName + ";")); + assertThat(cql.equals("DROP TABLE " + (ifExists ? "IF EXISTS " : "") + tableName + ";")).isTrue(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/keyspace/OptionUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/keyspace/OptionUnitTests.java old mode 100644 new mode 100755 index 2ed24cadd..f0f886de8 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/keyspace/OptionUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/keyspace/OptionUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.core.keyspace; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.lang.annotation.RetentionPolicy; @@ -48,8 +48,8 @@ public class OptionUnitTests { @Test public void testOptionWithNullTypeIsCoerceable() { Option op = new DefaultOption("opt", null, true, true, true); - assertTrue(op.isCoerceable("")); - assertTrue(op.isCoerceable(null)); + assertThat(op.isCoerceable("")).isTrue(); + assertThat(op.isCoerceable(null)).isTrue(); } @Test @@ -62,9 +62,9 @@ public class OptionUnitTests { Option op = new DefaultOption(name, type, requires, escapes, quotes); - assertTrue(op.isCoerceable("opt")); - assertEquals("'opt'", op.toString("opt")); - assertEquals("'opt''n'", op.toString("opt'n")); + assertThat(op.isCoerceable("opt")).isTrue(); + assertThat(op.toString("opt")).isEqualTo("'opt'"); + assertThat(op.toString("opt'n")).isEqualTo("'opt''n'"); type = Long.class; escapes = false; @@ -73,11 +73,11 @@ public class OptionUnitTests { String expected = "1"; for (Object value : new Object[] { 1, "1" }) { - assertTrue(op.isCoerceable(value)); - assertEquals(expected, op.toString(value)); + assertThat(op.isCoerceable(value)).isTrue(); + assertThat(op.toString(value)).isEqualTo(expected); } - assertFalse(op.isCoerceable("x")); - assertTrue(op.isCoerceable(null)); + assertThat(op.isCoerceable("x")).isFalse(); + assertThat(op.isCoerceable(null)).isTrue(); type = Long.class; escapes = false; @@ -86,11 +86,11 @@ public class OptionUnitTests { expected = "'1'"; for (Object value : new Object[] { 1, "1" }) { - assertTrue(op.isCoerceable(value)); - assertEquals(expected, op.toString(value)); + assertThat(op.isCoerceable(value)).isTrue(); + assertThat(op.toString(value)).isEqualTo(expected); } - assertFalse(op.isCoerceable("x")); - assertTrue(op.isCoerceable(null)); + assertThat(op.isCoerceable("x")).isFalse(); + assertThat(op.isCoerceable(null)).isTrue(); type = Double.class; escapes = false; @@ -100,22 +100,22 @@ public class OptionUnitTests { String[] expecteds = new String[] { "1", "1.0", "1.0", "1", "1.0", null }; Object[] values = new Object[] { 1, 1.0F, 1.0D, "1", "1.0", null }; for (int i = 0; i < values.length; i++) { - assertTrue(op.isCoerceable(values[i])); - assertEquals(expecteds[i], op.toString(values[i])); + assertThat(op.isCoerceable(values[i])).isTrue(); + assertThat(op.toString(values[i])).isEqualTo(expecteds[i]); } - assertFalse(op.isCoerceable("x")); - assertTrue(op.isCoerceable(null)); + assertThat(op.isCoerceable("x")).isFalse(); + assertThat(op.isCoerceable(null)).isTrue(); type = RetentionPolicy.class; escapes = false; quotes = false; op = new DefaultOption(name, type, requires, escapes, quotes); - assertTrue(op.isCoerceable(null)); - assertTrue(op.isCoerceable(RetentionPolicy.CLASS)); - assertTrue(op.isCoerceable("CLASS")); - assertFalse(op.isCoerceable("x")); - assertEquals("CLASS", op.toString("CLASS")); - assertEquals("CLASS", op.toString(RetentionPolicy.CLASS)); + assertThat(op.isCoerceable(null)).isTrue(); + assertThat(op.isCoerceable(RetentionPolicy.CLASS)).isTrue(); + assertThat(op.isCoerceable("CLASS")).isTrue(); + assertThat(op.isCoerceable("x")).isFalse(); + assertThat(op.toString("CLASS")).isEqualTo("CLASS"); + assertThat(op.toString(RetentionPolicy.CLASS)).isEqualTo("CLASS"); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/support/EmptyResultSetUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/support/EmptyResultSetUnitTests.java index 48007cbe5..3021e0520 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/core/support/EmptyResultSetUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/support/EmptyResultSetUnitTests.java @@ -16,16 +16,13 @@ package org.springframework.cassandra.core.support; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import java.util.Collections; import java.util.Iterator; import org.junit.Test; -import com.datastax.driver.core.ExecutionInfo; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; @@ -43,30 +40,29 @@ public class EmptyResultSetUnitTests { ResultSet mockResultSet = mock(ResultSet.class); ResultSet theResultSet = EmptyResultSet.nullSafeResultSet(mockResultSet); - assertThat(theResultSet, is(sameInstance(mockResultSet))); + assertThat(theResultSet).isSameAs(mockResultSet); } @Test public void nullSAfeResultSetReturnsEmptyResultSetForNull() { ResultSet resultSet = EmptyResultSet.nullSafeResultSet(null); - assertThat(resultSet, is(instanceOf(EmptyResultSet.class))); + assertThat(resultSet).isInstanceOf(EmptyResultSet.class); } @Test public void isExhaustedForEmptyResultIsTrue() { - assertThat(EmptyResultSet.nullSafeResultSet(null).isExhausted(), is(true)); + assertThat(EmptyResultSet.nullSafeResultSet(null).isExhausted()).isTrue(); } @Test public void isFullyFetchedForEmptyResultSetIsTrue() { - assertThat(EmptyResultSet.nullSafeResultSet(null).isFullyFetched(), is(true)); + assertThat(EmptyResultSet.nullSafeResultSet(null).isFullyFetched()).isTrue(); } @Test public void getAllExecutionInfoForEmptyResultSetIsEmptyList() { - assertThat(EmptyResultSet.nullSafeResultSet(null).getAllExecutionInfo(), - is(equalTo(Collections.emptyList()))); + assertThat(EmptyResultSet.nullSafeResultSet(null).getAllExecutionInfo()).isEmpty(); } @Test(expected = UnsupportedOperationException.class) @@ -76,12 +72,12 @@ public class EmptyResultSetUnitTests { @Test public void getExecutionInfoForEmptyResultSetIsNull() { - assertThat(EmptyResultSet.nullSafeResultSet(null).getExecutionInfo(), is(nullValue(ExecutionInfo.class))); + assertThat(EmptyResultSet.nullSafeResultSet(null).getExecutionInfo()).isNull(); } @Test public void allForEmptyResultSetIsEmptyList() { - assertThat(EmptyResultSet.nullSafeResultSet(null).all(), is(equalTo(Collections.emptyList()))); + assertThat(EmptyResultSet.nullSafeResultSet(null).all()).isEmpty(); } @Test(expected = UnsupportedOperationException.class) @@ -93,13 +89,13 @@ public class EmptyResultSetUnitTests { public void iteratorForEmptyResultSetIsEmptyIterator() { Iterator iterator = EmptyResultSet.nullSafeResultSet(null).iterator(); - assertThat(iterator, is(notNullValue(Iterator.class))); - assertThat(iterator.hasNext(), is(false)); + assertThat(iterator).isNotNull(); + assertThat(iterator.hasNext()).isFalse(); } @Test public void oneForEmptyResultSetIsNull() { - assertThat(EmptyResultSet.nullSafeResultSet(null).one(), is(nullValue(Row.class))); + assertThat(EmptyResultSet.nullSafeResultSet(null).one()).isNull(); } @Test(expected = UnsupportedOperationException.class) diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/util/CollectionUtilsUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/core/util/CollectionUtilsUnitTests.java old mode 100644 new mode 100755 index 6a7bdb12e..7585e1d7d --- a/spring-cql/src/test/java/org/springframework/cassandra/core/util/CollectionUtilsUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/core/util/CollectionUtilsUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.cassandra.core.util; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Collection; @@ -27,8 +26,8 @@ import java.util.List; import org.junit.Test; /** - * The CollectionUtilsUnitTests class is a test suite of test cases testing the contract and functionality - * of the {@link CollectionUtils} class. + * The CollectionUtilsUnitTests class is a test suite of test cases testing the contract and functionality of the + * {@link CollectionUtils} class. * * @author John Blum * @see org.springframework.cassandra.core.util.CollectionUtils @@ -41,13 +40,13 @@ public class CollectionUtilsUnitTests { } void assertNonNullEmptyArray(Object[] array) { - assertThat(array, is(notNullValue())); - assertThat(array.length, is(equalTo(0))); + assertThat(array).isNotNull(); + assertThat(array.length).isEqualTo(0); } void assertNonNullEmptyCollection(Collection collection) { - assertThat(collection, is(notNullValue())); - assertThat(collection.isEmpty(), is(true)); + assertThat(collection).isNotNull(); + assertThat(collection.isEmpty()).isTrue(); } Iterable newIterable(final T... elements) { @@ -75,12 +74,12 @@ public class CollectionUtilsUnitTests { public void toArrayWithIterable() { Object[] array = CollectionUtils.toArray(newIterable(1, 2, 3)); - assertThat(array, is(notNullValue())); - assertThat(array.length, is(equalTo(3))); + assertThat(array).isNotNull(); + assertThat(array.length).isEqualTo(3); for (int index = 0; index < array.length; index++) { Object valueAtIndex = (index + 1); - assertThat(array[index], is(equalTo(valueAtIndex))); + assertThat(array[index]).isEqualTo(valueAtIndex); } } @@ -98,9 +97,9 @@ public class CollectionUtilsUnitTests { public void toListWithArray() { List list = CollectionUtils.toList("test", "testing", "tested"); - assertThat(list, is(notNullValue())); - assertThat(list.size(), is(equalTo(3))); - assertThat(list.containsAll(asList("test", "testing", "tested")), is(true)); + assertThat(list).isNotNull(); + assertThat(list).hasSize(3); + assertThat(list.containsAll(asList("test", "testing", "tested"))).isTrue(); } @Test @@ -118,9 +117,9 @@ public class CollectionUtilsUnitTests { public void toListWithIterable() { List list = CollectionUtils.toList(newIterable(1, 2, 3)); - assertThat(list, is(notNullValue())); - assertThat(list.size(), is(equalTo(3))); - assertThat(list.containsAll(asList(1, 2, 3)), is(true)); + assertThat(list).isNotNull(); + assertThat(list).hasSize(3); + assertThat(list.containsAll(asList(1, 2, 3))).isTrue(); } @Test @@ -128,7 +127,7 @@ public class CollectionUtilsUnitTests { List expected = asList(1, 2, 3); List actual = CollectionUtils.toList(expected); - assertThat(actual, is(sameInstance(expected))); + assertThat(actual).isSameAs(expected); } @Test diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/BeanDefinitionTestUtils.java b/spring-cql/src/test/java/org/springframework/cassandra/support/BeanDefinitionTestUtils.java index f21234d2a..18d519bca 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/support/BeanDefinitionTestUtils.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/support/BeanDefinitionTestUtils.java @@ -66,6 +66,6 @@ public abstract class BeanDefinitionTestUtils { Object value = getPropertyValue(beanDefinition, propertyName); return (value instanceof RuntimeBeanReference ? ((RuntimeBeanReference) value).getBeanName() - : (value != null ? String.valueOf(value) : null)); + : (value != null ? String.valueOf(value) : null)); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java old mode 100644 new mode 100755 index a095d6781..8b2b6ab73 --- a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.support; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Rule; @@ -56,11 +55,12 @@ public class CassandraAccessorUnitTests { @Test public void afterPropertiesSetWithUnitializedSessionThrowsIllegalStateException() { - exception.expect(IllegalStateException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage("Session must not be null"); - - cassandraAccessor.afterPropertiesSet(); + try { + cassandraAccessor.afterPropertiesSet(); + fail("Missing IllegalStateException"); + } catch (IllegalStateException e) { + assertThat(e).hasMessageContaining("Session must not be null"); + } } /** @@ -70,7 +70,7 @@ public class CassandraAccessorUnitTests { public void setAndGetExceptionTranslator() { cassandraAccessor.setExceptionTranslator(mockExceptionTranslator); - assertThat(cassandraAccessor.getExceptionTranslator(), is(sameInstance(mockExceptionTranslator))); + assertThat(cassandraAccessor.getExceptionTranslator()).isSameAs(mockExceptionTranslator); } /** @@ -79,11 +79,12 @@ public class CassandraAccessorUnitTests { @Test public void setExceptionTranslatorToNullThrowsIllegalArgumentException() { - exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage(is(equalTo("CassandraExceptionTranslator must not be null"))); - - cassandraAccessor.setExceptionTranslator(null); + try { + cassandraAccessor.setExceptionTranslator(null); + fail("Missing IllegalArgumentException"); + } catch (IllegalArgumentException e) { + assertThat(e).hasMessageContaining("CassandraExceptionTranslator must not be null"); + } } /** @@ -91,7 +92,7 @@ public class CassandraAccessorUnitTests { */ @Test public void getUninitializedExceptionTranslatorReturnsDefault() { - assertThat(cassandraAccessor.getExceptionTranslator(), is(equalTo(cassandraAccessor.exceptionTranslator))); + assertThat(cassandraAccessor.getExceptionTranslator()).isEqualTo(cassandraAccessor.exceptionTranslator); } /** @@ -101,7 +102,7 @@ public class CassandraAccessorUnitTests { public void setAndGetSession() { cassandraAccessor.setSession(mockSession); - assertThat(cassandraAccessor.getSession(), is(sameInstance(mockSession))); + assertThat(cassandraAccessor.getSession()).isSameAs(mockSession); } /** @@ -110,11 +111,12 @@ public class CassandraAccessorUnitTests { @Test public void setSessionToNullThrowsIllegalArgumentException() { - exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage(is(equalTo("Session must not be null"))); - - cassandraAccessor.setSession(null); + try { + cassandraAccessor.setSession(null); + fail("Missing IllegalArgumentException"); + } catch (IllegalArgumentException e) { + assertThat(e).hasMessageContaining("Session must not be null"); + } } /** @@ -123,10 +125,11 @@ public class CassandraAccessorUnitTests { @Test public void getUninitializedSessionThrowsIllegalStateException() { - exception.expect(IllegalStateException.class); - exception.expectCause(is(nullValue(Throwable.class))); - exception.expectMessage(is(equalTo("Session was not properly initialized"))); - - cassandraAccessor.getSession(); + try { + cassandraAccessor.getSession(); + fail("Missing IllegalStateException"); + } catch (IllegalStateException e) { + assertThat(e).hasMessageContaining("Session was not properly initialized"); + } } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorTest.java b/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorTest.java old mode 100644 new mode 100755 index ed01b7714..c2d216b80 --- a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorTest.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorTest.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.support; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.cassandra.support.exception.CassandraInvalidConfigurationInQueryException; @@ -44,14 +44,14 @@ public class CassandraExceptionTranslatorTest { String table = "tbl"; AlreadyExistsException cx = new AlreadyExistsException(keyspace, table); DataAccessException dax = tx.translateExceptionIfPossible(cx); - assertNotNull(dax); - assertTrue(dax instanceof CassandraTableExistsException); + assertThat(dax).isNotNull(); + assertThat(dax instanceof CassandraTableExistsException).isTrue(); CassandraTableExistsException x = (CassandraTableExistsException) dax; - assertEquals(table, x.getTableName()); - assertEquals(x.getTableName(), x.getElementName()); - assertEquals(CassandraSchemaElementExistsException.ElementType.TABLE, x.getElementType()); - assertEquals(cx, x.getCause()); + assertThat(x.getTableName()).isEqualTo(table); + assertThat(x.getElementName()).isEqualTo(x.getTableName()); + assertThat(x.getElementType()).isEqualTo(CassandraSchemaElementExistsException.ElementType.TABLE); + assertThat(x.getCause()).isEqualTo(cx); } @Test @@ -60,14 +60,14 @@ public class CassandraExceptionTranslatorTest { String table = ""; AlreadyExistsException cx = new AlreadyExistsException(keyspace, table); DataAccessException dax = tx.translateExceptionIfPossible(cx); - assertNotNull(dax); - assertTrue(dax instanceof CassandraKeyspaceExistsException); + assertThat(dax).isNotNull(); + assertThat(dax instanceof CassandraKeyspaceExistsException).isTrue(); CassandraKeyspaceExistsException x = (CassandraKeyspaceExistsException) dax; - assertEquals(keyspace, x.getKeyspaceName()); - assertEquals(x.getKeyspaceName(), x.getElementName()); - assertEquals(CassandraSchemaElementExistsException.ElementType.KEYSPACE, x.getElementType()); - assertEquals(cx, x.getCause()); + assertThat(x.getKeyspaceName()).isEqualTo(keyspace); + assertThat(x.getElementName()).isEqualTo(x.getKeyspaceName()); + assertThat(x.getElementType()).isEqualTo(CassandraSchemaElementExistsException.ElementType.KEYSPACE); + assertThat(x.getCause()).isEqualTo(cx); } @Test @@ -75,14 +75,14 @@ public class CassandraExceptionTranslatorTest { String msg = "msg"; InvalidQueryException cx = new InvalidConfigurationInQueryException(null, msg); DataAccessException dax = tx.translateExceptionIfPossible(cx); - assertNotNull(dax); - assertTrue(dax instanceof CassandraInvalidConfigurationInQueryException); - assertEquals(cx, dax.getCause()); + assertThat(dax).isNotNull(); + assertThat(dax instanceof CassandraInvalidConfigurationInQueryException).isTrue(); + assertThat(dax.getCause()).isEqualTo(cx); cx = new InvalidQueryException(msg); dax = tx.translateExceptionIfPossible(cx); - assertNotNull(dax); - assertTrue(dax instanceof CassandraInvalidQueryException); - assertEquals(cx, dax.getCause()); + assertThat(dax).isNotNull(); + assertThat(dax instanceof CassandraInvalidQueryException).isTrue(); + assertThat(dax.getCause()).isEqualTo(cx); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java index 5f5eb4137..bf07c4e9e 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java @@ -22,10 +22,13 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.io.util.FileUtils; diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/CassandraCqlClusterFactoryBeanIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/CassandraCqlClusterFactoryBeanIntegrationTests.java old mode 100644 new mode 100755 index aaf9d9999..869658e54 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/CassandraCqlClusterFactoryBeanIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/CassandraCqlClusterFactoryBeanIntegrationTests.java @@ -15,9 +15,7 @@ */ package org.springframework.cassandra.test.integration.config; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Before; @@ -55,7 +53,7 @@ public class CassandraCqlClusterFactoryBeanIntegrationTests { cassandraCqlClusterFactoryBean.setProtocolVersion(ProtocolVersion.V2); cassandraCqlClusterFactoryBean.afterPropertiesSet(); - assertEquals(ProtocolVersion.V2, getProtocolVersionEnum(cassandraCqlClusterFactoryBean)); + assertThat(getProtocolVersionEnum(cassandraCqlClusterFactoryBean)).isEqualTo(ProtocolVersion.V2); } @Test @@ -63,7 +61,7 @@ public class CassandraCqlClusterFactoryBeanIntegrationTests { cassandraCqlClusterFactoryBean.afterPropertiesSet(); - assertThat(getProtocolVersionEnum(cassandraCqlClusterFactoryBean), is(nullValue())); + assertThat(getProtocolVersionEnum(cassandraCqlClusterFactoryBean)).isNull(); } private ProtocolVersion getProtocolVersionEnum(CassandraCqlClusterFactoryBean cassandraCqlClusterFactoryBean) diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java index 486740ef6..bfa0a4522 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.test.integration.config; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.springframework.cassandra.core.CqlTemplate; @@ -27,14 +27,14 @@ import com.datastax.driver.core.Session; public class IntegrationTestUtils { public static void assertCqlTemplate(CqlTemplate cqlTemplate) { - assertNotNull(cqlTemplate); + assertThat(cqlTemplate).isNotNull(); } public static void assertSession(Session session) { - assertNotNull(session); + assertThat(session).isNotNull(); } public static void assertKeyspaceExists(String keyspace, Session session) { - assertNotNull(session.getCluster().getMetadata().getKeyspace(keyspace)); + assertThat(session.getCluster().getMetadata().getKeyspace(keyspace)).isNotNull(); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTests.java old mode 100644 new mode 100755 index 99295da00..d31646062 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.test.integration.config.java; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Before; @@ -79,6 +78,6 @@ public class CqlTemplateConfigIntegrationTests extends AbstractEmbeddedCassandra public void test() { CqlTemplate cqlTemplate = context.getBean(CqlTemplate.class); - assertThat(cqlTemplate.describeRing().size(), is(greaterThan(0))); + assertThat(cqlTemplate.describeRing()).isNotEmpty(); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java old mode 100644 new mode 100755 index 04c64246d..ef39dd7b0 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java @@ -15,7 +15,8 @@ */ package org.springframework.cassandra.test.integration.config.java; -import org.junit.Assert; +import static org.assertj.core.api.Assertions.*; + import org.junit.Test; import org.springframework.cassandra.test.integration.config.IntegrationTestUtils; import org.springframework.test.context.ContextConfiguration; @@ -28,7 +29,7 @@ public class KeyspaceCreatingJavaConfigIntegrationTests extends AbstractIntegrat @Test public void test() { - Assert.assertNotNull(session); + assertThat(session).isNotNull(); IntegrationTestUtils.assertKeyspaceExists(KeyspaceCreatingJavaConfig.KEYSPACE_NAME, session); session.execute("DROP KEYSPACE " + KeyspaceCreatingJavaConfig.KEYSPACE_NAME + ";"); diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests.java old mode 100644 new mode 100755 index 3f1594ca3..deb343551 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.test.integration.config.xml; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.AssertionsForInterfaceTypes.*; import org.junit.After; import org.junit.Before; @@ -63,6 +62,6 @@ public class MinimalXmlConfigIntegrationTests extends AbstractEmbeddedCassandraI IntegrationTestUtils.assertKeyspaceExists(KEYSPACE, session); CqlOperations cqlOperations = context.getBean(CqlOperations.class); - assertThat(cqlOperations.describeRing().size(), is(greaterThan(0))); + assertThat(cqlOperations.describeRing()).isNotEmpty(); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java old mode 100644 new mode 100755 index 544c4ac05..8261d1c7a --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.test.integration.config.xml; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,7 +54,7 @@ public class PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests IntegrationTestUtils.assertSession(session); IntegrationTestUtils.assertKeyspaceExists("ppncxct", session); - assertNotNull(ops); + assertThat(ops).isNotNull(); } /** @@ -66,17 +65,17 @@ public class PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests PoolingOptions poolingOptions = cassandraCluster.getConfiguration().getPoolingOptions(); - assertThat(poolingOptions, is(notNullValue(PoolingOptions.class))); - assertThat(poolingOptions.getHeartbeatIntervalSeconds(), is(equalTo(60))); - assertThat(poolingOptions.getIdleTimeoutSeconds(), is(equalTo(180))); - assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.LOCAL), is(equalTo(4))); - assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.LOCAL), is(equalTo(8))); - assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.LOCAL), is(equalTo(20))); - assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.LOCAL), is(equalTo(10))); - assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.REMOTE), is(equalTo(2))); - assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.REMOTE), is(equalTo(4))); - assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.REMOTE), is(equalTo(10))); - assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.REMOTE), is(equalTo(5))); + assertThat(poolingOptions).isNotNull(); + assertThat(poolingOptions.getHeartbeatIntervalSeconds()).isEqualTo(60); + assertThat(poolingOptions.getIdleTimeoutSeconds()).isEqualTo(180); + assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.LOCAL)).isEqualTo(4); + assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.LOCAL)).isEqualTo(8); + assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.LOCAL)).isEqualTo(20); + assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.LOCAL)).isEqualTo(10); + assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.REMOTE)).isEqualTo(2); + assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.REMOTE)).isEqualTo(4); + assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.REMOTE)).isEqualTo(10); + assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.REMOTE)).isEqualTo(5); } /** @@ -87,14 +86,14 @@ public class PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests SocketOptions socketOptions = cassandraCluster.getConfiguration().getSocketOptions(); - assertThat(socketOptions, is(notNullValue(SocketOptions.class))); - assertThat(socketOptions.getConnectTimeoutMillis(), is(equalTo(15000))); - assertThat(socketOptions.getKeepAlive(), is(true)); - assertThat(socketOptions.getReadTimeoutMillis(), is(equalTo(60000))); - assertThat(socketOptions.getReceiveBufferSize(), is(equalTo(1024))); - assertThat(socketOptions.getReuseAddress(), is(true)); - assertThat(socketOptions.getSendBufferSize(), is(equalTo(2048))); - assertThat(socketOptions.getSoLinger(), is(equalTo(5))); - assertThat(socketOptions.getTcpNoDelay(), is(false)); + assertThat(socketOptions).isNotNull(); + assertThat(socketOptions.getConnectTimeoutMillis()).isEqualTo(15000); + assertThat(socketOptions.getKeepAlive()).isTrue(); + assertThat(socketOptions.getReadTimeoutMillis()).isEqualTo(60000); + assertThat(socketOptions.getReceiveBufferSize()).isEqualTo(1024); + assertThat(socketOptions.getReuseAddress()).isTrue(); + assertThat(socketOptions.getSendBufferSize()).isEqualTo(2048); + assertThat(socketOptions.getSoLinger()).isEqualTo(5); + assertThat(socketOptions.getTcpNoDelay()).isFalse(); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java index 07a282557..50b4553d7 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java @@ -24,8 +24,8 @@ import com.datastax.driver.core.LatencyTracker; import com.datastax.driver.core.Statement; /** - * {@link LatencyTracker} that logs latency events and their payload. This class can be considered a test dummy and is suitable for - * mocking. + * {@link LatencyTracker} that logs latency events and their payload. This class can be considered a test dummy and is + * suitable for mocking. * * @author David Webb * @author Oliver Gierke diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests.java old mode 100644 new mode 100755 index 792b2f2cd..568c7f221 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.test.integration.config.xml; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; @@ -54,8 +53,7 @@ public class XmlConfigIntegrationTests extends AbstractEmbeddedCassandraIntegrat public static final String KEYSPACE = "xmlconfigtest"; - @Rule - public KeyspaceRule keyspaceRule = new KeyspaceRule(cassandraEnvironment, KEYSPACE); + @Rule public KeyspaceRule keyspaceRule = new KeyspaceRule(cassandraEnvironment, KEYSPACE); private ConfigurableApplicationContext applicationContext; @@ -69,8 +67,7 @@ public class XmlConfigIntegrationTests extends AbstractEmbeddedCassandraIntegrat @Before public void setUp() { - this.applicationContext = new ClassPathXmlApplicationContext( - "XmlConfigIntegrationTests-context.xml", getClass()); + this.applicationContext = new ClassPathXmlApplicationContext("XmlConfigIntegrationTests-context.xml", getClass()); this.addressTranslator = applicationContext.getBean(AddressTranslator.class); this.cluster = applicationContext.getBean(Cluster.class); @@ -95,20 +92,20 @@ public class XmlConfigIntegrationTests extends AbstractEmbeddedCassandraIntegrat @Test public void clusterConfigurationIsCorrect() { - assertThat(cluster.getConfiguration().getPolicies().getAddressTranslator(), is(equalTo(addressTranslator))); - assertThat(cluster.getClusterName(), is(equalTo("skynet"))); - assertThat(cluster.getConfiguration().getProtocolOptions().getMaxSchemaAgreementWaitSeconds(), is(equalTo(2))); - assertThat(cluster.getConfiguration().getPolicies().getSpeculativeExecutionPolicy(), - is(equalTo(speculativeExecutionPolicy))); - - assertThat(cluster.getConfiguration().getPolicies().getTimestampGenerator(), is(equalTo(timestampGenerator))); + assertThat(cluster.getConfiguration().getPolicies().getAddressTranslator()).isEqualTo(addressTranslator); + assertThat(cluster.getClusterName()).isEqualTo("skynet"); + assertThat(cluster.getConfiguration().getProtocolOptions().getMaxSchemaAgreementWaitSeconds()).isEqualTo(2); + assertThat(cluster.getConfiguration().getPolicies().getSpeculativeExecutionPolicy()) + .isEqualTo(speculativeExecutionPolicy); + assertThat(cluster.getConfiguration().getPolicies().getTimestampGenerator()).isEqualTo(timestampGenerator); } @Test public void clusterBuilderConfigurerWasCalled() { - assertThat(clusterBuilderConfigurer, is(instanceOf(TestClusterBuilderConfigurer.class))); - assertThat(((TestClusterBuilderConfigurer) clusterBuilderConfigurer).configureCalled.get(), is(true)); + + assertThat(clusterBuilderConfigurer).isInstanceOf(TestClusterBuilderConfigurer.class); + assertThat(((TestClusterBuilderConfigurer) clusterBuilderConfigurer).configureCalled.get()).isTrue(); } /** @@ -119,18 +116,18 @@ public class XmlConfigIntegrationTests extends AbstractEmbeddedCassandraIntegrat PoolingOptions poolingOptions = cluster.getConfiguration().getPoolingOptions(); - assertThat(poolingOptions, is(notNullValue(PoolingOptions.class))); - assertThat(poolingOptions.getHeartbeatIntervalSeconds(), is(equalTo(60))); - assertThat(poolingOptions.getIdleTimeoutSeconds(), is(equalTo(300))); - assertThat(poolingOptions.getInitializationExecutor(), is(equalTo(executor))); - assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.LOCAL), is(equalTo(2))); - assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.LOCAL), is(equalTo(8))); - assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.LOCAL), is(equalTo(100))); - assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.LOCAL), is(equalTo(25))); - assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.REMOTE), is(equalTo(1))); - assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.REMOTE), is(equalTo(2))); - assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.REMOTE), is(equalTo(100))); - assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.REMOTE), is(equalTo(25))); + assertThat(poolingOptions).isNotNull(); + assertThat(poolingOptions.getHeartbeatIntervalSeconds()).isEqualTo(60); + assertThat(poolingOptions.getIdleTimeoutSeconds()).isEqualTo(300); + assertThat(poolingOptions.getInitializationExecutor()).isEqualTo(executor); + assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.LOCAL)).isEqualTo(2); + assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.LOCAL)).isEqualTo(8); + assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.LOCAL)).isEqualTo(100); + assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.LOCAL)).isEqualTo(25); + assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.REMOTE)).isEqualTo(1); + assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.REMOTE)).isEqualTo(2); + assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.REMOTE)).isEqualTo(100); + assertThat(poolingOptions.getNewConnectionThreshold(HostDistance.REMOTE)).isEqualTo(25); } /** @@ -141,15 +138,15 @@ public class XmlConfigIntegrationTests extends AbstractEmbeddedCassandraIntegrat SocketOptions socketOptions = cluster.getConfiguration().getSocketOptions(); - assertThat(socketOptions, is(notNullValue(SocketOptions.class))); - assertThat(socketOptions.getConnectTimeoutMillis(), is(equalTo(5000))); - assertThat(socketOptions.getKeepAlive(), is(true)); - assertThat(socketOptions.getReadTimeoutMillis(), is(equalTo(60000))); - assertThat(socketOptions.getReceiveBufferSize(), is(equalTo(65536))); - assertThat(socketOptions.getReuseAddress(), is(true)); - assertThat(socketOptions.getSendBufferSize(), is(equalTo(65536))); - assertThat(socketOptions.getSoLinger(), is(equalTo(60))); - assertThat(socketOptions.getTcpNoDelay(), is(true)); + assertThat(socketOptions).isNotNull(); + assertThat(socketOptions.getConnectTimeoutMillis()).isEqualTo(5000); + assertThat(socketOptions.getKeepAlive()).isTrue(); + assertThat(socketOptions.getReadTimeoutMillis()).isEqualTo(60000); + assertThat(socketOptions.getReceiveBufferSize()).isEqualTo(65536); + assertThat(socketOptions.getReuseAddress()).isTrue(); + assertThat(socketOptions.getSendBufferSize()).isEqualTo(65536); + assertThat(socketOptions.getSoLinger()).isEqualTo(60); + assertThat(socketOptions.getTcpNoDelay()).isTrue(); } public static class TestClusterBuilderConfigurer implements ClusterBuilderConfigurer { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/CqlOperationsIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/CqlOperationsIntegrationTests.java old mode 100644 new mode 100755 index caf80139d..df397f7c8 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/CqlOperationsIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/CqlOperationsIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.test.integration.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; import java.util.LinkedList; @@ -31,22 +30,7 @@ import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cassandra.core.ConsistencyLevel; -import org.springframework.cassandra.core.CqlOperations; -import org.springframework.cassandra.core.CqlTemplate; -import org.springframework.cassandra.core.HostMapper; -import org.springframework.cassandra.core.PreparedStatementBinder; -import org.springframework.cassandra.core.PreparedStatementCallback; -import org.springframework.cassandra.core.PreparedStatementCreator; -import org.springframework.cassandra.core.QueryOptions; -import org.springframework.cassandra.core.ResultSetExtractor; -import org.springframework.cassandra.core.RetryPolicy; -import org.springframework.cassandra.core.RingMember; -import org.springframework.cassandra.core.RowCallbackHandler; -import org.springframework.cassandra.core.RowIterator; -import org.springframework.cassandra.core.RowMapper; -import org.springframework.cassandra.core.SessionCallback; -import org.springframework.cassandra.core.WriteOptions; +import org.springframework.cassandra.core.*; import org.springframework.cassandra.core.keyspace.CreateTableSpecification; import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.dao.DataAccessException; @@ -106,7 +90,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg * There must be 1 node in the cluster if the embedded server is * running. */ - assertNotNull(ring); + assertThat(ring).isNotNull(); } @Test @@ -130,8 +114,8 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg }); - assertNotNull(ring); - assertTrue(ring.size() > 0); + assertThat(ring).isNotNull(); + assertThat(ring.size() > 0).isTrue(); for (MyHost h : ring) { log.info("hostMapperTest Host -> " + h.someName); @@ -356,7 +340,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg @Override public Book extractData(ResultSet rs) throws DriverException, DataAccessException { Row r = rs.one(); - assertNotNull(r); + assertThat(r).isNotNull(); Book b = rowToBook(r); @@ -382,7 +366,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg @Override public Book extractData(ResultSet rs) throws DriverException, DataAccessException { Row r = rs.one(); - assertNotNull(r); + assertThat(r).isNotNull(); Book b = rowToBook(r); @@ -412,7 +396,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg @Override public Book extractData(ResultSet rs) throws DriverException, DataAccessException { Row r = rs.one(); - assertNotNull(r); + assertThat(r).isNotNull(); Book b = rowToBook(r); @@ -503,7 +487,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg @Override public void processRow(Row row) throws DriverException { - assertNotNull(row); + assertThat(row).isNotNull(); Book b = rowToBook(row); assertBook(b1, b); @@ -526,14 +510,14 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg ResultSetFuture rsf = cqlTemplate.queryAsynchronously("select * from book where isbn='" + isbn + "'", options); ResultSet rs = rsf.getUninterruptibly(); - assertNotNull(rs); + assertThat(rs).isNotNull(); cqlTemplate.process(rs, new RowCallbackHandler() { @Override public void processRow(Row row) throws DriverException { - assertNotNull(row); + assertThat(row).isNotNull(); Book b = rowToBook(row); assertBook(b1, b); } @@ -557,7 +541,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg } }); - assertEquals(books.size(), 3); + assertThat(3).isEqualTo(books.size()); assertBook(books.get(0), getBook(books.get(0).getIsbn())); assertBook(books.get(1), getBook(books.get(1).getIsbn())); assertBook(books.get(2), getBook(books.get(2).getIsbn())); @@ -572,7 +556,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg ResultSetFuture rsf = cqlTemplate.queryAsynchronously("select * from book where isbn in ('1234','2345','3456')"); ResultSet rs = rsf.getUninterruptibly(); - assertNotNull(rs); + assertThat(rs).isNotNull(); List books = cqlTemplate.process(rs, new RowMapper() { @@ -583,7 +567,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg } }); - assertEquals(books.size(), 3); + assertThat(3).isEqualTo(books.size()); assertBook(books.get(0), getBook(books.get(0).getIsbn())); assertBook(books.get(1), getBook(books.get(1).getIsbn())); assertBook(books.get(2), getBook(books.get(2).getIsbn())); @@ -602,7 +586,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg } }); - assertNotNull(book); + assertThat(book).isNotNull(); assertBook(book, getBook(ISBN_NINES)); } @@ -634,7 +618,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg ResultSetFuture rsf = cqlTemplate.queryAsynchronously("select * from book where isbn in ('" + ISBN_NINES + "')"); ResultSet rs = rsf.getUninterruptibly(); - assertNotNull(rs); + assertThat(rs).isNotNull(); Book book = cqlTemplate.processOne(rs, new RowMapper() { @Override @@ -644,7 +628,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg } }); - assertNotNull(book); + assertThat(book).isNotNull(); assertBook(book, getBook(ISBN_NINES)); } @@ -654,7 +638,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg String title = cqlTemplate.queryForObject("select title from book where isbn in ('" + ISBN_NINES + "')", String.class); - assertEquals(title, TITLE_NINES); + assertThat(TITLE_NINES).isEqualTo(title); } @@ -674,12 +658,12 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg .queryAsynchronously("select title from book where isbn in ('" + ISBN_NINES + "')"); ResultSet rs = rsf.getUninterruptibly(); - assertNotNull(rs); + assertThat(rs).isNotNull(); String title = cqlTemplate.processOne(rs, String.class); - assertNotNull(title); - assertEquals(title, TITLE_NINES); + assertThat(title).isNotNull(); + assertThat(TITLE_NINES).isEqualTo(title); } @Test @@ -699,7 +683,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg ResultSetFuture rsf = cqlTemplate.queryAsynchronously("select * from book where isbn in ('" + ISBN_NINES + "')"); ResultSet rs = rsf.getUninterruptibly(); - assertNotNull(rs); + assertThat(rs).isNotNull(); Map rsMap = cqlTemplate.processMap(rs); @@ -718,8 +702,8 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg List titles = cqlTemplate.queryForList("select title from book where isbn in ('1234','2345','3456')", String.class); - assertNotNull(titles); - assertEquals(titles.size(), 3); + assertThat(titles).isNotNull(); + assertThat(3).isEqualTo(titles.size()); } @Test @@ -731,11 +715,11 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg ResultSetFuture rsf = cqlTemplate.queryAsynchronously("select * from book where isbn in ('1234','2345','3456')"); ResultSet rs = rsf.getUninterruptibly(); - assertNotNull(rs); + assertThat(rs).isNotNull(); List titles = cqlTemplate.processList(rs, String.class); - assertNotNull(titles); - assertEquals(titles.size(), 3); + assertThat(titles).isNotNull(); + assertThat(3).isEqualTo(titles.size()); } @Test @@ -747,7 +731,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg List> results = cqlTemplate .queryForListOfMap("select * from book where isbn in ('1234','2345','3456')"); - assertEquals(results.size(), 3); + assertThat(3).isEqualTo(results.size()); } @@ -761,11 +745,11 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg ResultSet rs = rsf.getUninterruptibly(); - assertNotNull(rs); + assertThat(rs).isNotNull(); List> results = cqlTemplate.processListOfMap(rs); - assertEquals(results.size(), 3); + assertThat(3).isEqualTo(results.size()); } @@ -783,7 +767,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg } }); - assertNotNull(statement); + assertThat(statement).isNotNull(); } @@ -807,7 +791,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg } }); - assertNotNull(statement); + assertThat(statement).isNotNull(); } @@ -828,7 +812,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg @Override public Book extractData(ResultSet rs) throws DriverException, DataAccessException { Row r = rs.one(); - assertNotNull(r); + assertThat(r).isNotNull(); Book b = rowToBook(r); @@ -891,7 +875,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg Book b2 = getBook(isbn); - assertEquals(books.size(), 1); + assertThat(1).isEqualTo(books.size()); assertBook(books.get(0), b2); } @@ -923,7 +907,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg } }); - assertTrue(books.size() > 0); + assertThat(books.size() > 0).isTrue(); } @Test @@ -971,7 +955,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg } }); - assertTrue(books.size() > 0); + assertThat(books.size() > 0).isTrue(); } @Test @@ -1008,7 +992,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg Book b2 = getBook(isbn); - assertEquals(books.size(), 1); + assertThat(1).isEqualTo(books.size()); assertBook(books.get(0), b2); } @@ -1070,7 +1054,7 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg Book b2 = getBook(isbn); - assertEquals(books.size(), 1); + assertThat(1).isEqualTo(books.size()); assertBook(books.get(0), b2); } @@ -1102,13 +1086,13 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg ResultSet oneByOneResultSet = cqlTemplate.query(cql, QueryOptions.builder().fetchSize(1).build()); - assertThat(oneByOneResultSet.isFullyFetched(), is(false)); - assertThat(oneByOneResultSet.getAvailableWithoutFetching(), is(1)); + assertThat(oneByOneResultSet.isFullyFetched()).isFalse(); + assertThat(oneByOneResultSet.getAvailableWithoutFetching()).isEqualTo(1); ResultSet fullResultSet = cqlTemplate.query(cql, QueryOptions.builder().fetchSize(10).build()); - assertThat(fullResultSet.isFullyFetched(), is(true)); - assertThat(fullResultSet.getAvailableWithoutFetching(), is(4)); + assertThat(fullResultSet.isFullyFetched()).isTrue(); + assertThat(fullResultSet.getAvailableWithoutFetching()).isEqualTo(4); } /** @@ -1119,10 +1103,10 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg */ private void assertBook(Book b, Object... orderedElements) { - assertEquals(b.getIsbn(), orderedElements[0]); - assertEquals(b.getTitle(), orderedElements[1]); - assertEquals(b.getAuthor(), orderedElements[2]); - assertEquals(b.getPages(), orderedElements[3]); + assertThat(orderedElements[0]).isEqualTo(b.getIsbn()); + assertThat(orderedElements[1]).isEqualTo(b.getTitle()); + assertThat(orderedElements[2]).isEqualTo(b.getAuthor()); + assertThat(orderedElements[3]).isEqualTo(b.getPages()); } @@ -1158,10 +1142,10 @@ public class CqlOperationsIntegrationTests extends AbstractKeyspaceCreatingInteg */ public static void assertBook(Book b1, Book b2) { - assertEquals(b1.getIsbn(), b2.getIsbn()); - assertEquals(b1.getTitle(), b2.getTitle()); - assertEquals(b1.getAuthor(), b2.getAuthor()); - assertEquals(b1.getPages(), b2.getPages()); + assertThat(b2.getIsbn()).isEqualTo(b1.getIsbn()); + assertThat(b2.getTitle()).isEqualTo(b1.getTitle()); + assertThat(b2.getAuthor()).isEqualTo(b1.getAuthor()); + assertThat(b2.getPages()).isEqualTo(b1.getPages()); } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/async/AsynchronousCqlOperationsIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/async/AsynchronousCqlOperationsIntegrationTests.java old mode 100644 new mode 100755 index d984204e7..d7f6ca45b --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/async/AsynchronousCqlOperationsIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/async/AsynchronousCqlOperationsIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.test.integration.core.async; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.cassandra.core.keyspace.CreateTableSpecification.*; import java.util.ArrayList; @@ -29,22 +29,13 @@ import java.util.concurrent.CancellationException; import org.junit.Before; import org.junit.Test; -import org.springframework.cassandra.core.AsynchronousQueryListener; -import org.springframework.cassandra.core.Cancellable; -import org.springframework.cassandra.core.ConsistencyLevel; -import org.springframework.cassandra.core.CqlOperations; -import org.springframework.cassandra.core.CqlTemplate; -import org.springframework.cassandra.core.QueryForListOfMapListener; -import org.springframework.cassandra.core.QueryForMapListener; -import org.springframework.cassandra.core.QueryForObjectListener; -import org.springframework.cassandra.core.QueryOptions; -import org.springframework.cassandra.core.RetryPolicy; +import org.springframework.cassandra.core.*; import org.springframework.cassandra.support.exception.CassandraConnectionFailureException; import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.cassandra.test.integration.support.QueryListener; import org.springframework.cassandra.test.integration.support.ListOfMapListener; import org.springframework.cassandra.test.integration.support.MapListener; import org.springframework.cassandra.test.integration.support.ObjectListener; +import org.springframework.cassandra.test.integration.support.QueryListener; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -113,8 +104,8 @@ public class AsynchronousCqlOperationsIntegrationTests extends AbstractKeyspaceC public static void assertMapEquals(Map expected, Map actual) { for (Object key : expected.keySet()) { - assertTrue(actual.containsKey(key)); - assertEquals(expected.get(key), actual.get(key)); + assertThat(actual.containsKey(key)).isTrue(); + assertThat(actual.get(key)).isEqualTo(expected.get(key)); } } @@ -133,8 +124,8 @@ public class AsynchronousCqlOperationsIntegrationTests extends AbstractKeyspaceC } void assertBook(Book expected, Book actual) { - assertEquals(expected.isbn, actual.isbn); - assertEquals(expected.title, actual.title); + assertThat(actual.isbn).isEqualTo(expected.isbn); + assertThat(actual.title).isEqualTo(expected.title); } /** @@ -182,7 +173,7 @@ public class AsynchronousCqlOperationsIntegrationTests extends AbstractKeyspaceC if (listener.getException() != null) { throw listener.getException(); } - assertEquals(expected, listener.getResult()); + assertThat(listener.getResult()).isEqualTo(expected); } } @@ -213,7 +204,8 @@ public class AsynchronousCqlOperationsIntegrationTests extends AbstractKeyspaceC } /** - * Tests that test {@link QueryForMapListener} should create an anonymous subclass of this class then call or {@link #test(int)} + * Tests that test {@link QueryForMapListener} should create an anonymous subclass of this class then call or + * {@link #test(int)} */ abstract class QueryForListListenerTestTemplate { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java index a912913de..096fc9e74 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java @@ -15,8 +15,7 @@ */ package org.springframework.cassandra.test.integration.core.cql.generator; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.springframework.cassandra.core.keyspace.IndexDescriptor; @@ -44,8 +43,8 @@ public class CqlIndexSpecificationAssertions { IndexMetadata indexMetadata = tableMetadata.getIndex(expected.getName().toCql()); - assertThat(indexMetadata, is(not(nullValue()))); - assertThat(indexMetadata.getName(), is(equalTo(expected.getName().toCql()))); + assertThat(indexMetadata).isNotNull(); + assertThat(indexMetadata.getName()).isEqualTo(expected.getName().toCql()); } /** @@ -61,6 +60,6 @@ public class CqlIndexSpecificationAssertions { IndexMetadata indexMetadata = tableMetadata.getIndex(expected.getName().toCql()); - assertThat(indexMetadata, is(nullValue())); + assertThat(indexMetadata).isNull(); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java index dfc312e62..d2ea69f0e 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.test.integration.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.AssertionsForInterfaceTypes.*; import java.util.Map; @@ -34,17 +34,17 @@ public class CqlKeyspaceSpecificationAssertions { public static void assertKeyspace(KeyspaceDescriptor expected, String keyspace, Session session) { KeyspaceMetadata kmd = session.getCluster().getMetadata().getKeyspace(keyspace.toLowerCase()); - assertEquals(expected.getName(), kmd.getName()); + assertThat(expected.getName()).isEqualTo(kmd.getName()); Map options = kmd.getReplication(); Map expectedOptions = expected.getOptions(); Map replicationMap = (Map) expectedOptions.get("replication"); - assertEquals(replicationMap.size(), options.size()); + assertThat(replicationMap).hasSameSizeAs(options); for (Map.Entry optionEntry : replicationMap.entrySet()) { String optionValue = options.get(optionEntry.getKey().getName()); String repMapValue = "" + optionEntry.getValue(); - assertTrue(optionValue.endsWith(repMapValue)); + assertThat(optionValue).endsWith(repMapValue); } } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java index 7d879340b..029e4305f 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java @@ -15,7 +15,7 @@ */ package org.springframework.cassandra.test.integration.core.cql.generator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.List; import java.util.Map; @@ -49,7 +49,7 @@ public class CqlTableSpecificationAssertions { TableMetadata tmd = session.getCluster().getMetadata().getKeyspace(keyspace.toLowerCase()) .getTable(expected.getName().getUnquoted()); // TODO: talk to Datastax about unquoting - assertEquals(expected.getName().getUnquoted(), tmd.getName()); // TODO: talk to Datastax + assertThat(expected.getName().getUnquoted()).isEqualTo(tmd.getName()); // TODO: talk to Datastax assertPartitionKeyColumns(expected, tmd); assertPrimaryKeyColumns(expected, tmd); assertColumns(expected.getColumns(), tmd.getColumns()); @@ -60,7 +60,7 @@ public class CqlTableSpecificationAssertions { TableMetadata tmd = session.getCluster().getMetadata().getKeyspace(keyspace.toLowerCase()) .getTable(expected.getName().toCql()); - assertNull(tmd); + assertThat(tmd).isNull(); } public static void assertPartitionKeyColumns(TableDescriptor expected, TableMetadata actual) { @@ -101,7 +101,7 @@ public class CqlTableSpecificationAssertions { case BLOOM_FILTER_FP_CHANCE: case READ_REPAIR_CHANCE: case DCLOCAL_READ_REPAIR_CHANCE: - assertEquals((Double) expected, (Double) actual, DELTA); + assertThat((Double) expected).isCloseTo((Double) actual, offset(DELTA)); return; case CACHING: @@ -119,8 +119,9 @@ public class CqlTableSpecificationAssertions { log.info(actual.getClass().getName()); - assertEquals(expected, - tableOption.quotesValue() && !(actual instanceof CharSequence) ? CqlStringUtils.singleQuote(actual) : actual); + assertThat( + tableOption.quotesValue() && !(actual instanceof CharSequence) ? CqlStringUtils.singleQuote(actual) : actual) + .isEqualTo(expected); } public static void assertCaching(Map expected, Map actual) { @@ -178,7 +179,7 @@ public class CqlTableSpecificationAssertions { } public static void assertColumn(ColumnSpecification expected, ColumnMetadata actual) { - assertEquals(expected.getName().toCql(), actual.getName()); // TODO: expected.getName().getUnquoted()? - assertEquals(expected.getType(), actual.getType()); + assertThat(expected.getName().toCql()).isEqualTo(actual.getName()); // TODO: expected.getName().getUnquoted()? + assertThat(expected.getType()).isEqualTo(actual.getType()); } } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java old mode 100644 new mode 100755 index 117efe299..f64b4eb09 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java @@ -38,8 +38,7 @@ public class TableLifecycleIntegrationTests extends AbstractKeyspaceCreatingInte private final static Logger log = LoggerFactory.getLogger(TableLifecycleIntegrationTests.class); - CreateTableCqlGeneratorUnitTests.MultipleOptionsTest createTableTest = - new CreateTableCqlGeneratorUnitTests.MultipleOptionsTest(); + CreateTableCqlGeneratorUnitTests.MultipleOptionsTest createTableTest = new CreateTableCqlGeneratorUnitTests.MultipleOptionsTest(); @Before public void setUp() throws Exception { @@ -67,7 +66,6 @@ public class TableLifecycleIntegrationTests extends AbstractKeyspaceCreatingInte assertNoTable(dropTest.specification, keyspace, session); } - public class DropTableTest extends DropTableCqlGeneratorUnitTests.DropTableTest { @Override diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListListener.java index 476eeb9b5..5f79c7917 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListListener.java @@ -33,8 +33,7 @@ public class ListListener extends CallbackSynchronizationSupport implements Q /** * Allow instances only using {@link #create()} */ - private ListListener() { - } + private ListListener() {} /** * @return a new {@link QueryForListListener}. diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListOfMapListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListOfMapListener.java index 1f281c448..41142980f 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListOfMapListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListOfMapListener.java @@ -36,8 +36,7 @@ public class ListOfMapListener extends CallbackSynchronizationSupport implements /** * Allow instances only using {@link #create()} */ - private ListOfMapListener() { - } + private ListOfMapListener() {} /** * @return a new {@link QueryForListListener}. diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/MapListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/MapListener.java index a4012f3cf..5d0cbcfab 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/MapListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/MapListener.java @@ -33,8 +33,7 @@ public class MapListener extends CallbackSynchronizationSupport implements Query /** * Allow instances only using {@link #create()} */ - private MapListener() { - } + private MapListener() {} /** * @return a new {@link MapListener}. diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ObjectListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ObjectListener.java index ba33329e8..64649c6ac 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ObjectListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ObjectListener.java @@ -32,8 +32,7 @@ public class ObjectListener extends CallbackSynchronizationSupport implements /** * Allow instances only using {@link #create()} */ - private ObjectListener() { - } + private ObjectListener() {} /** * @return a new {@link ObjectListener}. diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/QueryListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/QueryListener.java index 4b3786fc9..f9749a1a7 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/QueryListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/QueryListener.java @@ -33,8 +33,7 @@ public class QueryListener extends CallbackSynchronizationSupport implements Asy /** * Allow instances only using {@link #create()} */ - private QueryListener() { - } + private QueryListener() {} /** * @return a new {@link QueryListener}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/RowMockUtil.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/RowMockUtil.java index 24f6fd178..607fde774 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/RowMockUtil.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/RowMockUtil.java @@ -15,7 +15,8 @@ */ package org.springframework.data.cassandra; -import static org.mockito.Matchers.*; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.*; import org.mockito.invocation.InvocationOnMock; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBeanUnitTests.java old mode 100644 new mode 100755 index ff47a3b42..b4108fd27 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBeanUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBeanUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.data.cassandra.config; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -61,17 +60,13 @@ import com.datastax.driver.core.TableMetadata; @RunWith(MockitoJUnitRunner.class) public class CassandraSessionFactoryBeanUnitTests { - @Rule - public ExpectedException exception = ExpectedException.none(); + @Rule public ExpectedException exception = ExpectedException.none(); - @Mock - private CassandraConverter mockConverter; + @Mock private CassandraConverter mockConverter; - @Mock - private Cluster mockCluster; + @Mock private Cluster mockCluster; - @Mock - private Session mockSession; + @Mock private Session mockSession; private CassandraSessionFactoryBean factoryBean; @@ -93,7 +88,7 @@ public class CassandraSessionFactoryBeanUnitTests { doAnswer(new Answer() { @Override public Void answer(InvocationOnMock invocationOnMock) throws Throwable { - assertThat(factoryBean.getSchemaAction(), is(equalTo(SchemaAction.RECREATE))); + assertThat(factoryBean.getSchemaAction()).isEqualTo(SchemaAction.RECREATE); return null; } }).when(factoryBean).performSchemaAction(); @@ -101,13 +96,13 @@ public class CassandraSessionFactoryBeanUnitTests { factoryBean.setConverter(mockConverter); factoryBean.setSchemaAction(SchemaAction.RECREATE); - assertThat(factoryBean.getConverter(), is(equalTo(mockConverter))); - assertThat(factoryBean.getSchemaAction(), is(equalTo(SchemaAction.RECREATE))); + assertThat(factoryBean.getConverter()).isEqualTo(mockConverter); + assertThat(factoryBean.getSchemaAction()).isEqualTo(SchemaAction.RECREATE); factoryBean.afterPropertiesSet(); - assertThat(factoryBean.getCassandraAdminOperations(), is(notNullValue(CassandraAdminOperations.class))); - assertThat(factoryBean.getObject(), is(equalTo(mockSession))); + assertThat(factoryBean.getCassandraAdminOperations()).isNotNull(); + assertThat(factoryBean.getObject()).isEqualTo(mockSession); verify(factoryBean, times(1)).performSchemaAction(); } @@ -115,7 +110,6 @@ public class CassandraSessionFactoryBeanUnitTests { @Test public void afterPropertiesSetThrowsIllegalStateExceptionWhenConverterIsNull() throws Exception { exception.expect(IllegalStateException.class); - exception.expectCause(is(nullValue(Throwable.class))); exception.expectMessage("Converter was not properly initialized"); factoryBean.setCluster(mockCluster); @@ -128,16 +122,16 @@ public class CassandraSessionFactoryBeanUnitTests { doAnswer(new Answer() { @Override public Void answer(InvocationOnMock invocationOnMock) throws Throwable { - assertThat(invocationOnMock.getArgumentAt(0, Boolean.class), is(equalTo(dropTables))); - assertThat(invocationOnMock.getArgumentAt(1, Boolean.class), is(equalTo(dropUnused))); - assertThat(invocationOnMock.getArgumentAt(2, Boolean.class), is(equalTo(ifNotExists))); + assertThat(invocationOnMock.getArgumentAt(0, Boolean.class)).isEqualTo(dropTables); + assertThat(invocationOnMock.getArgumentAt(1, Boolean.class)).isEqualTo(dropUnused); + assertThat(invocationOnMock.getArgumentAt(2, Boolean.class)).isEqualTo(ifNotExists); return null; } }).when(factoryBean).createTables(anyBoolean(), anyBoolean(), anyBoolean()); factoryBean.setSchemaAction(schemaAction); - assertThat(factoryBean.getSchemaAction(), is(equalTo(schemaAction))); + assertThat(factoryBean.getSchemaAction()).isEqualTo(schemaAction); factoryBean.performSchemaAction(); @@ -146,26 +140,26 @@ public class CassandraSessionFactoryBeanUnitTests { @Test public void performsSchemaActionCreatesTablesWithDefaults() { - performSchemaActionCallsCreateTableWithArgumentsMatchingTheSchemaAction(SchemaAction.CREATE, - DEFAULT_DROP_TABLES, DEFAULT_DROP_UNUSED_TABLES, DEFAULT_CREATE_IF_NOT_EXISTS); + performSchemaActionCallsCreateTableWithArgumentsMatchingTheSchemaAction(SchemaAction.CREATE, DEFAULT_DROP_TABLES, + DEFAULT_DROP_UNUSED_TABLES, DEFAULT_CREATE_IF_NOT_EXISTS); } @Test public void performsSchemaActionCreatesTablesIfNotExists() { performSchemaActionCallsCreateTableWithArgumentsMatchingTheSchemaAction(SchemaAction.CREATE_IF_NOT_EXISTS, - DEFAULT_DROP_TABLES, DEFAULT_DROP_UNUSED_TABLES, true); + DEFAULT_DROP_TABLES, DEFAULT_DROP_UNUSED_TABLES, true); } @Test public void performsSchemaActionRecreatesTables() { performSchemaActionCallsCreateTableWithArgumentsMatchingTheSchemaAction(SchemaAction.RECREATE, true, - DEFAULT_DROP_UNUSED_TABLES, DEFAULT_CREATE_IF_NOT_EXISTS); + DEFAULT_DROP_UNUSED_TABLES, DEFAULT_CREATE_IF_NOT_EXISTS); } @Test public void performsSchemaActionRecreatesAndDropsUnusedTables() { - performSchemaActionCallsCreateTableWithArgumentsMatchingTheSchemaAction(SchemaAction.RECREATE_DROP_UNUSED, - true, true, DEFAULT_CREATE_IF_NOT_EXISTS); + performSchemaActionCallsCreateTableWithArgumentsMatchingTheSchemaAction(SchemaAction.RECREATE_DROP_UNUSED, true, + true, DEFAULT_CREATE_IF_NOT_EXISTS); } @Test @@ -180,7 +174,7 @@ public class CassandraSessionFactoryBeanUnitTests { factoryBean.setSchemaAction(SchemaAction.NONE); - assertThat(factoryBean.getSchemaAction(), is(equalTo(SchemaAction.NONE))); + assertThat(factoryBean.getSchemaAction()).isEqualTo(SchemaAction.NONE); factoryBean.performSchemaAction(); @@ -200,17 +194,17 @@ public class CassandraSessionFactoryBeanUnitTests { doReturn(mockSession).when(factoryBean).getObject(); when(mockCluster.getMetadata()).thenReturn(mockMetadata); when(mockMetadata.getKeyspace(eq("TestKeyspace"))).thenReturn(mockKeyspaceMetadata); - when(mockKeyspaceMetadata.getTables()).thenReturn(Collections.emptyList()); + when(mockKeyspaceMetadata.getTables()).thenReturn(Collections. emptyList()); when(mockConverter.getMappingContext()).thenReturn(mockMappingContext); - when(mockMappingContext.getNonPrimaryKeyEntities()).thenReturn( - Collections.>singletonList(mockPersistentEntity)); + when(mockMappingContext.getNonPrimaryKeyEntities()) + .thenReturn(Collections.> singletonList(mockPersistentEntity)); when(mockPersistentEntity.getTableName()).thenReturn(newCqlIdentifier("TestTable")); when(mockPersistentEntity.getType()).thenReturn(Person.class); factoryBean.setConverter(mockConverter); factoryBean.setKeyspaceName("TestKeyspace"); - assertThat(factoryBean.getConverter(), is(equalTo(mockConverter))); + assertThat(factoryBean.getConverter()).isEqualTo(mockConverter); factoryBean.createTables(true, false, false); @@ -223,7 +217,7 @@ public class CassandraSessionFactoryBeanUnitTests { verify(mockPersistentEntity, times(1)).getTableName(); verify(mockPersistentEntity, times(1)).getType(); verify(mockCassandraAdminOperations, times(1)).createTable(eq(false), eq(newCqlIdentifier("TestTable")), - eq(Person.class), isNull(Map.class)); + eq(Person.class), isNull(Map.class)); } @Test @@ -236,15 +230,15 @@ public class CassandraSessionFactoryBeanUnitTests { doReturn(mockCassandraAdminOperations).when(factoryBean).getCassandraAdminOperations(); doReturn(mockSession).when(factoryBean).getObject(); when(mockConverter.getMappingContext()).thenReturn(mockMappingContext); - when(mockMappingContext.getNonPrimaryKeyEntities()).thenReturn( - Collections.>singletonList(mockPersistentEntity)); + when(mockMappingContext.getNonPrimaryKeyEntities()) + .thenReturn(Collections.> singletonList(mockPersistentEntity)); when(mockPersistentEntity.getTableName()).thenReturn(newCqlIdentifier("TestTable")); when(mockPersistentEntity.getType()).thenReturn(Person.class); factoryBean.setConverter(mockConverter); factoryBean.setKeyspaceName("TestKeyspace"); - assertThat(factoryBean.getConverter(), is(equalTo(mockConverter))); + assertThat(factoryBean.getConverter()).isEqualTo(mockConverter); factoryBean.createTables(false, false, true); @@ -255,7 +249,7 @@ public class CassandraSessionFactoryBeanUnitTests { verify(mockPersistentEntity, times(1)).getTableName(); verify(mockPersistentEntity, times(1)).getType(); verify(mockCassandraAdminOperations, times(1)).createTable(eq(true), eq(newCqlIdentifier("TestTable")), - eq(Person.class), isNull(Map.class)); + eq(Person.class), isNull(Map.class)); } @Test @@ -267,7 +261,6 @@ public class CassandraSessionFactoryBeanUnitTests { when(mockMetadata.getKeyspace(anyString())).thenReturn(null); exception.expect(IllegalStateException.class); - exception.expectCause(is(nullValue(Throwable.class))); exception.expectMessage("keyspace [TestKeyspace] does not exist"); factoryBean.setKeyspaceName("TestKeyspace"); @@ -283,16 +276,15 @@ public class CassandraSessionFactoryBeanUnitTests { @Test public void setAndGetConverter() { - assertThat(factoryBean.getConverter(), is(nullValue())); + assertThat(factoryBean.getConverter()).isNull(); factoryBean.setConverter(mockConverter); - assertThat(factoryBean.getConverter(), is(equalTo(mockConverter))); + assertThat(factoryBean.getConverter()).isEqualTo(mockConverter); verifyZeroInteractions(mockConverter); } @Test public void setConverterToNull() { exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); exception.expectMessage("CassandraConverter must not be null"); factoryBean.setConverter(null); @@ -300,23 +292,21 @@ public class CassandraSessionFactoryBeanUnitTests { @Test public void setAndGetSchemaAction() { - assertThat(factoryBean.getSchemaAction(), is(equalTo(SchemaAction.NONE))); + assertThat(factoryBean.getSchemaAction()).isEqualTo(SchemaAction.NONE); factoryBean.setSchemaAction(SchemaAction.CREATE); - assertThat(factoryBean.getSchemaAction(), is(equalTo(SchemaAction.CREATE))); + assertThat(factoryBean.getSchemaAction()).isEqualTo(SchemaAction.CREATE); factoryBean.setSchemaAction(SchemaAction.NONE); - assertThat(factoryBean.getSchemaAction(), is(equalTo(SchemaAction.NONE))); + assertThat(factoryBean.getSchemaAction()).isEqualTo(SchemaAction.NONE); } @Test public void setSchemaActionToNullThrowsIllegalArgumentException() { exception.expect(IllegalArgumentException.class); - exception.expectCause(is(nullValue(Throwable.class))); exception.expectMessage("SchemaAction must not be null"); factoryBean.setSchemaAction(null); } - static class Person { - } + static class Person {} } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests.java old mode 100644 new mode 100755 index 3f99e7885..58ea7a474 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.cassandra.config.xml; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.core.Is.is; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,7 +52,7 @@ public class CassandraNamespaceIntegrationTests extends AbstractSpringDataEmbedd Cluster cluster = applicationContext.getBean(Cluster.class); Configuration configuration = cluster.getConfiguration(); - assertThat(configuration.getProtocolOptions().getCompression(), is(Compression.SNAPPY)); + assertThat(configuration.getProtocolOptions().getCompression()).isEqualTo(Compression.SNAPPY); } /** @@ -66,14 +64,14 @@ public class CassandraNamespaceIntegrationTests extends AbstractSpringDataEmbedd Cluster cluster = applicationContext.getBean(Cluster.class); PoolingOptions poolingOptions = cluster.getConfiguration().getPoolingOptions(); - assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.LOCAL), is(101)); - assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.REMOTE), is(100)); + assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.LOCAL)).isEqualTo(101); + assertThat(poolingOptions.getMaxRequestsPerConnection(HostDistance.REMOTE)).isEqualTo(100); - assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.LOCAL), is(3)); - assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.REMOTE), is(1)); + assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.LOCAL)).isEqualTo(3); + assertThat(poolingOptions.getCoreConnectionsPerHost(HostDistance.REMOTE)).isEqualTo(1); - assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.LOCAL), is(9)); - assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.REMOTE), is(2)); + assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.LOCAL)).isEqualTo(9); + assertThat(poolingOptions.getMaxConnectionsPerHost(HostDistance.REMOTE)).isEqualTo(2); } /** @@ -85,12 +83,12 @@ public class CassandraNamespaceIntegrationTests extends AbstractSpringDataEmbedd Cluster cluster = applicationContext.getBean(Cluster.class); SocketOptions socketOptions = cluster.getConfiguration().getSocketOptions(); - assertThat(socketOptions.getConnectTimeoutMillis(), is(5000)); - assertThat(socketOptions.getKeepAlive(), is(true)); - assertThat(socketOptions.getReuseAddress(), is(true)); - assertThat(socketOptions.getTcpNoDelay(), is(true)); - assertThat(socketOptions.getSoLinger(), is(equalTo(60))); - assertThat(socketOptions.getReceiveBufferSize(), is(equalTo(65536))); - assertThat(socketOptions.getSendBufferSize(), is(equalTo(65536))); + assertThat(socketOptions.getConnectTimeoutMillis()).isEqualTo(5000); + assertThat(socketOptions.getKeepAlive()).isTrue(); + assertThat(socketOptions.getReuseAddress()).isTrue(); + assertThat(socketOptions.getTcpNoDelay()).isTrue(); + assertThat(socketOptions.getSoLinger()).isEqualTo(60); + assertThat(socketOptions.getReceiveBufferSize()).isEqualTo(65536); + assertThat(socketOptions.getSendBufferSize()).isEqualTo(65536); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/ColumnReaderUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/ColumnReaderUnitTests.java old mode 100644 new mode 100755 index 4099d0fdd..815a0a065 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/ColumnReaderUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/ColumnReaderUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.convert; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; import org.junit.Before; @@ -60,7 +60,7 @@ public class ColumnReaderUnitTests { underTest.get(NON_EXISTENT_COLUMN); fail("Expected illegal argument exception"); } catch (IllegalArgumentException e) { - assertEquals("Column does not exist in Cassandra table: " + NON_EXISTENT_COLUMN, e.getMessage()); + assertThat(e.getMessage()).isEqualTo("Column does not exist in Cassandra table: " + NON_EXISTENT_COLUMN); } } @@ -73,7 +73,7 @@ public class ColumnReaderUnitTests { underTest.get(new CqlIdentifier(NON_EXISTENT_COLUMN)); fail("Expected illegal argument exception"); } catch (IllegalArgumentException e) { - assertEquals("Column does not exist in Cassandra table: " + NON_EXISTENT_COLUMN, e.getMessage()); + assertThat(e.getMessage()).isEqualTo("Column does not exist in Cassandra table: " + NON_EXISTENT_COLUMN); } } @@ -86,7 +86,7 @@ public class ColumnReaderUnitTests { underTest.get(new CqlIdentifier(NON_EXISTENT_COLUMN), String.class); fail("Expected illegal argument exception"); } catch (IllegalArgumentException e) { - assertEquals("Column does not exist in Cassandra table: " + NON_EXISTENT_COLUMN, e.getMessage()); + assertThat(e.getMessage()).isEqualTo("Column does not exist in Cassandra table: " + NON_EXISTENT_COLUMN); } } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/ConverterRegistrationUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/ConverterRegistrationUnitTests.java old mode 100644 new mode 100755 index 159a762cb..85d7dfcda --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/ConverterRegistrationUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/ConverterRegistrationUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.data.cassandra.convert; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.data.cassandra.domain.Person; @@ -36,16 +35,16 @@ public class ConverterRegistrationUnitTests { public void considersNotExplicitlyReadingDependingOnTypes() { ConverterRegistration context = new ConverterRegistration(Person.class, String.class, false, false); - assertThat(context.isWriting(), is(true)); - assertThat(context.isReading(), is(false)); + assertThat(context.isWriting()).isTrue(); + assertThat(context.isReading()).isFalse(); context = new ConverterRegistration(String.class, Person.class, false, false); - assertThat(context.isWriting(), is(false)); - assertThat(context.isReading(), is(true)); + assertThat(context.isWriting()).isFalse(); + assertThat(context.isReading()).isTrue(); context = new ConverterRegistration(String.class, Class.class, false, false); - assertThat(context.isWriting(), is(true)); - assertThat(context.isReading(), is(true)); + assertThat(context.isWriting()).isTrue(); + assertThat(context.isReading()).isTrue(); } /** @@ -55,12 +54,12 @@ public class ConverterRegistrationUnitTests { public void forcesReadWriteOnlyIfAnnotated() { ConverterRegistration context = new ConverterRegistration(String.class, Class.class, false, true); - assertThat(context.isWriting(), is(true)); - assertThat(context.isReading(), is(false)); + assertThat(context.isWriting()).isTrue(); + assertThat(context.isReading()).isFalse(); context = new ConverterRegistration(String.class, Class.class, true, false); - assertThat(context.isWriting(), is(false)); - assertThat(context.isReading(), is(true)); + assertThat(context.isWriting()).isFalse(); + assertThat(context.isReading()).isTrue(); } /** @@ -70,7 +69,7 @@ public class ConverterRegistrationUnitTests { public void considersConverterForReadAndWriteIfBothAnnotated() { ConverterRegistration context = new ConverterRegistration(String.class, Class.class, true, true); - assertThat(context.isWriting(), is(true)); - assertThat(context.isReading(), is(true)); + assertThat(context.isWriting()).isTrue(); + assertThat(context.isReading()).isTrue(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionsUnitTests.java old mode 100644 new mode 100755 index 082b696b8..f060f9a6d --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionsUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionsUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.data.cassandra.convert; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.net.InetAddress; import java.text.DateFormat; @@ -37,7 +36,6 @@ import org.springframework.core.convert.converter.ConverterFactory; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.data.convert.WritingConverter; -import org.threeten.bp.LocalDateTime; import com.datastax.driver.core.Row; @@ -58,11 +56,11 @@ public class CustomConversionsUnitTests { CustomConversions conversions = new CustomConversions( Arrays.asList(FormatToStringConverter.INSTANCE, StringToFormatConverter.INSTANCE)); - assertThat(conversions.getCustomWriteTarget(Format.class, null), is(typeCompatibleWith(String.class))); - assertThat(conversions.getCustomWriteTarget(String.class, null), is(nullValue())); + assertThat(conversions.getCustomWriteTarget(Format.class, null)).isAssignableFrom(String.class); + assertThat(conversions.getCustomWriteTarget(String.class, null)).isNull(); - assertThat(conversions.hasCustomReadTarget(String.class, Format.class), is(true)); - assertThat(conversions.hasCustomReadTarget(String.class, Locale.class), is(false)); + assertThat(conversions.hasCustomReadTarget(String.class, Format.class)).isTrue(); + assertThat(conversions.hasCustomReadTarget(String.class, Locale.class)).isFalse(); } /** @@ -74,8 +72,8 @@ public class CustomConversionsUnitTests { CustomConversions conversions = new CustomConversions( Arrays.asList(NumberToStringConverter.INSTANCE, StringToNumberConverter.INSTANCE)); - assertThat(conversions.getCustomWriteTarget(Long.class, null), is(typeCompatibleWith(String.class))); - assertThat(conversions.hasCustomReadTarget(String.class, Long.class), is(true)); + assertThat(conversions.getCustomWriteTarget(Long.class, null)).isAssignableFrom(String.class); + assertThat(conversions.hasCustomReadTarget(String.class, Long.class)).isTrue(); } /** @@ -85,7 +83,7 @@ public class CustomConversionsUnitTests { public void considersTypesWeRegisteredConvertersForAsSimple() { CustomConversions conversions = new CustomConversions(Arrays.asList(FormatToStringConverter.INSTANCE)); - assertThat(conversions.isSimpleType(UUID.class), is(true)); + assertThat(conversions.isSimpleType(UUID.class)).isTrue(); } /** @@ -99,7 +97,7 @@ public class CustomConversionsUnitTests { CustomConversions conversions = new CustomConversions(Arrays.asList(StringToFormatConverter.INSTANCE)); conversions.registerConvertersIn(conversionService); - assertThat(conversionService.canConvert(String.class, Format.class), is(true)); + assertThat(conversionService.canConvert(String.class, Format.class)).isTrue(); } /** @@ -109,7 +107,7 @@ public class CustomConversionsUnitTests { public void doesNotConsiderTypeSimpleIfOnlyReadConverterIsRegistered() { CustomConversions conversions = new CustomConversions(Arrays.asList(StringToFormatConverter.INSTANCE)); - assertThat(conversions.isSimpleType(Format.class), is(false)); + assertThat(conversions.isSimpleType(Format.class)).isFalse(); } /** @@ -119,8 +117,8 @@ public class CustomConversionsUnitTests { public void discoversConvertersForSubtypesOfCassandraTypes() { CustomConversions conversions = new CustomConversions(Arrays.asList(StringToIntegerConverter.INSTANCE)); - assertThat(conversions.hasCustomReadTarget(String.class, Integer.class), is(true)); - assertThat(conversions.hasCustomWriteTarget(String.class, Integer.class), is(true)); + assertThat(conversions.hasCustomReadTarget(String.class, Integer.class)).isTrue(); + assertThat(conversions.hasCustomWriteTarget(String.class, Integer.class)).isTrue(); } /** @@ -130,7 +128,7 @@ public class CustomConversionsUnitTests { public void considersUUIDASimpleType() { CustomConversions conversions = new CustomConversions(); - assertThat(conversions.isSimpleType(UUID.class), is(true)); + assertThat(conversions.isSimpleType(UUID.class)).isTrue(); } /** @@ -140,7 +138,7 @@ public class CustomConversionsUnitTests { public void considersInetAddressASimpleType() { CustomConversions conversions = new CustomConversions(); - assertThat(conversions.isSimpleType(InetAddress.class), is(true)); + assertThat(conversions.isSimpleType(InetAddress.class)).isTrue(); } /** @@ -150,7 +148,7 @@ public class CustomConversionsUnitTests { public void considersRowASimpleType() { CustomConversions conversions = new CustomConversions(); - assertThat(conversions.isSimpleType(Row.class), is(true)); + assertThat(conversions.isSimpleType(Row.class)).isTrue(); } /** @@ -161,7 +159,7 @@ public class CustomConversionsUnitTests { public void favorsCustomConverterForIndeterminedTargetType() { CustomConversions conversions = new CustomConversions(Arrays.asList(DateTimeToStringConverter.INSTANCE)); - assertThat(conversions.getCustomWriteTarget(DateTime.class, null), is(equalTo((Class) String.class))); + assertThat(conversions.getCustomWriteTarget(DateTime.class, null)).isEqualTo((Class) String.class); } /** @@ -174,7 +172,7 @@ public class CustomConversionsUnitTests { GenericConversionService conversionService = new DefaultConversionService(); conversions.registerConvertersIn(conversionService); - assertThat(conversionService.convert(new DateTime(), Date.class), is(new Date(0))); + assertThat(conversionService.convert(new DateTime(), Date.class)).isEqualTo(new Date(0)); } /** @@ -184,8 +182,7 @@ public class CustomConversionsUnitTests { public void shouldSelectPropertCustomWriteTargetForCglibProxiedType() { CustomConversions conversions = new CustomConversions(Arrays.asList(FormatToStringConverter.INSTANCE)); - assertThat(conversions.getCustomWriteTarget(createProxyTypeFor(Format.class)), - is(typeCompatibleWith(String.class))); + assertThat(conversions.getCustomWriteTarget(createProxyTypeFor(Format.class))).isAssignableFrom(String.class); } /** @@ -195,7 +192,7 @@ public class CustomConversionsUnitTests { public void shouldSelectPropertyCustomReadTargetForCglibProxiedType() { CustomConversions conversions = new CustomConversions(Arrays.asList(CustomObjectToStringConverter.INSTANCE)); - assertThat(conversions.hasCustomReadTarget(createProxyTypeFor(Object.class), String.class), is(true)); + assertThat(conversions.hasCustomReadTarget(createProxyTypeFor(Object.class), String.class)).isTrue(); } /** @@ -207,7 +204,7 @@ public class CustomConversionsUnitTests { CustomConversions customConversions = new CustomConversions( Collections.singletonList(new FormatConverterFactory())); - assertThat(customConversions.getCustomWriteTarget(String.class, SimpleDateFormat.class), notNullValue()); + assertThat(customConversions.getCustomWriteTarget(String.class, SimpleDateFormat.class)).isNotNull(); } /** @@ -218,7 +215,7 @@ public class CustomConversionsUnitTests { CustomConversions customConversions = new CustomConversions(); - assertThat(customConversions.hasCustomWriteTarget(java.time.LocalDateTime.class), is(true)); + assertThat(customConversions.hasCustomWriteTarget(java.time.LocalDateTime.class)).isTrue(); } /** @@ -229,7 +226,7 @@ public class CustomConversionsUnitTests { CustomConversions customConversions = new CustomConversions(); - assertThat(customConversions.hasCustomWriteTarget(org.threeten.bp.LocalDateTime.class), is(true)); + assertThat(customConversions.hasCustomWriteTarget(org.threeten.bp.LocalDateTime.class)).isTrue(); } /** @@ -240,7 +237,7 @@ public class CustomConversionsUnitTests { CustomConversions customConversions = new CustomConversions(); - assertThat(customConversions.hasCustomWriteTarget(org.joda.time.LocalDate.class), is(true)); + assertThat(customConversions.hasCustomWriteTarget(org.joda.time.LocalDate.class)).isTrue(); } private static Class createProxyTypeFor(Class type) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java old mode 100644 new mode 100755 index 35a5efeea..10a68e086 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java @@ -16,10 +16,7 @@ package org.springframework.data.cassandra.convert; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.startsWith; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.mockito.Mockito.*; import static org.springframework.data.cassandra.RowMockUtil.*; @@ -98,14 +95,11 @@ public class MappingCassandraConverterUnitTests { private static final Version VERSION_4_3 = Version.parse("4.3"); - @Rule - public final ExpectedException expectedException = ExpectedException.none(); + @Rule public final ExpectedException expectedException = ExpectedException.none(); - @Mock - private ColumnDefinitions columnDefinitionsMock; + @Mock private ColumnDefinitions columnDefinitionsMock; - @Mock - private Row rowMock; + @Mock private Row rowMock; private CassandraMappingContext mappingContext; private MappingCassandraConverter mappingCassandraConverter; @@ -133,7 +127,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(withEnumColumns, insert); - assertThat(getValues(insert), hasItem((Object) "MINT")); + assertThat(getValues(insert)).contains("MINT"); } /** @@ -145,7 +139,6 @@ public class MappingCassandraConverterUnitTests { assumeTrue(Version.parse(SpringVersion.getVersion()).isLessThan(VERSION_4_3)); expectedException.expect(ConverterNotFoundException.class); - expectedException.expectMessage(allOf(containsString("No converter found"), containsString("java.lang.Integer"))); UnsupportedEnumToOrdinalMapping unsupportedEnumToOrdinalMapping = new UnsupportedEnumToOrdinalMapping(); unsupportedEnumToOrdinalMapping.setAsOrdinal(Condition.MINT); @@ -170,7 +163,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(unsupportedEnumToOrdinalMapping, insert); - assertThat(getValues(insert), hasItem((Object) Integer.valueOf(Condition.USED.ordinal()))); + assertThat(getValues(insert)).contains((Object) Integer.valueOf(Condition.USED.ordinal())); } /** @@ -186,7 +179,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(key, insert); - assertThat(getValues(insert), hasItem((Object) "MINT")); + assertThat(getValues(insert)).contains((Object) "MINT"); } /** @@ -205,7 +198,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(composite, insert); - assertThat(getValues(insert), hasItem((Object) "MINT")); + assertThat(getValues(insert)).contains((Object) "MINT"); } /** @@ -221,7 +214,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(withEnumColumns, update); - assertThat(getAssignmentValues(update), hasItem((Object) "MINT")); + assertThat(getAssignmentValues(update)).contains((Object) "MINT"); } /** @@ -237,7 +230,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(key, update); - assertThat(getWhereValues(update), hasItem((Object) "MINT")); + assertThat(getWhereValues(update)).contains((Object) "MINT"); } /** @@ -256,7 +249,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(composite, update); - assertThat(getWhereValues(update), hasItem((Object) "MINT")); + assertThat(getWhereValues(update)).contains((Object) "MINT"); } /** @@ -272,7 +265,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(key, where); - assertThat(getWhereValues(where), hasItem((Object) "MINT")); + assertThat(getWhereValues(where)).contains((Object) "MINT"); } /** @@ -291,7 +284,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(composite, where); - assertThat(getWhereValues(where), hasItem((Object) "MINT")); + assertThat(getWhereValues(where)).contains((Object) "MINT"); } /** @@ -304,7 +297,7 @@ public class MappingCassandraConverterUnitTests { String result = mappingCassandraConverter.readRow(String.class, rowMock); - assertThat(result, is(equalTo("foo"))); + assertThat(result).isEqualTo("foo"); } /** @@ -317,7 +310,7 @@ public class MappingCassandraConverterUnitTests { Integer result = mappingCassandraConverter.readRow(Integer.class, rowMock); - assertThat(result, is(equalTo(2))); + assertThat(result).isEqualTo(2); } /** @@ -330,7 +323,7 @@ public class MappingCassandraConverterUnitTests { Long result = mappingCassandraConverter.readRow(Long.class, rowMock); - assertThat(result, is(equalTo(2L))); + assertThat(result).isEqualTo(2L); } /** @@ -343,7 +336,7 @@ public class MappingCassandraConverterUnitTests { Double result = mappingCassandraConverter.readRow(Double.class, rowMock); - assertThat(result, is(equalTo(2D))); + assertThat(result).isEqualTo(2D); } /** @@ -356,7 +349,7 @@ public class MappingCassandraConverterUnitTests { Float result = mappingCassandraConverter.readRow(Float.class, rowMock); - assertThat(result, is(equalTo(2F))); + assertThat(result).isEqualTo(2F); } /** @@ -369,7 +362,7 @@ public class MappingCassandraConverterUnitTests { BigInteger result = mappingCassandraConverter.readRow(BigInteger.class, rowMock); - assertThat(result, is(equalTo(BigInteger.valueOf(2)))); + assertThat(result).isEqualTo(BigInteger.valueOf(2)); } /** @@ -382,7 +375,7 @@ public class MappingCassandraConverterUnitTests { BigDecimal result = mappingCassandraConverter.readRow(BigDecimal.class, rowMock); - assertThat(result, is(equalTo(BigDecimal.valueOf(2)))); + assertThat(result).isEqualTo(BigDecimal.valueOf(2)); } /** @@ -397,7 +390,7 @@ public class MappingCassandraConverterUnitTests { UUID result = mappingCassandraConverter.readRow(UUID.class, rowMock); - assertThat(result, is(equalTo(uuid))); + assertThat(result).isEqualTo(uuid); } /** @@ -412,7 +405,7 @@ public class MappingCassandraConverterUnitTests { InetAddress result = mappingCassandraConverter.readRow(InetAddress.class, rowMock); - assertThat(result, is(equalTo(localHost))); + assertThat(result).isEqualTo(localHost); } /** @@ -428,7 +421,7 @@ public class MappingCassandraConverterUnitTests { Date result = mappingCassandraConverter.readRow(Date.class, rowMock); - assertThat(result, is(equalTo(date))); + assertThat(result).isEqualTo(date); } /** @@ -443,7 +436,7 @@ public class MappingCassandraConverterUnitTests { LocalDate result = mappingCassandraConverter.readRow(LocalDate.class, rowMock); - assertThat(result, is(equalTo(date))); + assertThat(result).isEqualTo(date); } /** @@ -456,7 +449,7 @@ public class MappingCassandraConverterUnitTests { Boolean result = mappingCassandraConverter.readRow(Boolean.class, rowMock); - assertThat(result, is(equalTo(true))); + assertThat(result).isEqualTo(true); } /** @@ -473,9 +466,9 @@ public class MappingCassandraConverterUnitTests { TypeWithLocalDate result = mappingCassandraConverter.readRow(TypeWithLocalDate.class, rowMock); - assertThat(result.localDate, is(notNullValue())); - assertThat(result.localDate.getYear(), is(now.getYear())); - assertThat(result.localDate.getMonthValue(), is(now.getMonthValue())); + assertThat(result.localDate).isNotNull(); + assertThat(result.localDate.getYear()).isEqualTo(now.getYear()); + assertThat(result.localDate.getMonthValue()).isEqualTo(now.getMonthValue()); } /** @@ -493,8 +486,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(typeWithLocalDate, insert); - assertThat(getValues(insert).contains(LocalDate.fromYearMonthDay(now.getYear(), now.getMonthValue(), now.getDayOfMonth())), - is(true)); + assertThat(getValues(insert)) + .contains(LocalDate.fromYearMonthDay(now.getYear(), now.getMonthValue(), now.getDayOfMonth())); } /** @@ -512,8 +505,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(typeWithLocalDate, update); - assertThat(getAssignmentValues(update).contains(LocalDate.fromYearMonthDay(now.getYear(), now.getMonthValue(), now.getDayOfMonth())), - is(true)); + assertThat(getAssignmentValues(update)) + .contains(LocalDate.fromYearMonthDay(now.getYear(), now.getMonthValue(), now.getDayOfMonth())); } /** @@ -534,9 +527,8 @@ public class MappingCassandraConverterUnitTests { List dates = getListValue(insert); - assertThat(dates, is(notNullValue(List.class))); - assertThat(dates, hasItem(LocalDate.fromYearMonthDay(now.getYear(), now.getMonthValue(), now.getDayOfMonth()))); - assertThat(dates, hasItem(LocalDate.fromYearMonthDay(2010, 7, 4))); + assertThat(dates).contains(LocalDate.fromYearMonthDay(now.getYear(), now.getMonthValue(), now.getDayOfMonth())); + assertThat(dates).contains(LocalDate.fromYearMonthDay(2010, 7, 4)); } /** @@ -557,9 +549,8 @@ public class MappingCassandraConverterUnitTests { Set dates = getSetValue(insert); - assertThat(dates, is(notNullValue(Set.class))); - assertThat(dates, hasItem(LocalDate.fromYearMonthDay(now.getYear(), now.getMonthValue(), now.getDayOfMonth()))); - assertThat(dates, hasItem(LocalDate.fromYearMonthDay(2010, 7, 4))); + assertThat(dates).contains(LocalDate.fromYearMonthDay(now.getYear(), now.getMonthValue(), now.getDayOfMonth())); + assertThat(dates).contains(LocalDate.fromYearMonthDay(2010, 7, 4)); } /** @@ -574,10 +565,10 @@ public class MappingCassandraConverterUnitTests { TypeWithLocalDateMappedToDate result = mappingCassandraConverter.readRow(TypeWithLocalDateMappedToDate.class, rowMock); - assertThat(result.localDate, is(notNullValue())); - assertThat(result.localDate.getYear(), is(2010)); - assertThat(result.localDate.getMonthValue(), is(7)); - assertThat(result.localDate.getDayOfMonth(), is(4)); + assertThat(result.localDate).isNotNull(); + assertThat(result.localDate.getYear()).isEqualTo(2010); + assertThat(result.localDate.getMonthValue()).isEqualTo(7); + assertThat(result.localDate.getDayOfMonth()).isEqualTo(4); } /** @@ -593,7 +584,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(typeWithLocalDate, insert); - assertThat(getValues(insert).contains(LocalDate.fromYearMonthDay(2010, 7, 4)), is(true)); + assertThat(getValues(insert).contains(LocalDate.fromYearMonthDay(2010, 7, 4))).isTrue(); } /** @@ -609,7 +600,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(typeWithLocalDate, update); - assertThat(getAssignmentValues(update), contains((Object) LocalDate.fromYearMonthDay(2010, 7, 4))); + assertThat(getAssignmentValues(update)).contains(LocalDate.fromYearMonthDay(2010, 7, 4)); } /** @@ -626,9 +617,9 @@ public class MappingCassandraConverterUnitTests { TypeWithLocalDate result = mappingCassandraConverter.readRow(TypeWithLocalDate.class, rowMock); - assertThat(result.localDateTime, is(notNullValue())); - assertThat(result.localDateTime.getYear(), is(now.getYear())); - assertThat(result.localDateTime.getMinute(), is(now.getMinute())); + assertThat(result.localDateTime).isNotNull(); + assertThat(result.localDateTime.getYear()).isEqualTo(now.getYear()); + assertThat(result.localDateTime.getMinute()).isEqualTo(now.getMinute()); } /** @@ -645,8 +636,8 @@ public class MappingCassandraConverterUnitTests { TypeWithInstant result = mappingCassandraConverter.readRow(TypeWithInstant.class, rowMock); - assertThat(result.instant, is(notNullValue())); - assertThat(result.instant.getEpochSecond(), is(instant.getEpochSecond())); + assertThat(result.instant).isNotNull(); + assertThat(result.instant.getEpochSecond()).isEqualTo(instant.getEpochSecond()); } /** @@ -660,8 +651,8 @@ public class MappingCassandraConverterUnitTests { TypeWithZoneId result = mappingCassandraConverter.readRow(TypeWithZoneId.class, rowMock); - assertThat(result.zoneId, is(notNullValue())); - assertThat(result.zoneId.getId(), is(equalTo("Europe/Paris"))); + assertThat(result.zoneId).isNotNull(); + assertThat(result.zoneId.getId()).isEqualTo("Europe/Paris"); } /** @@ -673,13 +664,13 @@ public class MappingCassandraConverterUnitTests { Row rowMock = RowMockUtil.newRowMock(column("id", "my-id", DataType.ascii()), column("localDate", LocalDate.fromYearMonthDay(2010, 7, 4), DataType.date())); - TypeWithJodaLocalDateMappedToDate result = - mappingCassandraConverter.readRow(TypeWithJodaLocalDateMappedToDate.class, rowMock); + TypeWithJodaLocalDateMappedToDate result = mappingCassandraConverter + .readRow(TypeWithJodaLocalDateMappedToDate.class, rowMock); - assertThat(result.localDate, is(notNullValue())); - assertThat(result.localDate.getYear(), is(2010)); - assertThat(result.localDate.getMonthOfYear(), is(7)); - assertThat(result.localDate.getDayOfMonth(), is(4)); + assertThat(result.localDate).isNotNull(); + assertThat(result.localDate.getYear()).isEqualTo(2010); + assertThat(result.localDate.getMonthOfYear()).isEqualTo(7); + assertThat(result.localDate.getDayOfMonth()).isEqualTo(4); } /** @@ -695,7 +686,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(typeWithLocalDate, insert); - assertThat(getValues(insert).contains(LocalDate.fromYearMonthDay(2010, 7, 4)), is(true)); + assertThat(getValues(insert).contains(LocalDate.fromYearMonthDay(2010, 7, 4))).isTrue(); } /** @@ -711,7 +702,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(typeWithLocalDate, update); - assertThat(getAssignmentValues(update), contains((Object) LocalDate.fromYearMonthDay(2010, 7, 4))); + assertThat(getAssignmentValues(update)).contains(LocalDate.fromYearMonthDay(2010, 7, 4)); } /** @@ -723,13 +714,13 @@ public class MappingCassandraConverterUnitTests { Row rowMock = RowMockUtil.newRowMock(column("id", "my-id", DataType.ascii()), column("localDate", LocalDate.fromYearMonthDay(2010, 7, 4), DataType.date())); - TypeWithThreeTenBpLocalDateMappedToDate result = - mappingCassandraConverter.readRow(TypeWithThreeTenBpLocalDateMappedToDate.class, rowMock); + TypeWithThreeTenBpLocalDateMappedToDate result = mappingCassandraConverter + .readRow(TypeWithThreeTenBpLocalDateMappedToDate.class, rowMock); - assertThat(result.localDate, is(notNullValue())); - assertThat(result.localDate.getYear(), is(2010)); - assertThat(result.localDate.getMonthValue(), is(7)); - assertThat(result.localDate.getDayOfMonth(), is(4)); + assertThat(result.localDate).isNotNull(); + assertThat(result.localDate.getYear()).isEqualTo(2010); + assertThat(result.localDate.getMonthValue()).isEqualTo(7); + assertThat(result.localDate.getDayOfMonth()).isEqualTo(4); } /** @@ -745,7 +736,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(typeWithLocalDate, insert); - assertThat(getValues(insert).contains(LocalDate.fromYearMonthDay(2010, 7, 4)), is(true)); + assertThat(getValues(insert).contains(LocalDate.fromYearMonthDay(2010, 7, 4))).isTrue(); } /** @@ -761,7 +752,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(typeWithLocalDate, update); - assertThat(getAssignmentValues(update), contains((Object) LocalDate.fromYearMonthDay(2010, 7, 4))); + assertThat(getAssignmentValues(update)).contains(LocalDate.fromYearMonthDay(2010, 7, 4)); } /** @@ -780,9 +771,9 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(userToken, update); - assertThat(getAssignments(update), hasEntry("admincomment", (Object) "admin comment")); - assertThat(getAssignments(update), hasEntry("user_comment", (Object) "user comment")); - assertThat(getWherePredicates(update), hasEntry("user_id", (Object) userToken.getUserId())); + assertThat(getAssignments(update)).containsEntry("admincomment", "admin comment"); + assertThat(getAssignments(update)).containsEntry("user_comment", "user comment"); + assertThat(getWherePredicates(update)).containsEntry("user_id", userToken.getUserId()); } /** @@ -801,7 +792,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(userToken, delete.where()); - assertThat(getWherePredicates(delete), hasEntry("user_id", (Object) userToken.getUserId())); + assertThat(getWherePredicates(delete)).containsEntry("user_id", userToken.getUserId()); } /** @@ -814,7 +805,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write("42", delete.where(), mappingContext.getPersistentEntity(Person.class)); - assertThat(getWherePredicates(delete), hasEntry("id", (Object) "42")); + assertThat(getWherePredicates(delete)).containsEntry("id", "42"); } /** @@ -830,7 +821,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(person, delete.where(), mappingContext.getPersistentEntity(Person.class)); - assertThat(getWherePredicates(delete), hasEntry("id", (Object) "42")); + assertThat(getWherePredicates(delete)).containsEntry("id", "42"); } /** @@ -854,7 +845,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(id("id", "42"), delete.where(), mappingContext.getPersistentEntity(Person.class)); - assertThat(getWherePredicates(delete), hasEntry("id", (Object) "42")); + assertThat(getWherePredicates(delete)).containsEntry("id", "42"); } /** @@ -872,8 +863,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(entity, delete.where(), mappingContext.getPersistentEntity(TypeWithCompositeKey.class)); - assertThat(getWherePredicates(delete), hasEntry("firstname", (Object) "Walter")); - assertThat(getWherePredicates(delete), hasEntry("lastname", (Object) "White")); + assertThat(getWherePredicates(delete)).containsEntry("firstname", "Walter"); + assertThat(getWherePredicates(delete)).containsEntry("lastname", "White"); } /** @@ -887,8 +878,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(id("firstname", "Walter").with("lastname", "White"), delete.where(), mappingContext.getPersistentEntity(TypeWithCompositeKey.class)); - assertThat(getWherePredicates(delete), hasEntry("firstname", (Object) "Walter")); - assertThat(getWherePredicates(delete), hasEntry("lastname", (Object) "White")); + assertThat(getWherePredicates(delete)).containsEntry("firstname", "Walter"); + assertThat(getWherePredicates(delete)).containsEntry("lastname", "White"); } /** @@ -905,8 +896,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(entity, delete.where(), mappingContext.getPersistentEntity(TypeWithMapId.class)); - assertThat(getWherePredicates(delete), hasEntry("firstname", (Object) "Walter")); - assertThat(getWherePredicates(delete), hasEntry("lastname", (Object) "White")); + assertThat(getWherePredicates(delete)).containsEntry("firstname", "Walter"); + assertThat(getWherePredicates(delete)).containsEntry("lastname", "White"); } /** @@ -917,9 +908,10 @@ public class MappingCassandraConverterUnitTests { Delete delete = QueryBuilder.delete().from("table"); - mappingCassandraConverter.write(Condition.MINT, delete.where(), mappingContext.getPersistentEntity(EnumPrimaryKey.class)); + mappingCassandraConverter.write(Condition.MINT, delete.where(), + mappingContext.getPersistentEntity(EnumPrimaryKey.class)); - assertThat(getWherePredicates(delete), hasEntry("condition", (Object) "MINT")); + assertThat(getWherePredicates(delete)).containsEntry("condition", "MINT"); } /** @@ -933,8 +925,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(id("firstname", "Walter").with("lastname", "White"), delete.where(), mappingContext.getPersistentEntity(TypeWithMapId.class)); - assertThat(getWherePredicates(delete), hasEntry("firstname", (Object) "Walter")); - assertThat(getWherePredicates(delete), hasEntry("lastname", (Object) "White")); + assertThat(getWherePredicates(delete)).containsEntry("firstname", "Walter"); + assertThat(getWherePredicates(delete)).containsEntry("lastname", "White"); } /** @@ -954,8 +946,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(entity, delete.where(), mappingContext.getPersistentEntity(TypeWithKeyClass.class)); - assertThat(getWherePredicates(delete), hasEntry("firstname", (Object) "Walter")); - assertThat(getWherePredicates(delete), hasEntry("lastname", (Object) "White")); + assertThat(getWherePredicates(delete)).containsEntry("firstname", "Walter"); + assertThat(getWherePredicates(delete)).containsEntry("lastname", "White"); } /** @@ -984,8 +976,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(key, delete.where(), mappingContext.getPersistentEntity(TypeWithKeyClass.class)); - assertThat(getWherePredicates(delete), hasEntry("firstname", (Object) "Walter")); - assertThat(getWherePredicates(delete), hasEntry("lastname", (Object) "White")); + assertThat(getWherePredicates(delete)).containsEntry("firstname", "Walter"); + assertThat(getWherePredicates(delete)).containsEntry("lastname", "White"); } /** @@ -999,8 +991,8 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(id("firstname", "Walter").with("lastname", "White"), delete.where(), mappingContext.getPersistentEntity(TypeWithKeyClass.class)); - assertThat(getWherePredicates(delete), hasEntry("firstname", (Object) "Walter")); - assertThat(getWherePredicates(delete), hasEntry("lastname", (Object) "White")); + assertThat(getWherePredicates(delete)).containsEntry("firstname", "Walter"); + assertThat(getWherePredicates(delete)).containsEntry("lastname", "White"); } /** @@ -1101,11 +1093,9 @@ public class MappingCassandraConverterUnitTests { @Table public static class UnsupportedEnumToOrdinalMapping { - @PrimaryKey - private String id; + @PrimaryKey private String id; - @CassandraType(type = Name.INT) - private Condition asOrdinal; + @CassandraType(type = Name.INT) private Condition asOrdinal; public String getId() { return id; @@ -1127,8 +1117,7 @@ public class MappingCassandraConverterUnitTests { @Table public static class WithEnumColumns { - @PrimaryKey - private String id; + @PrimaryKey private String id; private Condition condition; @@ -1152,8 +1141,7 @@ public class MappingCassandraConverterUnitTests { @PrimaryKeyClass public static class EnumCompositePrimaryKey implements Serializable { - @PrimaryKeyColumn(ordinal = 1, type = PrimaryKeyType.PARTITIONED) - private Condition condition; + @PrimaryKeyColumn(ordinal = 1, type = PrimaryKeyType.PARTITIONED) private Condition condition; public EnumCompositePrimaryKey() {} @@ -1173,8 +1161,7 @@ public class MappingCassandraConverterUnitTests { @Table public static class EnumPrimaryKey { - @PrimaryKey - private Condition condition; + @PrimaryKey private Condition condition; public Condition getCondition() { return condition; @@ -1188,8 +1175,7 @@ public class MappingCassandraConverterUnitTests { @Table public static class CompositeKeyThing { - @PrimaryKey - private EnumCompositePrimaryKey key; + @PrimaryKey private EnumCompositePrimaryKey key; public CompositeKeyThing() {} @@ -1213,8 +1199,7 @@ public class MappingCassandraConverterUnitTests { @Table public static class TypeWithLocalDate { - @PrimaryKey - private String id; + @PrimaryKey private String id; java.time.LocalDate localDate; java.time.LocalDateTime localDateTime; @@ -1229,11 +1214,9 @@ public class MappingCassandraConverterUnitTests { @Table public static class TypeWithLocalDateMappedToDate { - @PrimaryKey - private String id; + @PrimaryKey private String id; - @CassandraType(type = Name.DATE) - java.time.LocalDate localDate; + @CassandraType(type = Name.DATE) java.time.LocalDate localDate; } /** @@ -1242,11 +1225,9 @@ public class MappingCassandraConverterUnitTests { @Table public static class TypeWithJodaLocalDateMappedToDate { - @PrimaryKey - private String id; + @PrimaryKey private String id; - @CassandraType(type = Name.DATE) - org.joda.time.LocalDate localDate; + @CassandraType(type = Name.DATE) org.joda.time.LocalDate localDate; } /** @@ -1255,18 +1236,15 @@ public class MappingCassandraConverterUnitTests { @Table public static class TypeWithThreeTenBpLocalDateMappedToDate { - @PrimaryKey - private String id; + @PrimaryKey private String id; - @CassandraType(type = Name.DATE) - org.threeten.bp.LocalDate localDate; + @CassandraType(type = Name.DATE) org.threeten.bp.LocalDate localDate; } @Table public static class TypeWithInstant { - @PrimaryKey - private String id; + @PrimaryKey private String id; Instant instant; } @@ -1274,8 +1252,7 @@ public class MappingCassandraConverterUnitTests { @Table public static class TypeWithZoneId { - @PrimaryKey - private String id; + @PrimaryKey private String id; ZoneId zoneId; } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java index e3d4dbc57..62fe11219 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java @@ -15,8 +15,8 @@ */ package org.springframework.data.cassandra.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -67,7 +67,7 @@ public class CassandraBatchTemplateIntegrationTests extends AbstractKeyspaceCrea Group loaded = template.selectOneById(Group.class, walter.getId()); - assertThat(loaded.getId().getUsername(), is(equalTo(walter.getId().getUsername()))); + assertThat(loaded.getId().getUsername()).isEqualTo(walter.getId().getUsername()); } /** @@ -84,7 +84,7 @@ public class CassandraBatchTemplateIntegrationTests extends AbstractKeyspaceCrea Group loaded = template.selectOneById(Group.class, walter.getId()); - assertThat(loaded.getId().getUsername(), is(equalTo(walter.getId().getUsername()))); + assertThat(loaded.getId().getUsername()).isEqualTo(walter.getId().getUsername()); } /** @@ -104,7 +104,7 @@ public class CassandraBatchTemplateIntegrationTests extends AbstractKeyspaceCrea Group loaded = template.selectOneById(Group.class, walter.getId()); - assertThat(loaded.getEmail(), is(equalTo(walter.getEmail()))); + assertThat(loaded.getEmail()).isEqualTo(walter.getEmail()); } /** @@ -124,7 +124,7 @@ public class CassandraBatchTemplateIntegrationTests extends AbstractKeyspaceCrea Group loaded = template.selectOneById(Group.class, walter.getId()); - assertThat(loaded.getEmail(), is(equalTo(walter.getEmail()))); + assertThat(loaded.getEmail()).isEqualTo(walter.getEmail()); } /** @@ -144,7 +144,7 @@ public class CassandraBatchTemplateIntegrationTests extends AbstractKeyspaceCrea FlatGroup loaded = template.selectOneById(FlatGroup.class, walter); - assertThat(loaded.getEmail(), is(equalTo(walter.getEmail()))); + assertThat(loaded.getEmail()).isEqualTo(walter.getEmail()); } /** @@ -162,7 +162,7 @@ public class CassandraBatchTemplateIntegrationTests extends AbstractKeyspaceCrea Group loaded = template.selectOneById(Group.class, walter.getId()); - assertThat(loaded, is(nullValue())); + assertThat(loaded).isNull(); } /** @@ -180,7 +180,7 @@ public class CassandraBatchTemplateIntegrationTests extends AbstractKeyspaceCrea Group loaded = template.selectOneById(Group.class, walter.getId()); - assertThat(loaded, is(nullValue())); + assertThat(loaded).isNull(); } /** @@ -202,10 +202,10 @@ public class CassandraBatchTemplateIntegrationTests extends AbstractKeyspaceCrea ResultSet resultSet = template.query("SELECT writetime(email) FROM group;"); - assertThat(resultSet.getAvailableWithoutFetching(), is(2)); + assertThat(resultSet.getAvailableWithoutFetching()).isEqualTo(2); for (Row row : resultSet) { - assertThat(row.getLong(0), is(timestamp)); + assertThat(row.getLong(0)).isEqualTo(timestamp); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateUnitTests.java index f394b4eae..266de47ce 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.data.cassandra.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Arrays; @@ -52,8 +51,7 @@ public class CassandraTemplateUnitTests { private CassandraTemplate template; - @Mock - private Session mockSession; + @Mock private Session mockSession; @Before public void setup() { @@ -67,6 +65,7 @@ public class CassandraTemplateUnitTests { protected Row mockRow(String name) { return mock(Row.class, name); } + protected CassandraConverterRowCallback newRollCallback(CassandraConverter converter, Class type) { return new CassandraConverterRowCallback(converter, type); } @@ -91,11 +90,9 @@ public class CassandraTemplateUnitTests { when(mockCassandraConverter.read(eq(Integer.class), eq(mockRowThree))).thenReturn(3); List results = template.select("SELECT * FROM Test", - newRollCallback(mockCassandraConverter, Integer.class)); + newRollCallback(mockCassandraConverter, Integer.class)); - assertThat(results, is(notNullValue(List.class))); - assertThat(results.size(), is(equalTo(3))); - assertThat(results.containsAll(Arrays.asList(1, 2, 3)), is(true)); + assertThat(results).isNotNull().hasSize(3).contains(1, 2, 3); verify(mockSession, times(1)).execute(eq("SELECT * FROM Test")); verify(mockResultSet, times(1)).iterator(); @@ -118,12 +115,9 @@ public class CassandraTemplateUnitTests { when(mockResultSet.iterator()).thenReturn(iterator(mockRow)); when(mockCassandraConverter.read(eq(String.class), eq(mockRow))).thenReturn("test"); - List results = template.select(mockSelect, - newRollCallback(mockCassandraConverter, String.class)); + List results = template.select(mockSelect, newRollCallback(mockCassandraConverter, String.class)); - assertThat(results, is(notNullValue(List.class))); - assertThat(results.size(), is(equalTo(1))); - assertThat(results, hasItem("test")); + assertThat(results).hasSize(1).contains("test"); verify(mockSession, times(1)).execute(eq(mockSelect)); verify(mockResultSet, times(1)).iterator(); @@ -139,13 +133,12 @@ public class CassandraTemplateUnitTests { ResultSet mockResultSet = mock(ResultSet.class); when(mockSession.execute(eq("SELECT * FROM Test"))).thenReturn(mockResultSet); - when(mockResultSet.iterator()).thenReturn(this.iterator()); + when(mockResultSet.iterator()).thenReturn(this. iterator()); - List results = template.select("SELECT * FROM Test", - newRollCallback(mockCassandraConverter, Object.class)); + List results = template.select("SELECT * FROM Test", newRollCallback(mockCassandraConverter, Object.class)); - assertThat(results, is(notNullValue(List.class))); - assertThat(results.isEmpty(), is(true)); + assertThat(results).isNotNull(); + assertThat(results.isEmpty()).isTrue(); verify(mockSession, times(1)).execute(eq("SELECT * FROM Test")); verify(mockResultSet, times(1)).iterator(); @@ -161,11 +154,10 @@ public class CassandraTemplateUnitTests { when(mockSession.execute(anyString())).thenReturn(null); - List results = template.select("SELECT * FROM Test", - newRollCallback(mockCassandraConverter, Object.class)); + List results = template.select("SELECT * FROM Test", newRollCallback(mockCassandraConverter, Object.class)); - assertThat(results, is(notNullValue(List.class))); - assertThat(results.isEmpty(), is(true)); + assertThat(results).isNotNull(); + assertThat(results.isEmpty()).isTrue(); verify(mockSession, times(1)).execute(eq("SELECT * FROM Test")); verifyZeroInteractions(mockCassandraConverter); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/FlatGroup.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/FlatGroup.java index ce43bf9f5..8ce380c2c 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/FlatGroup.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/FlatGroup.java @@ -15,12 +15,12 @@ */ package org.springframework.data.cassandra.domain; -import lombok.Data; - import org.springframework.cassandra.core.PrimaryKeyType; import org.springframework.data.cassandra.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.mapping.Table; +import lombok.Data; + /** * @author Mark Paluch * @see http://www.datastax.com/dev/blog/basic-rules-of-cassandra-data-modeling diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraMappingContextUnitTests.java old mode 100644 new mode 100755 index f96319fae..5cabbe15c --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraMappingContextUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraMappingContextUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.Serializable; import java.util.Collection; @@ -62,9 +61,9 @@ public class BasicCassandraMappingContextUnitTests { mappingContext.getPersistentEntity(X.class); - assertTrue(mappingContext.contains(X.class)); - assertNotNull(mappingContext.getExistingPersistentEntity(X.class)); - assertFalse(mappingContext.contains(Y.class)); + assertThat(mappingContext.contains(X.class)).isTrue(); + assertThat(mappingContext.getExistingPersistentEntity(X.class)).isNotNull(); + assertThat(mappingContext.contains(Y.class)).isFalse(); } @Table @@ -87,12 +86,12 @@ public class BasicCassandraMappingContextUnitTests { CassandraPersistentProperty idProperty = persistentEntity.getIdProperty(); - assertThat(idProperty.getColumnName().toCql(), is(equalTo("foo"))); + assertThat(idProperty.getColumnName().toCql()).isEqualTo("foo"); List columnNames = idProperty.getColumnNames(); - assertThat(columnNames, hasSize(1)); - assertThat(columnNames.get(0).toCql(), is(equalTo("foo"))); + assertThat(columnNames).hasSize(1); + assertThat(columnNames.get(0).toCql()).isEqualTo("foo"); } @Table @@ -119,20 +118,20 @@ public class BasicCassandraMappingContextUnitTests { CassandraPersistentEntity persistentEntity = mappingContext .getPersistentEntity(PrimaryKeyColumnsOnProperty.class); - assertThat(persistentEntity.isCompositePrimaryKey(), is(false)); + assertThat(persistentEntity.isCompositePrimaryKey()).isFalse(); CassandraPersistentProperty firstname = persistentEntity.getPersistentProperty("firstname"); - assertThat(firstname.isCompositePrimaryKey(), is(false)); - assertThat(firstname.isPrimaryKeyColumn(), is(true)); - assertThat(firstname.isPartitionKeyColumn(), is(true)); - assertThat(firstname.getColumnName().toCql(), is(equalTo("firstname"))); + assertThat(firstname.isCompositePrimaryKey()).isFalse(); + assertThat(firstname.isPrimaryKeyColumn()).isTrue(); + assertThat(firstname.isPartitionKeyColumn()).isTrue(); + assertThat(firstname.getColumnName().toCql()).isEqualTo("firstname"); CassandraPersistentProperty lastname = persistentEntity.getPersistentProperty("lastname"); - assertThat(lastname.isPrimaryKeyColumn(), is(true)); - assertThat(lastname.isClusterKeyColumn(), is(true)); - assertThat(lastname.getColumnName().toCql(), is(equalTo("mylastname"))); + assertThat(lastname.isPrimaryKeyColumn()).isTrue(); + assertThat(lastname.isClusterKeyColumn()).isTrue(); + assertThat(lastname.getColumnName().toCql()).isEqualTo("mylastname"); } @Table @@ -172,25 +171,25 @@ public class BasicCassandraMappingContextUnitTests { CassandraPersistentEntity primaryKeyClass = mappingContext .getPersistentEntity(CompositePrimaryKeyClassWithProperties.class); - assertThat(persistentEntity.isCompositePrimaryKey(), is(false)); - assertThat(persistentEntity.getPersistentProperty("key").isCompositePrimaryKey(), is(true)); + assertThat(persistentEntity.isCompositePrimaryKey()).isFalse(); + assertThat(persistentEntity.getPersistentProperty("key").isCompositePrimaryKey()).isTrue(); - assertThat(primaryKeyClass.isCompositePrimaryKey(), is(true)); - assertThat(primaryKeyClass.getCompositePrimaryKeyProperties(), hasSize(2)); + assertThat(primaryKeyClass.isCompositePrimaryKey()).isTrue(); + assertThat(primaryKeyClass.getCompositePrimaryKeyProperties()).hasSize(2); CassandraPersistentProperty firstname = primaryKeyClass.getPersistentProperty("firstname"); - assertThat(firstname.isPrimaryKeyColumn(), is(true)); - assertThat(firstname.isPartitionKeyColumn(), is(true)); - assertThat(firstname.isClusterKeyColumn(), is(false)); - assertThat(firstname.getColumnName().toCql(), is(equalTo("firstname"))); + assertThat(firstname.isPrimaryKeyColumn()).isTrue(); + assertThat(firstname.isPartitionKeyColumn()).isTrue(); + assertThat(firstname.isClusterKeyColumn()).isFalse(); + assertThat(firstname.getColumnName().toCql()).isEqualTo("firstname"); CassandraPersistentProperty lastname = primaryKeyClass.getPersistentProperty("lastname"); - assertThat(lastname.isPrimaryKeyColumn(), is(true)); - assertThat(lastname.isPartitionKeyColumn(), is(false)); - assertThat(lastname.isClusterKeyColumn(), is(true)); - assertThat(lastname.getColumnName().toCql(), is(equalTo("mylastname"))); + assertThat(lastname.isPrimaryKeyColumn()).isTrue(); + assertThat(lastname.isPartitionKeyColumn()).isFalse(); + assertThat(lastname.isClusterKeyColumn()).isTrue(); + assertThat(lastname.getColumnName().toCql()).isEqualTo("mylastname"); } /** @@ -204,20 +203,20 @@ public class BasicCassandraMappingContextUnitTests { CreateTableSpecification tableSpecification = mappingContext.getCreateTableSpecificationFor(persistentEntity); - assertThat(tableSpecification.getPartitionKeyColumns(), hasSize(1)); - assertThat(tableSpecification.getClusteredKeyColumns(), hasSize(3)); + assertThat(tableSpecification.getPartitionKeyColumns()).hasSize(1); + assertThat(tableSpecification.getClusteredKeyColumns()).hasSize(3); ColumnSpecification breed = tableSpecification.getClusteredKeyColumns().get(0); - assertThat(breed.getName().toCql(), is(equalTo("breed"))); - assertThat(breed.getOrdering(), is(Ordering.ASCENDING)); + assertThat(breed.getName().toCql()).isEqualTo("breed"); + assertThat(breed.getOrdering()).isEqualTo(Ordering.ASCENDING); ColumnSpecification color = tableSpecification.getClusteredKeyColumns().get(1); - assertThat(color.getName().toCql(), is(equalTo("color"))); - assertThat(color.getOrdering(), is(Ordering.DESCENDING)); + assertThat(color.getName().toCql()).isEqualTo("color"); + assertThat(color.getOrdering()).isEqualTo(Ordering.DESCENDING); ColumnSpecification kind = tableSpecification.getClusteredKeyColumns().get(2); - assertThat(kind.getName().toCql(), is(equalTo("kind"))); - assertThat(kind.getOrdering(), is(Ordering.ASCENDING)); + assertThat(kind.getName().toCql()).isEqualTo("kind"); + assertThat(kind.getOrdering()).isEqualTo(Ordering.ASCENDING); } /** @@ -231,20 +230,20 @@ public class BasicCassandraMappingContextUnitTests { CreateTableSpecification tableSpecification = mappingContext.getCreateTableSpecificationFor(persistentEntity); - assertThat(tableSpecification.getPartitionKeyColumns(), hasSize(1)); - assertThat(tableSpecification.getClusteredKeyColumns(), hasSize(3)); + assertThat(tableSpecification.getPartitionKeyColumns()).hasSize(1); + assertThat(tableSpecification.getClusteredKeyColumns()).hasSize(3); ColumnSpecification breed = tableSpecification.getClusteredKeyColumns().get(0); - assertThat(breed.getName().toCql(), is(equalTo("breed"))); - assertThat(breed.getOrdering(), is(Ordering.ASCENDING)); + assertThat(breed.getName().toCql()).isEqualTo("breed"); + assertThat(breed.getOrdering()).isEqualTo(Ordering.ASCENDING); ColumnSpecification color = tableSpecification.getClusteredKeyColumns().get(1); - assertThat(color.getName().toCql(), is(equalTo("color"))); - assertThat(color.getOrdering(), is(Ordering.DESCENDING)); + assertThat(color.getName().toCql()).isEqualTo("color"); + assertThat(color.getOrdering()).isEqualTo(Ordering.DESCENDING); ColumnSpecification kind = tableSpecification.getClusteredKeyColumns().get(2); - assertThat(kind.getName().toCql(), is(equalTo("kind"))); - assertThat(kind.getOrdering(), is(Ordering.ASCENDING)); + assertThat(kind.getName().toCql()).isEqualTo("kind"); + assertThat(kind.getOrdering()).isEqualTo(Ordering.ASCENDING); } @Table @@ -318,7 +317,7 @@ public class BasicCassandraMappingContextUnitTests { public void shouldCreatePersistentEntityIfNoConversionRegistered() { mappingContext.setCustomConversions(new CustomConversions(Collections.EMPTY_LIST)); - assertThat(mappingContext.shouldCreatePersistentEntityFor(ClassTypeInformation.from(Human.class)), is(true)); + assertThat(mappingContext.shouldCreatePersistentEntityFor(ClassTypeInformation.from(Human.class))).isTrue(); } /** @@ -330,7 +329,7 @@ public class BasicCassandraMappingContextUnitTests { mappingContext .setCustomConversions(new CustomConversions(Collections.singletonList(HumanToStringConverter.INSTANCE))); - assertThat(mappingContext.shouldCreatePersistentEntityFor(ClassTypeInformation.from(Human.class)), is(false)); + assertThat(mappingContext.shouldCreatePersistentEntityFor(ClassTypeInformation.from(Human.class))).isFalse(); } /** @@ -345,11 +344,11 @@ public class BasicCassandraMappingContextUnitTests { CassandraPersistentEntity persistentEntity = mappingContext .getPersistentEntity(TypeWithCustomConvertedMap.class); - assertThat(mappingContext.getDataType(persistentEntity.getPersistentProperty("stringMap")), - is(equalTo(DataType.varchar()))); + assertThat(mappingContext.getDataType(persistentEntity.getPersistentProperty("stringMap"))) + .isEqualTo(DataType.varchar()); - assertThat(mappingContext.getDataType(persistentEntity.getPersistentProperty("blobMap")), - is(equalTo(DataType.ascii()))); + assertThat(mappingContext.getDataType(persistentEntity.getPersistentProperty("blobMap"))) + .isEqualTo(DataType.ascii()); } /** @@ -363,8 +362,8 @@ public class BasicCassandraMappingContextUnitTests { CassandraPersistentEntity persistentEntity = mappingContext.getPersistentEntity(TypeWithListOfHumans.class); - assertThat(mappingContext.getDataType(persistentEntity.getPersistentProperty("humans")), - is(equalTo((DataType) DataType.list(DataType.varchar())))); + assertThat(mappingContext.getDataType(persistentEntity.getPersistentProperty("humans"))) + .isEqualTo(DataType.list(DataType.varchar())); } private static class Human {} diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java old mode 100644 new mode 100755 index 561c8918e..eb86233fe --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; @@ -84,7 +83,7 @@ public class BasicCassandraPersistentEntityMetadataVerifierUnitTests { verifier.verify(getEntity(TooManyAnnotations.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), containsString("Entity cannot be of type @Table and @PrimaryKeyClass")); + assertThat(e).hasMessageContaining("Entity cannot be of type @Table and @PrimaryKeyClass"); } } @@ -98,8 +97,8 @@ public class BasicCassandraPersistentEntityMetadataVerifierUnitTests { verifier.verify(getEntity(EntityWithComplexTypePrimaryKey.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("Property [species] annotated with @PrimaryKeyColumn must be a simple CassandraType")); + assertThat(e) + .hasMessageContaining("Property [species] annotated with @PrimaryKeyColumn must be a simple CassandraType"); } } @@ -113,7 +112,7 @@ public class BasicCassandraPersistentEntityMetadataVerifierUnitTests { verifier.verify(getEntity(EntityWithComplexTypeId.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), containsString("Property [species] annotated with @Id must be a simple CassandraType")); + assertThat(e).hasMessageContaining("Property [species] annotated with @Id must be a simple CassandraType"); } } @@ -127,8 +126,8 @@ public class BasicCassandraPersistentEntityMetadataVerifierUnitTests { verifier.verify(getEntity(NoPartitionKey.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("At least one of the @PrimaryKeyColumn annotations must have a type of PARTITIONED")); + assertThat(e) + .hasMessageContaining("At least one of the @PrimaryKeyColumn annotations must have a type of PARTITIONED"); } } @@ -142,7 +141,7 @@ public class BasicCassandraPersistentEntityMetadataVerifierUnitTests { verifier.verify(getEntity(NoPrimaryKey.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), containsString("@Table types must have only one primary attribute, if any; Found 0")); + assertThat(e).hasMessageContaining("@Table types must have only one primary attribute, if any; Found 0"); } } @@ -156,8 +155,7 @@ public class BasicCassandraPersistentEntityMetadataVerifierUnitTests { verifier.verify(getEntity(PrimaryKeyAndPrimaryKeyColumn.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("@Table types must not define both @Id and @PrimaryKeyColumn properties")); + assertThat(e).hasMessageContaining("@Table types must not define both @Id and @PrimaryKeyColumn properties"); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityOrderPropertiesUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityOrderPropertiesUnitTests.java old mode 100644 new mode 100755 index d3f25395a..288f08588 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityOrderPropertiesUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityOrderPropertiesUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.mapping; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.Serializable; import java.util.LinkedList; @@ -60,7 +60,7 @@ public class BasicCassandraPersistentEntityOrderPropertiesUnitTests { } }); - assertEquals(expected, actual); + assertThat(actual).isEqualTo(expected); } @@ -84,7 +84,7 @@ public class BasicCassandraPersistentEntityOrderPropertiesUnitTests { } }); - assertEquals(expected, actual); + assertThat(actual).isEqualTo(expected); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityUnitTests.java old mode 100644 new mode 100755 index 8c0273c0d..cf412ec11 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityUnitTests.java @@ -15,16 +15,8 @@ */ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.isA; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -51,7 +43,7 @@ public class BasicCassandraPersistentEntityUnitTests { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity( ClassTypeInformation.from(Notification.class)); - assertThat(entity.getTableName().toCql(), is("messages")); + assertThat(entity.getTableName().toCql()).isEqualTo("messages"); } @Test @@ -60,7 +52,7 @@ public class BasicCassandraPersistentEntityUnitTests { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity( ClassTypeInformation.from(Area.class)); entity.setApplicationContext(context); - assertThat(entity.getTableName().toCql(), is("a123")); + assertThat(entity.getTableName().toCql()).isEqualTo("a123"); } @Test @@ -76,34 +68,34 @@ public class BasicCassandraPersistentEntityUnitTests { ClassTypeInformation.from(UserLine.class)); entity.setApplicationContext(context); - assertThat(entity.getTableName().toCql(), is(bean.tableName)); + assertThat(entity.getTableName().toCql()).isEqualTo(bean.tableName); } @Test public void setForceQuoteCallsSetTableName() { - BasicCassandraPersistentEntity entitySpy = - spy(new BasicCassandraPersistentEntity(ClassTypeInformation.from(Message.class))); + BasicCassandraPersistentEntity entitySpy = spy( + new BasicCassandraPersistentEntity(ClassTypeInformation.from(Message.class))); entitySpy.tableName = CqlIdentifier.cqlId("Messages", false); - assertThat(entitySpy.forceQuote, is(nullValue(Boolean.class))); + assertThat(entitySpy.forceQuote).isNull(); entitySpy.setForceQuote(true); - assertThat(entitySpy.forceQuote, is(true)); + assertThat(entitySpy.forceQuote).isTrue(); verify(entitySpy, times(1)).setTableName(isA(CqlIdentifier.class)); } @Test public void setForceQuoteDoesNothing() { - BasicCassandraPersistentEntity entitySpy = - spy(new BasicCassandraPersistentEntity(ClassTypeInformation.from(Message.class))); + BasicCassandraPersistentEntity entitySpy = spy( + new BasicCassandraPersistentEntity(ClassTypeInformation.from(Message.class))); entitySpy.forceQuote = true; entitySpy.setForceQuote(true); - assertThat(entitySpy.forceQuote, is(true)); + assertThat(entitySpy.forceQuote).isTrue(); verify(entitySpy, never()).setTableName(isA(CqlIdentifier.class)); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentPropertyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentPropertyUnitTests.java old mode 100644 new mode 100755 index 8be596e08..76d045602 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentPropertyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentPropertyUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Field; import java.util.Date; @@ -54,20 +53,20 @@ public class BasicCassandraPersistentPropertyUnitTests { public void usesAnnotatedColumnName() { Field field = ReflectionUtils.findField(Timeline.class, "text"); - assertThat(getPropertyFor(field).getColumnName().toCql(), is("message")); + assertThat(getPropertyFor(field).getColumnName().toCql()).isEqualTo("message"); } @Test public void checksIdProperty() { Field field = ReflectionUtils.findField(Timeline.class, "id"); CassandraPersistentProperty property = getPropertyFor(field); - assertTrue(property.isIdProperty()); + assertThat(property.isIdProperty()).isTrue(); } @Test public void returnsPropertyNameForUnannotatedProperty() { Field field = ReflectionUtils.findField(Timeline.class, "time"); - assertThat(getPropertyFor(field).getColumnName().toCql(), is("time")); + assertThat(getPropertyFor(field).getColumnName().toCql()).isEqualTo("time"); } private CassandraPersistentProperty getPropertyFor(Field field) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraCompositePrimaryKeyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraCompositePrimaryKeyUnitTests.java old mode 100644 new mode 100755 index 1a3107852..96bafa9a7 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraCompositePrimaryKeyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraCompositePrimaryKeyUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.mapping; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.cassandra.core.cql.CqlIdentifier.*; import java.io.Serializable; @@ -113,33 +113,33 @@ public class CassandraCompositePrimaryKeyUnitTests { Field field = ReflectionUtils.findField(Thing.class, "id"); CassandraPersistentProperty property = new BasicCassandraPersistentProperty(field, null, thing, SIMPLE_TYPE_HOLDER); - assertTrue(property.isIdProperty()); - assertTrue(property.isCompositePrimaryKey()); + assertThat(property.isIdProperty()).isTrue(); + assertThat(property.isCompositePrimaryKey()).isTrue(); List expectedColumnNames = Arrays.asList(new CqlIdentifier[] { cqlId("z"), cqlId("a") }); - assertTrue(expectedColumnNames.equals(property.getColumnNames())); + assertThat(expectedColumnNames.equals(property.getColumnNames())).isTrue(); List actualColumnNames = new ArrayList(); List properties = property.getCompositePrimaryKeyProperties(); for (CassandraPersistentProperty p : properties) { actualColumnNames.addAll(p.getColumnNames()); } - assertTrue(expectedColumnNames.equals(actualColumnNames)); + assertThat(expectedColumnNames.equals(actualColumnNames)).isTrue(); CreateTableSpecification spec = context.getCreateTableSpecificationFor(thing); List partitionKeyColumns = spec.getPartitionKeyColumns(); - assertEquals(1, partitionKeyColumns.size()); + assertThat(partitionKeyColumns).hasSize(1); ColumnSpecification partitionKeyColumn = partitionKeyColumns.get(0); - assertEquals("z", partitionKeyColumn.getName().toCql()); - assertEquals(PrimaryKeyType.PARTITIONED, partitionKeyColumn.getKeyType()); - assertEquals(DataType.text(), partitionKeyColumn.getType()); + assertThat(partitionKeyColumn.getName().toCql()).isEqualTo("z"); + assertThat(partitionKeyColumn.getKeyType()).isEqualTo(PrimaryKeyType.PARTITIONED); + assertThat(partitionKeyColumn.getType()).isEqualTo(DataType.text()); List clusteredKeyColumns = spec.getClusteredKeyColumns(); - assertEquals(1, clusteredKeyColumns.size()); + assertThat(clusteredKeyColumns).hasSize(1); ColumnSpecification clusteredKeyColumn = clusteredKeyColumns.get(0); - assertEquals("a", clusteredKeyColumn.getName().toCql()); - assertEquals(PrimaryKeyType.CLUSTERED, clusteredKeyColumn.getKeyType()); - assertEquals(DataType.text(), partitionKeyColumn.getType()); + assertThat(clusteredKeyColumn.getName().toCql()).isEqualTo("a"); + assertThat(clusteredKeyColumn.getKeyType()).isEqualTo(PrimaryKeyType.CLUSTERED); + assertThat(partitionKeyColumn.getType()).isEqualTo(DataType.text()); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraPersistentPropertyComparatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraPersistentPropertyComparatorUnitTests.java old mode 100644 new mode 100755 index de3b082bd..563e2813b --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraPersistentPropertyComparatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraPersistentPropertyComparatorUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Test; @@ -26,8 +25,8 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; /** - * The CassandraPersistentPropertyComparatorUnitTests class is a test suite of test cases testing the contract - * and functionality of the {@link CassandraPersistentPropertyComparator} class. + * The CassandraPersistentPropertyComparatorUnitTests class is a test suite of test cases testing the contract and + * functionality of the {@link CassandraPersistentPropertyComparator} class. * * @author John Blum * @see org.springframework.data.cassandra.mapping.CassandraPersistentPropertyComparator @@ -36,37 +35,35 @@ import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class CassandraPersistentPropertyComparatorUnitTests { - @Mock - private CassandraPersistentProperty left; + @Mock private CassandraPersistentProperty left; - @Mock - private CassandraPersistentProperty right; + @Mock private CassandraPersistentProperty right; @Test public void leftAndRightAreNullReturnsZero() { - assertThat(CassandraPersistentPropertyComparator.IT.compare(null, null), is(equalTo(0))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(null, null)).isEqualTo(0); verifyZeroInteractions(left); verifyZeroInteractions(right); } @Test public void leftIsNotNullAndRightIsNullReturnsOne() { - assertThat(CassandraPersistentPropertyComparator.IT.compare(left, null), is(equalTo(1))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(left, null)).isEqualTo(1); verifyZeroInteractions(left); verifyZeroInteractions(right); } @Test public void leftIsNullAndRightIsNotNullReturnsMinusOne() { - assertThat(CassandraPersistentPropertyComparator.IT.compare(null, right), is(equalTo(-1))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(null, right)).isEqualTo(-1); verifyZeroInteractions(left); verifyZeroInteractions(right); } @Test public void leftAndRightAreEqualReturnsZero() { - assertThat(CassandraPersistentPropertyComparator.IT.compare(left, left), is(equalTo(0))); - assertThat(CassandraPersistentPropertyComparator.IT.compare(right, right), is(equalTo(0))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(left, left)).isEqualTo(0); + assertThat(CassandraPersistentPropertyComparator.IT.compare(right, right)).isEqualTo(0); verifyZeroInteractions(left); verifyZeroInteractions(right); } @@ -76,7 +73,7 @@ public class CassandraPersistentPropertyComparatorUnitTests { when(left.isCompositePrimaryKey()).thenReturn(true); when(right.isCompositePrimaryKey()).thenReturn(true); - assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right), is(equalTo(0))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right)).isEqualTo(0); verify(left, times(1)).isCompositePrimaryKey(); verify(right, times(1)).isCompositePrimaryKey(); @@ -89,7 +86,7 @@ public class CassandraPersistentPropertyComparatorUnitTests { when(right.isCompositePrimaryKey()).thenReturn(false); when(right.isPrimaryKeyColumn()).thenReturn(false); - assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right), is(equalTo(-1))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right)).isEqualTo(-1); verify(left, times(1)).isCompositePrimaryKey(); verify(left, times(1)).isPrimaryKeyColumn(); @@ -104,7 +101,7 @@ public class CassandraPersistentPropertyComparatorUnitTests { when(right.isCompositePrimaryKey()).thenReturn(false); when(right.isPrimaryKeyColumn()).thenReturn(false); - assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right), is(equalTo(-1))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right)).isEqualTo(-1); verify(left, times(1)).isCompositePrimaryKey(); verify(left, times(1)).isPrimaryKeyColumn(); @@ -119,7 +116,7 @@ public class CassandraPersistentPropertyComparatorUnitTests { when(right.isCompositePrimaryKey()).thenReturn(true); when(right.isPrimaryKeyColumn()).thenReturn(false); - assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right), is(equalTo(1))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right)).isEqualTo(1); verify(left, times(1)).isCompositePrimaryKey(); verify(left, times(1)).isPrimaryKeyColumn(); @@ -134,7 +131,7 @@ public class CassandraPersistentPropertyComparatorUnitTests { when(right.isCompositePrimaryKey()).thenReturn(false); when(right.isPrimaryKeyColumn()).thenReturn(true); - assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right), is(equalTo(1))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right)).isEqualTo(1); verify(left, times(1)).isCompositePrimaryKey(); verify(left, times(1)).isPrimaryKeyColumn(); @@ -153,7 +150,7 @@ public class CassandraPersistentPropertyComparatorUnitTests { when(left.getName()).thenReturn("left"); when(right.getName()).thenReturn("right"); - assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right), is(lessThan(0))); + assertThat(CassandraPersistentPropertyComparator.IT.compare(left, right)).isLessThan(0); verify(left, times(1)).isCompositePrimaryKey(); verify(left, times(1)).isPrimaryKeyColumn(); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java old mode 100644 new mode 100755 index c83f264cb..c968174d7 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.sql.Timestamp; import java.util.UUID; @@ -54,54 +53,53 @@ public class CassandraPrimaryKeyColumnAnnotationComparatorUnitTests { @Test public void compareTypes() { - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityOne, entityTwo), is(equalTo(1))); - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityTwo, entityTwo), is(equalTo(0))); - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityTwo, entityOne), is(equalTo(-1))); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityOne, entityTwo)).isEqualTo(1); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityTwo, entityTwo)).isEqualTo(0); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityTwo, entityOne)).isEqualTo(-1); } @Test public void compareOrdinals() { - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityOne, entityThree), is(equalTo(-1))); - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityThree, entityThree), is(equalTo(0))); - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityThree, entityOne), is(equalTo(1))); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityOne, entityThree)).isEqualTo(-1); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityThree, entityThree)).isEqualTo(0); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityThree, entityOne)).isEqualTo(1); } @Test public void compareName() { - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityOne, entityFour), is(equalTo(-1))); - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityFour, entityFour), is(equalTo(0))); - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityFour, entityOne), is(equalTo(1))); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityOne, entityFour)).isEqualTo(-1); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityFour, entityFour)).isEqualTo(0); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityFour, entityOne)).isEqualTo(1); } @Test public void compareOrdering() { - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityOne, entityFive), is(equalTo(-1))); - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityFive, entityFive), is(equalTo(0))); - assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityFive, entityOne), is(equalTo(1))); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityOne, entityFive)).isEqualTo(-1); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityFive, entityFive)).isEqualTo(0); + assertThat(CassandraPrimaryKeyColumnAnnotationComparator.IT.compare(entityFive, entityOne)).isEqualTo(1); } static class EntityOne { - @PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED, ordinal = 1, name = "A", ordering = Ordering.ASCENDING) - Integer id; + @PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED, ordinal = 1, name = "A", + ordering = Ordering.ASCENDING) Integer id; } static class EntityTwo { - @PrimaryKeyColumn(type = PrimaryKeyType.PARTITIONED, ordinal = 1, name = "A", ordering = Ordering.ASCENDING) - Long id; + @PrimaryKeyColumn(type = PrimaryKeyType.PARTITIONED, ordinal = 1, name = "A", + ordering = Ordering.ASCENDING) Long id; } static class EntityThree { - @PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED, ordinal = 2, name = "A", ordering = Ordering.ASCENDING) - String id; + @PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED, ordinal = 2, name = "A", + ordering = Ordering.ASCENDING) String id; } static class EntityFour { - @PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED, ordinal = 1, name = "B", ordering = Ordering.ASCENDING) - Timestamp id; + @PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED, ordinal = 1, name = "B", + ordering = Ordering.ASCENDING) Timestamp id; } static class EntityFive { - @PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED, ordinal = 1, name = "A", ordering = Ordering.DESCENDING) - UUID id; + @PrimaryKeyColumn(type = PrimaryKeyType.CLUSTERED, ordinal = 1, name = "A", ordering = Ordering.DESCENDING) UUID id; } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java index 71b25f736..f16745cb2 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java @@ -15,8 +15,8 @@ */ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Fail.fail; import org.junit.Before; import org.junit.Test; @@ -74,7 +74,8 @@ public class CompositeCassandraPersistentEntityMetadataVerifierUnitTests { verifier.verify(getEntity(NonPersistentClass.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), containsString("Cassandra entities must be annotated with either @Persistent, @Table, or @PrimaryKeyClass")); + assertThat(e).hasMessageContaining( + "Cassandra entities must be annotated with either @Persistent, @Table, or @PrimaryKeyClass"); } } @@ -88,7 +89,7 @@ public class CompositeCassandraPersistentEntityMetadataVerifierUnitTests { verifier.verify(getEntity(TooManyAnnotations.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), containsString("Entity cannot be of type @Table and @PrimaryKeyClass")); + assertThat(e).hasMessageContaining("Entity cannot be of type @Table and @PrimaryKeyClass"); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CompoundPrimaryKeyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CompoundPrimaryKeyUnitTests.java old mode 100644 new mode 100755 index 1e1d23a7e..ebf9e798f --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CompoundPrimaryKeyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CompoundPrimaryKeyUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.mapping; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Field; import java.util.Date; @@ -62,8 +62,8 @@ public class CompoundPrimaryKeyUnitTests { public void checkIdProperty() { Field id = ReflectionUtils.findField(Timeline.class, "id"); CassandraPersistentProperty property = getPropertyFor(id); - assertTrue(property.isIdProperty()); - assertTrue(property.isCompositePrimaryKey()); + assertThat(property.isIdProperty()).isTrue(); + assertThat(property.isCompositePrimaryKey()).isTrue(); } private CassandraPersistentProperty getPropertyFor(Field field) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java old mode 100644 new mode 100755 index 56cbd400e..f74e861e7 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.IOException; import java.util.ArrayList; @@ -34,7 +33,6 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.data.annotation.Id; import org.springframework.data.cassandra.convert.CustomConversions; import org.springframework.data.cassandra.domain.AllPossibleTypes; -import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.StringUtils; import com.datastax.driver.core.DataType; @@ -76,23 +74,23 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = ctx.getCreateTableSpecificationFor(persistentEntity); - assertThat(getColumn("human", specification).getType(), is(DataType.varchar())); + assertThat(getColumn("human", specification).getType()).isEqualTo(DataType.varchar()); ColumnSpecification friends = getColumn("friends", specification); - assertThat(friends.getType().isCollection(), is(true)); + assertThat(friends.getType().isCollection()).isTrue(); CollectionType friendsCollection = (CollectionType) friends.getType(); - assertThat(friendsCollection.getName(), is(Name.LIST)); - assertThat(friendsCollection.getTypeArguments().size(), is(1)); - assertThat(friendsCollection.getTypeArguments().get(0), is(DataType.varchar())); + assertThat(friendsCollection.getName()).isEqualTo(Name.LIST); + assertThat(friendsCollection.getTypeArguments()).hasSize(1); + assertThat(friendsCollection.getTypeArguments().get(0)).isEqualTo(DataType.varchar()); ColumnSpecification people = getColumn("people", specification); - assertThat(people.getType().isCollection(), is(true)); + assertThat(people.getType().isCollection()).isTrue(); CollectionType peopleCollection = (CollectionType) people.getType(); - assertThat(peopleCollection.getName(), is(Name.SET)); - assertThat(peopleCollection.getTypeArguments().size(), is(1)); - assertThat(peopleCollection.getTypeArguments().get(0), is(DataType.varchar())); + assertThat(peopleCollection.getName()).isEqualTo(Name.SET); + assertThat(peopleCollection.getTypeArguments()).hasSize(1); + assertThat(peopleCollection.getTypeArguments().get(0)).isEqualTo(DataType.varchar()); } /** @@ -105,15 +103,15 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = ctx.getCreateTableSpecificationFor(persistentEntity); - assertThat(getColumn("floater", specification).getType(), is(DataType.cfloat())); + assertThat(getColumn("floater", specification).getType()).isEqualTo(DataType.cfloat()); ColumnSpecification enemies = getColumn("enemies", specification); - assertThat(enemies.getType().isCollection(), is(true)); + assertThat(enemies.getType().isCollection()).isTrue(); CollectionType enemiesCollection = (CollectionType) enemies.getType(); - assertThat(enemiesCollection.getName(), is(Name.SET)); - assertThat(enemiesCollection.getTypeArguments().size(), is(1)); - assertThat(enemiesCollection.getTypeArguments().get(0), is(DataType.bigint())); + assertThat(enemiesCollection.getName()).isEqualTo(Name.SET); + assertThat(enemiesCollection.getTypeArguments()).hasSize(1); + assertThat(enemiesCollection.getTypeArguments().get(0)).isEqualTo(DataType.bigint()); } /** @@ -124,10 +122,10 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("id", specification).getType(), is(DataType.varchar())); - assertThat(getColumn("zoneId", specification).getType(), is(DataType.varchar())); - assertThat(getColumn("bpZoneId", specification).getType(), is(DataType.varchar())); - assertThat(getColumn("anEnum", specification).getType(), is(DataType.varchar())); + assertThat(getColumn("id", specification).getType()).isEqualTo(DataType.varchar()); + assertThat(getColumn("zoneId", specification).getType()).isEqualTo(DataType.varchar()); + assertThat(getColumn("bpZoneId", specification).getType()).isEqualTo(DataType.varchar()); + assertThat(getColumn("anEnum", specification).getType()).isEqualTo(DataType.varchar()); } /** @@ -138,8 +136,8 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("boxedByte", specification).getType(), is(DataType.tinyint())); - assertThat(getColumn("primitiveByte", specification).getType(), is(DataType.tinyint())); + assertThat(getColumn("boxedByte", specification).getType()).isEqualTo(DataType.tinyint()); + assertThat(getColumn("primitiveByte", specification).getType()).isEqualTo(DataType.tinyint()); } /** @@ -150,8 +148,8 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("boxedShort", specification).getType(), is(DataType.smallint())); - assertThat(getColumn("primitiveShort", specification).getType(), is(DataType.smallint())); + assertThat(getColumn("boxedShort", specification).getType()).isEqualTo(DataType.smallint()); + assertThat(getColumn("primitiveShort", specification).getType()).isEqualTo(DataType.smallint()); } /** @@ -162,8 +160,8 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("boxedLong", specification).getType(), is(DataType.bigint())); - assertThat(getColumn("primitiveLong", specification).getType(), is(DataType.bigint())); + assertThat(getColumn("boxedLong", specification).getType()).isEqualTo(DataType.bigint()); + assertThat(getColumn("primitiveLong", specification).getType()).isEqualTo(DataType.bigint()); } /** @@ -174,7 +172,7 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("bigInteger", specification).getType(), is(DataType.varint())); + assertThat(getColumn("bigInteger", specification).getType()).isEqualTo(DataType.varint()); } /** @@ -185,7 +183,7 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("bigDecimal", specification).getType(), is(DataType.decimal())); + assertThat(getColumn("bigDecimal", specification).getType()).isEqualTo(DataType.decimal()); } /** @@ -196,8 +194,8 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("boxedInteger", specification).getType(), is(DataType.cint())); - assertThat(getColumn("primitiveInteger", specification).getType(), is(DataType.cint())); + assertThat(getColumn("boxedInteger", specification).getType()).isEqualTo(DataType.cint()); + assertThat(getColumn("primitiveInteger", specification).getType()).isEqualTo(DataType.cint()); } /** @@ -208,8 +206,8 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("boxedFloat", specification).getType(), is(DataType.cfloat())); - assertThat(getColumn("primitiveFloat", specification).getType(), is(DataType.cfloat())); + assertThat(getColumn("boxedFloat", specification).getType()).isEqualTo(DataType.cfloat()); + assertThat(getColumn("primitiveFloat", specification).getType()).isEqualTo(DataType.cfloat()); } /** @@ -220,8 +218,8 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("boxedDouble", specification).getType(), is(DataType.cdouble())); - assertThat(getColumn("primitiveDouble", specification).getType(), is(DataType.cdouble())); + assertThat(getColumn("boxedDouble", specification).getType()).isEqualTo(DataType.cdouble()); + assertThat(getColumn("primitiveDouble", specification).getType()).isEqualTo(DataType.cdouble()); } /** @@ -232,8 +230,8 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("boxedBoolean", specification).getType(), is(DataType.cboolean())); - assertThat(getColumn("primitiveBoolean", specification).getType(), is(DataType.cboolean())); + assertThat(getColumn("boxedBoolean", specification).getType()).isEqualTo(DataType.cboolean()); + assertThat(getColumn("primitiveBoolean", specification).getType()).isEqualTo(DataType.cboolean()); } /** @@ -244,11 +242,11 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("date", specification).getType(), is(DataType.date())); - assertThat(getColumn("localDate", specification).getType(), is(DataType.date())); - assertThat(getColumn("jodaLocalDate", specification).getType(), is(DataType.date())); - assertThat(getColumn("jodaDateMidnight", specification).getType(), is(DataType.date())); - assertThat(getColumn("bpLocalDate", specification).getType(), is(DataType.date())); + assertThat(getColumn("date", specification).getType()).isEqualTo(DataType.date()); + assertThat(getColumn("localDate", specification).getType()).isEqualTo(DataType.date()); + assertThat(getColumn("jodaLocalDate", specification).getType()).isEqualTo(DataType.date()); + assertThat(getColumn("jodaDateMidnight", specification).getType()).isEqualTo(DataType.date()); + assertThat(getColumn("bpLocalDate", specification).getType()).isEqualTo(DataType.date()); } /** @@ -259,13 +257,13 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("timestamp", specification).getType(), is(DataType.timestamp())); - assertThat(getColumn("localDateTime", specification).getType(), is(DataType.timestamp())); - assertThat(getColumn("instant", specification).getType(), is(DataType.timestamp())); - assertThat(getColumn("jodaLocalDateTime", specification).getType(), is(DataType.timestamp())); - assertThat(getColumn("jodaDateTime", specification).getType(), is(DataType.timestamp())); - assertThat(getColumn("bpLocalDateTime", specification).getType(), is(DataType.timestamp())); - assertThat(getColumn("bpInstant", specification).getType(), is(DataType.timestamp())); + assertThat(getColumn("timestamp", specification).getType()).isEqualTo(DataType.timestamp()); + assertThat(getColumn("localDateTime", specification).getType()).isEqualTo(DataType.timestamp()); + assertThat(getColumn("instant", specification).getType()).isEqualTo(DataType.timestamp()); + assertThat(getColumn("jodaLocalDateTime", specification).getType()).isEqualTo(DataType.timestamp()); + assertThat(getColumn("jodaDateTime", specification).getType()).isEqualTo(DataType.timestamp()); + assertThat(getColumn("bpLocalDateTime", specification).getType()).isEqualTo(DataType.timestamp()); + assertThat(getColumn("bpInstant", specification).getType()).isEqualTo(DataType.timestamp()); } /** @@ -276,8 +274,8 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(TypeWithOverrides.class); - assertThat(getColumn("localDate", specification).getType(), is(DataType.timestamp())); - assertThat(getColumn("jodaLocalDate", specification).getType(), is(DataType.timestamp())); + assertThat(getColumn("localDate", specification).getType()).isEqualTo(DataType.timestamp()); + assertThat(getColumn("jodaLocalDate", specification).getType()).isEqualTo(DataType.timestamp()); } /** @@ -288,7 +286,7 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { CreateTableSpecification specification = getCreateTableSpecificationFor(AllPossibleTypes.class); - assertThat(getColumn("blob", specification).getType(), is(DataType.blob())); + assertThat(getColumn("blob", specification).getType()).isEqualTo(DataType.blob()); } public CreateTableSpecification getCreateTableSpecificationFor(Class persistentEntityClass) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/ForceQuotedEntitiesSimpleUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/ForceQuotedEntitiesSimpleUnitTests.java old mode 100644 new mode 100755 index e8ae3518f..0b8f18d08 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/ForceQuotedEntitiesSimpleUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/ForceQuotedEntitiesSimpleUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.mapping; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.data.util.ClassTypeInformation; @@ -33,8 +33,9 @@ public class ForceQuotedEntitiesSimpleUnitTests { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity( ClassTypeInformation.from(ImplicitTableNameForceQuoted.class)); - assertEquals("\"" + ImplicitTableNameForceQuoted.class.getSimpleName() + "\"", entity.getTableName().toCql()); - assertEquals(ImplicitTableNameForceQuoted.class.getSimpleName(), entity.getTableName().getUnquoted()); + assertThat(entity.getTableName().toCql()) + .isEqualTo("\"" + ImplicitTableNameForceQuoted.class.getSimpleName() + "\""); + assertThat(entity.getTableName().getUnquoted()).isEqualTo(ImplicitTableNameForceQuoted.class.getSimpleName()); } @Table(forceQuote = true) @@ -47,8 +48,8 @@ public class ForceQuotedEntitiesSimpleUnitTests { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity( ClassTypeInformation.from(ExplicitTableNameForceQuoted.class)); - assertEquals("\"" + EXPLICIT_TABLE_NAME + "\"", entity.getTableName().toCql()); - assertEquals(EXPLICIT_TABLE_NAME, entity.getTableName().getUnquoted()); + assertThat(entity.getTableName().toCql()).isEqualTo("\"" + EXPLICIT_TABLE_NAME + "\""); + assertThat(entity.getTableName().getUnquoted()).isEqualTo(EXPLICIT_TABLE_NAME); } @Table(value = EXPLICIT_TABLE_NAME, forceQuote = true) @@ -59,8 +60,10 @@ public class ForceQuotedEntitiesSimpleUnitTests { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity( ClassTypeInformation.from(DefaultTableNameForceQuoted.class)); - assertEquals(DefaultTableNameForceQuoted.class.getSimpleName().toLowerCase(), entity.getTableName().toCql()); - assertEquals(DefaultTableNameForceQuoted.class.getSimpleName().toLowerCase(), entity.getTableName().getUnquoted()); + assertThat(entity.getTableName().toCql()) + .isEqualTo(DefaultTableNameForceQuoted.class.getSimpleName().toLowerCase()); + assertThat(entity.getTableName().getUnquoted()) + .isEqualTo(DefaultTableNameForceQuoted.class.getSimpleName().toLowerCase()); } @Table diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/ForceQuotedPropertiesSimpleUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/ForceQuotedPropertiesSimpleUnitTests.java old mode 100644 new mode 100755 index c91e42ed1..9a8244f59 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/ForceQuotedPropertiesSimpleUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/ForceQuotedPropertiesSimpleUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.mapping; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.cassandra.core.cql.CqlIdentifier.*; import java.io.Serializable; @@ -48,8 +48,8 @@ public class ForceQuotedPropertiesSimpleUnitTests { CassandraPersistentProperty primaryKey = entity.getPersistentProperty("primaryKey"); CassandraPersistentProperty aString = entity.getPersistentProperty("aString"); - assertEquals("\"primaryKey\"", primaryKey.getColumnName().toCql()); - assertEquals("\"aString\"", aString.getColumnName().toCql()); + assertThat(primaryKey.getColumnName().toCql()).isEqualTo("\"primaryKey\""); + assertThat(aString.getColumnName().toCql()).isEqualTo("\"aString\""); } @Table @@ -67,8 +67,8 @@ public class ForceQuotedPropertiesSimpleUnitTests { CassandraPersistentProperty primaryKey = entity.getPersistentProperty("primaryKey"); CassandraPersistentProperty aString = entity.getPersistentProperty("aString"); - assertEquals("primarykey", primaryKey.getColumnName().toCql()); - assertEquals("astring", aString.getColumnName().toCql()); + assertThat(primaryKey.getColumnName().toCql()).isEqualTo("primarykey"); + assertThat(aString.getColumnName().toCql()).isEqualTo("astring"); } @Table @@ -86,8 +86,8 @@ public class ForceQuotedPropertiesSimpleUnitTests { CassandraPersistentProperty primaryKey = entity.getPersistentProperty("primaryKey"); CassandraPersistentProperty aString = entity.getPersistentProperty("aString"); - assertEquals("\"" + EXPLICIT_PRIMARY_KEY_NAME + "\"", primaryKey.getColumnName().toCql()); - assertEquals("\"" + EXPLICIT_COLUMN_NAME + "\"", aString.getColumnName().toCql()); + assertThat(primaryKey.getColumnName().toCql()).isEqualTo("\"" + EXPLICIT_PRIMARY_KEY_NAME + "\""); + assertThat(aString.getColumnName().toCql()).isEqualTo("\"" + EXPLICIT_COLUMN_NAME + "\""); } @Table @@ -105,14 +105,14 @@ public class ForceQuotedPropertiesSimpleUnitTests { CassandraPersistentProperty stringZero = key.getPersistentProperty("stringZero"); CassandraPersistentProperty stringOne = key.getPersistentProperty("stringOne"); - assertEquals("\"stringZero\"", stringZero.getColumnName().toCql()); - assertEquals("\"stringOne\"", stringOne.getColumnName().toCql()); + assertThat(stringZero.getColumnName().toCql()).isEqualTo("\"stringZero\""); + assertThat(stringOne.getColumnName().toCql()).isEqualTo("\"stringOne\""); List names = Arrays .asList(new CqlIdentifier[] { quotedCqlId("stringZero"), quotedCqlId("stringOne") }); CassandraPersistentEntity entity = context.getPersistentEntity(ImplicitComposite.class); - assertEquals(names, entity.getPersistentProperty("primaryKey").getColumnNames()); + assertThat(entity.getPersistentProperty("primaryKey").getColumnNames()).isEqualTo(names); } @PrimaryKeyClass @@ -140,15 +140,15 @@ public class ForceQuotedPropertiesSimpleUnitTests { CassandraPersistentProperty stringZero = key.getPersistentProperty("stringZero"); CassandraPersistentProperty stringOne = key.getPersistentProperty("stringOne"); - assertTrue(stringZero.getColumnName().equals("stringZero")); - assertTrue(stringOne.getColumnName().equals("stringOne")); - assertEquals("stringzero", stringZero.getColumnName().toCql()); - assertEquals("stringone", stringOne.getColumnName().toCql()); + assertThat(stringZero.getColumnName().equals("stringZero")).isTrue(); + assertThat(stringOne.getColumnName().equals("stringOne")).isTrue(); + assertThat(stringZero.getColumnName().toCql()).isEqualTo("stringzero"); + assertThat(stringOne.getColumnName().toCql()).isEqualTo("stringone"); List names = Arrays.asList(new CqlIdentifier[] { cqlId("stringZero"), cqlId("stringOne") }); CassandraPersistentEntity entity = context.getPersistentEntity(DefaultComposite.class); - assertEquals(names, entity.getPersistentProperty("primaryKey").getColumnNames()); + assertThat(entity.getPersistentProperty("primaryKey").getColumnNames()).isEqualTo(names); } @PrimaryKeyClass @@ -176,14 +176,14 @@ public class ForceQuotedPropertiesSimpleUnitTests { CassandraPersistentProperty stringZero = key.getPersistentProperty("stringZero"); CassandraPersistentProperty stringOne = key.getPersistentProperty("stringOne"); - assertEquals("\"" + EXPLICIT_KEY_0 + "\"", stringZero.getColumnName().toCql()); - assertEquals("\"" + EXPLICIT_KEY_1 + "\"", stringOne.getColumnName().toCql()); + assertThat(stringZero.getColumnName().toCql()).isEqualTo("\"" + EXPLICIT_KEY_0 + "\""); + assertThat(stringOne.getColumnName().toCql()).isEqualTo("\"" + EXPLICIT_KEY_1 + "\""); List names = Arrays .asList(new CqlIdentifier[] { quotedCqlId(EXPLICIT_KEY_0), quotedCqlId(EXPLICIT_KEY_1) }); CassandraPersistentEntity entity = context.getPersistentEntity(ExplicitComposite.class); - assertEquals(names, entity.getPersistentProperty("primaryKey").getColumnNames()); + assertThat(entity.getPersistentProperty("primaryKey").getColumnNames()).isEqualTo(names); } @PrimaryKeyClass diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java index 6f2145eec..6b2b7125d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java @@ -15,9 +15,8 @@ */ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Fail.fail; import org.junit.Before; import org.junit.Test; @@ -83,7 +82,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { verifier.verify(getEntity(TooManyAnnotations.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), containsString("Entity cannot be of type @Table and @PrimaryKeyClass")); + assertThat(e).hasMessageContaining("Entity cannot be of type @Table and @PrimaryKeyClass"); } } @@ -97,8 +96,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { verifier.verify(getEntity(NoPartitionKey.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("At least one of the @PrimaryKeyColumn annotations must have a type of PARTITIONED")); + assertThat(e).hasMessageContaining("At least one of the @PrimaryKeyColumn annotations must have a type of PARTITIONED"); } } @@ -112,8 +110,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { verifier.verify(getEntity(NoPrimaryKey.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("At least one of the @PrimaryKeyColumn annotations must have a type of PARTITIONED")); + assertThat(e).hasMessageContaining("At least one of the @PrimaryKeyColumn annotations must have a type of PARTITIONED"); } } @@ -127,8 +124,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { verifier.verify(getEntity(TypeCycle.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("Composite primary keys are not allowed inside of composite primary key classes")); + assertThat(e).hasMessageContaining("Composite primary keys are not allowed inside of composite primary key classes"); } } @@ -142,8 +138,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { verifier.verify(getEntity(PKClassWithNestedCompositeKey.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("Composite primary keys are not allowed inside of composite primary key classes")); + assertThat(e).hasMessageContaining("Composite primary keys are not allowed inside of composite primary key classes"); } } @@ -157,8 +152,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { verifier.verify(getEntity(PKWithComplexType.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("Property [species] annotated with @PrimaryKeyColumn must be a simple CassandraType")); + assertThat(e).hasMessageContaining("Property [species] annotated with @PrimaryKeyColumn must be a simple CassandraType"); } } @@ -172,8 +166,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { verifier.verify(getEntity(PrimaryKeyAndPrimaryKeyColumn.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), - containsString("Annotations @Id and @PrimaryKey are invalid for type annotated with @PrimaryKeyClass")); + assertThat(e).hasMessageContaining("Annotations @Id and @PrimaryKey are invalid for type annotated with @PrimaryKeyClass"); } } @@ -187,7 +180,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { verifier.verify(getEntity(SubclassPK.class)); fail("Missing MappingException"); } catch (MappingException e) { - assertThat(e.toString(), containsString("@PrimaryKeyClass must only extend Object")); + assertThat(e).hasMessageContaining("@PrimaryKeyClass must only extend Object"); } } @@ -195,7 +188,9 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { return context.getPersistentEntity(entityClass); } - interface MyInterface {} + interface MyInterface { + + } static class NonPersistentClass { @@ -237,7 +232,9 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { @Table @PrimaryKeyClass - static class TooManyAnnotations {} + static class TooManyAnnotations { + + } @PrimaryKeyClass static class NoPartitionKey { @@ -290,6 +287,7 @@ public class PrimaryKeyClassEntityMetadataVerifierUnitTests { private static class NoOpVerifier implements CassandraPersistentEntityMetadataVerifier { @Override - public void verify(CassandraPersistentEntity entity) throws MappingException {} + public void verify(CassandraPersistentEntity entity) throws MappingException { + } } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/VerifierMappingExceptionsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/VerifierMappingExceptionsUnitTests.java index 23da7d62a..8a9a23eaa 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/VerifierMappingExceptionsUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/VerifierMappingExceptionsUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Before; @@ -53,6 +52,6 @@ public class VerifierMappingExceptionsUnitTests { VerifierMappingExceptions exceptions = new VerifierMappingExceptions(entityMock, "err"); exceptions.add(new MappingException("my error")); - assertThat(exceptions.toString(), containsString("my error")); + assertThat(exceptions.toString()).contains("my error"); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/multipackagescanning/MultipackageScanningUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/multipackagescanning/MultipackageScanningUnitTests.java old mode 100644 new mode 100755 index 1beea2194..719fe371a --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/multipackagescanning/MultipackageScanningUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/multipackagescanning/MultipackageScanningUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.mapping.multipackagescanning; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; import java.util.HashSet; @@ -58,9 +58,9 @@ public class MultipackageScanningUnitTests { types.add(entity.getType()); } - assertTrue(types.contains(First.class)); - assertTrue(types.contains(Second.class)); - assertFalse(types.contains(Third.class)); - assertFalse(types.contains(Top.class)); + assertThat(types.contains(First.class)).isTrue(); + assertThat(types.contains(Second.class)).isTrue(); + assertThat(types.contains(Third.class)).isFalse(); + assertThat(types.contains(Top.class)).isFalse(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtensionUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtensionUnitTests.java old mode 100644 new mode 100755 index 44ebc7a68..796b98a06 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtensionUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtensionUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.repository.config; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryQueryMethodParameterTypesIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryQueryMethodParameterTypesIntegrationTests.java old mode 100644 new mode 100755 index 6da9098c4..cc794a25e --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryQueryMethodParameterTypesIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryQueryMethodParameterTypesIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.isolated; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.time.Instant; import java.time.LocalDate; @@ -51,7 +50,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.datastax.driver.core.DataType.Name; import com.datastax.driver.core.Session; -import com.datastax.driver.core.exceptions.InvalidQueryException; /** * Integration tests for various query method parameter types. @@ -108,8 +106,8 @@ public class RepositoryQueryMethodParameterTypesIntegrationTests List result = allPossibleTypesRepository.findWithCreatedDate(allPossibleTypes.getLocalDate()); - assertThat(result, hasSize(1)); - assertThat(result, contains(allPossibleTypes)); + assertThat(result).hasSize(1); + assertThat(result).contains(allPossibleTypes); } /** @@ -119,7 +117,7 @@ public class RepositoryQueryMethodParameterTypesIntegrationTests public void shouldFindByAnnotatedDateParameter() { CustomConversions customConversions = new CustomConversions( - Collections.singletonList(new DateToLocalDateConverter())); + Collections.singletonList(new DateToLocalDateConverter())); mappingContext.setCustomConversions(customConversions); converter.setCustomConversions(customConversions); @@ -140,8 +138,8 @@ public class RepositoryQueryMethodParameterTypesIntegrationTests List result = allPossibleTypesRepository.findWithAnnotatedDateParameter(Date.from(instant)); - assertThat(result, hasSize(1)); - assertThat(result, contains(allPossibleTypes)); + assertThat(result).hasSize(1); + assertThat(result).contains(allPossibleTypes); } /** @@ -172,8 +170,8 @@ public class RepositoryQueryMethodParameterTypesIntegrationTests List result = allPossibleTypesRepository.findWithZoneId(zoneId); - assertThat(result, hasSize(1)); - assertThat(result, contains(allPossibleTypes)); + assertThat(result).hasSize(1); + assertThat(result).contains(allPossibleTypes); } /** @@ -194,8 +192,8 @@ public class RepositoryQueryMethodParameterTypesIntegrationTests List result = allPossibleTypesRepository.findWithZoneId(Optional.of(zoneId)); - assertThat(result, hasSize(1)); - assertThat(result, contains(allPossibleTypes)); + assertThat(result).hasSize(1); + assertThat(result).contains(allPossibleTypes); } private interface AllPossibleTypesRepository extends CrudRepository { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryReturnTypesIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryReturnTypesIntegrationTests.java old mode 100644 new mode 100755 index f3e01134c..92d1b5882 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryReturnTypesIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryReturnTypesIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.isolated; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.math.BigDecimal; import java.math.BigInteger; @@ -88,8 +87,8 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Optional result = allPossibleTypesRepository.findOptionalById(entity.getId()); - assertThat(result.isPresent(), is(true)); - assertThat(result.get(), is(instanceOf(AllPossibleTypes.class))); + assertThat(result.isPresent()).isTrue(); + assertThat(result.get()).isInstanceOf(AllPossibleTypes.class); } /** @@ -102,8 +101,8 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); List result = allPossibleTypesRepository.findManyById(entity.getId()); - assertThat(result.isEmpty(), is(false)); - assertThat(result, hasItem(entity)); + assertThat(result.isEmpty()).isFalse(); + assertThat(result).contains(entity); } /** @@ -117,7 +116,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); InetAddress result = allPossibleTypesRepository.findInetAddressById(entity.getId()); - assertThat(result, is(equalTo(entity.getInet()))); + assertThat(result).isEqualTo(entity.getInet()); } /** @@ -131,8 +130,8 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Optional result = allPossibleTypesRepository.findOptionalInetById(entity.getId()); - assertThat(result.isPresent(), is(true)); - assertThat(result.get(), is(equalTo(entity.getInet()))); + assertThat(result.isPresent()).isTrue(); + assertThat(result.get()).isEqualTo(entity.getInet()); } /** @@ -146,7 +145,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Byte result = allPossibleTypesRepository.findBoxedByteById(entity.getId()); - assertThat(result, is(equalTo(entity.getBoxedByte()))); + assertThat(result).isEqualTo(entity.getBoxedByte()); } /** @@ -160,7 +159,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); byte result = allPossibleTypesRepository.findPrimitiveByteById(entity.getId()); - assertThat(result, is(equalTo(entity.getPrimitiveByte()))); + assertThat(result).isEqualTo(entity.getPrimitiveByte()); } /** @@ -174,7 +173,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Short result = allPossibleTypesRepository.findBoxedShortById(entity.getId()); - assertThat(result, is(equalTo(entity.getBoxedShort()))); + assertThat(result).isEqualTo(entity.getBoxedShort()); } /** @@ -188,7 +187,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Long result = allPossibleTypesRepository.findBoxedLongById(entity.getId()); - assertThat(result, is(equalTo(entity.getBoxedLong()))); + assertThat(result).isEqualTo(entity.getBoxedLong()); } /** @@ -202,7 +201,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Integer result = allPossibleTypesRepository.findBoxedIntegerById(entity.getId()); - assertThat(result, is(equalTo(entity.getBoxedInteger()))); + assertThat(result).isEqualTo(entity.getBoxedInteger()); } /** @@ -216,7 +215,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Double result = allPossibleTypesRepository.findBoxedDoubleById(entity.getId()); - assertThat(result, is(equalTo(entity.getBoxedDouble()))); + assertThat(result).isEqualTo(entity.getBoxedDouble()); } /** @@ -230,7 +229,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Double result = allPossibleTypesRepository.findDoubleFromIntegerById(entity.getId()); - assertThat(result, is(closeTo(entity.getBoxedInteger(), 0.01d))); + assertThat(result).isCloseTo(entity.getBoxedInteger(), offset(0.01d)); } /** @@ -244,7 +243,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Boolean result = allPossibleTypesRepository.findBoxedBooleanById(entity.getId()); - assertThat(result, is(equalTo(entity.getBoxedBoolean()))); + assertThat(result).isEqualTo(entity.getBoxedBoolean()); } /** @@ -258,7 +257,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); LocalDate result = allPossibleTypesRepository.findLocalDateById(entity.getId()); - assertThat(result, is(equalTo(entity.getDate()))); + assertThat(result).isEqualTo(entity.getDate()); } /** @@ -272,7 +271,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Date result = allPossibleTypesRepository.findTimestampById(entity.getId()); - assertThat(result, is(equalTo(entity.getTimestamp()))); + assertThat(result).isEqualTo(entity.getTimestamp()); } /** @@ -286,7 +285,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); BigDecimal result = allPossibleTypesRepository.findBigDecimalById(entity.getId()); - assertThat(result, is(equalTo(entity.getBigDecimal()))); + assertThat(result).isEqualTo(entity.getBigDecimal()); } /** @@ -300,7 +299,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); BigInteger result = allPossibleTypesRepository.findBigIntegerById(entity.getId()); - assertThat(result, is(equalTo(entity.getBigInteger()))); + assertThat(result).isEqualTo(entity.getBigInteger()); } /** @@ -315,9 +314,9 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Map result = allPossibleTypesRepository.findEntityAsMapById(entity.getId()); - assertThat(result.size(), is(41)); - assertThat(result.get("primitiveinteger"), is(equalTo((Object) Integer.valueOf(123)))); - assertThat(result.get("biginteger"), is(equalTo((Object) BigInteger.ONE))); + assertThat(result).hasSize(41); + assertThat(result.get("primitiveinteger")).isEqualTo((Object) Integer.valueOf(123)); + assertThat(result.get("biginteger")).isEqualTo((Object) BigInteger.ONE); } public interface AllPossibleTypesRepository extends CrudRepository { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessorUnitTests.java old mode 100644 new mode 100755 index f3234c754..e92a853fa --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessorUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.List; @@ -61,7 +60,7 @@ public class CassandraParametersParameterAccessorUnitTests { CassandraParameterAccessor accessor = new CassandraParametersParameterAccessor(getCassandraQueryMethod(method), new Object[] { "firstname" }); - assertThat(accessor.getDataType(0), is(equalTo(DataType.varchar()))); + assertThat(accessor.getDataType(0)).isEqualTo(DataType.varchar()); } /** @@ -74,7 +73,7 @@ public class CassandraParametersParameterAccessorUnitTests { CassandraParameterAccessor accessor = new CassandraParametersParameterAccessor(getCassandraQueryMethod(method), new Object[] { LocalDateTime.of(2000, 10, 11, 12, 13, 14) }); - assertThat(accessor.getDataType(0), is(nullValue())); + assertThat(accessor.getDataType(0)).isNull(); } /** @@ -87,7 +86,7 @@ public class CassandraParametersParameterAccessorUnitTests { CassandraParameterAccessor accessor = new CassandraParametersParameterAccessor(getCassandraQueryMethod(method), new Object[] { LocalDateTime.of(2000, 10, 11, 12, 13, 14) }); - assertThat(accessor.getDataType(0), is(DataType.date())); + assertThat(accessor.getDataType(0)).isEqualTo(DataType.date()); } /** @@ -100,7 +99,7 @@ public class CassandraParametersParameterAccessorUnitTests { CassandraParameterAccessor accessor = new CassandraParametersParameterAccessor(getCassandraQueryMethod(method), new Object[] { "" }); - assertThat(accessor.getDataType(0), is(DataType.date())); + assertThat(accessor.getDataType(0)).isEqualTo(DataType.date()); } /** @@ -113,7 +112,7 @@ public class CassandraParametersParameterAccessorUnitTests { CassandraParameterAccessor accessor = new CassandraParametersParameterAccessor(getCassandraQueryMethod(method), new Object[] { "" }); - assertThat(accessor.getDataType(0), is(DataType.date())); + assertThat(accessor.getDataType(0)).isEqualTo(DataType.date()); } private CassandraQueryMethod getCassandraQueryMethod(Method method) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraParametersUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraParametersUnitTests.java old mode 100644 new mode 100755 index 4db31957d..94ce8dcfd --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraParametersUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraParametersUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; @@ -48,7 +47,7 @@ public class CassandraParametersUnitTests { Method method = PersonRepository.class.getMethod("findByFirstname", String.class); CassandraParameters cassandraParameters = new CassandraParameters(method); - assertThat(cassandraParameters.getParameter(0).getCassandraType(), is(nullValue())); + assertThat(cassandraParameters.getParameter(0).getCassandraType()).isNull(); } /** @@ -60,8 +59,7 @@ public class CassandraParametersUnitTests { Method method = PersonRepository.class.getMethod("findByFirstTime", String.class); CassandraParameters cassandraParameters = new CassandraParameters(method); - assertThat(cassandraParameters.getParameter(0).getCassandraType(), is(notNullValue())); - assertThat(cassandraParameters.getParameter(0).getCassandraType().type(), is(Name.TIME)); + assertThat(cassandraParameters.getParameter(0).getCassandraType().type()).isEqualTo(Name.TIME); } /** @@ -73,7 +71,7 @@ public class CassandraParametersUnitTests { Method method = PersonRepository.class.getMethod("findByObject", Object.class); CassandraParameters cassandraParameters = new CassandraParameters(method); - assertThat(cassandraParameters.getParameter(0).getCassandraType(), is(nullValue())); + assertThat(cassandraParameters.getParameter(0).getCassandraType()).isNull(); } /** @@ -85,8 +83,7 @@ public class CassandraParametersUnitTests { Method method = PersonRepository.class.getMethod("findByAnnotatedObject", Object.class); CassandraParameters cassandraParameters = new CassandraParameters(method); - assertThat(cassandraParameters.getParameter(0).getCassandraType(), is(notNullValue())); - assertThat(cassandraParameters.getParameter(0).getCassandraType().type(), is(Name.TIME)); + assertThat(cassandraParameters.getParameter(0).getCassandraType().type()).isEqualTo(Name.TIME); } interface PersonRepository { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreatorUnitTests.java index cf6fb8c43..41ab02dde 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreatorUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.cassandra.repository.query.StubParameterAccessor.*; import java.io.Serializable; @@ -55,8 +54,7 @@ public class CassandraQueryCreatorUnitTests { CassandraMappingContext context; CassandraConverter converter; - @Rule - public ExpectedException exception = ExpectedException.none(); + @Rule public ExpectedException exception = ExpectedException.none(); @Before public void setUp() throws SecurityException, NoSuchMethodException { @@ -72,7 +70,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstname", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname='Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname='Walter';"); } /** @@ -83,7 +81,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameOrderByLastname", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname='Walter' ORDER BY lastname ASC;"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname='Walter' ORDER BY lastname ASC;"); } /** @@ -94,7 +92,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameAndLastname", Person.class, "Walter", "White"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname='Walter' AND lastname='White';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname='Walter' AND lastname='White';"); } /** @@ -121,7 +119,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameGreaterThan", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname>'Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname>'Walter';"); } /** @@ -132,7 +130,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameGreaterThanEqual", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname>='Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname>='Walter';"); } /** @@ -143,7 +141,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameLessThan", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname<'Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname<'Walter';"); } /** @@ -154,7 +152,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameLessThanEqual", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname<='Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname<='Walter';"); } /** @@ -165,7 +163,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameIn", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname IN ('Walter');"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname IN ('Walter');"); } /** @@ -176,7 +174,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameIn", Person.class, Arrays.asList("Walter", "Gus")); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname IN ('Walter','Gus');"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname IN ('Walter','Gus');"); } /** @@ -185,10 +183,9 @@ public class CassandraQueryCreatorUnitTests { @Test public void createsInQueryWithArrayCorrectly() { - String query = createQuery("findByFirstnameInAndLastname", Person.class, - new String[] { "Walter", "Gus" }, "Fring"); + String query = createQuery("findByFirstnameInAndLastname", Person.class, new String[] { "Walter", "Gus" }, "Fring"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname IN ('Walter','Gus') AND lastname='Fring';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname IN ('Walter','Gus') AND lastname='Fring';"); } /** @@ -197,11 +194,11 @@ public class CassandraQueryCreatorUnitTests { @Test public void createsLikeQueryCorrectly() { - assertThat(createQuery("findByFirstnameLike", Person.class, "Wal%ter"), - is(equalTo("SELECT * FROM person WHERE firstname LIKE 'Wal%ter';"))); + assertThat(createQuery("findByFirstnameLike", Person.class, "Wal%ter")) + .isEqualTo("SELECT * FROM person WHERE firstname LIKE 'Wal%ter';"); - assertThat(createQuery("findByFirstnameLike", Person.class, "Walter"), - is(equalTo("SELECT * FROM person WHERE firstname LIKE 'Walter';"))); + assertThat(createQuery("findByFirstnameLike", Person.class, "Walter")) + .isEqualTo("SELECT * FROM person WHERE firstname LIKE 'Walter';"); } /** @@ -212,7 +209,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameStartsWith", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname LIKE 'Walter%';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname LIKE 'Walter%';"); } /** @@ -223,7 +220,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameEndsWith", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname LIKE '%Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname LIKE '%Walter';"); } /** @@ -234,7 +231,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameContains", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname LIKE '%Walter%';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname LIKE '%Walter%';"); } /** @@ -245,7 +242,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByMysetContains", TypeWithSet.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM typewithset WHERE myset CONTAINS 'Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM typewithset WHERE myset CONTAINS 'Walter';"); } /** @@ -256,7 +253,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByMylistContains", TypeWithList.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM typewithlist WHERE mylist CONTAINS 'Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM typewithlist WHERE mylist CONTAINS 'Walter';"); } /** @@ -267,7 +264,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByMymapContains", TypeWithMap.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM typewithmap WHERE mymap CONTAINS 'Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM typewithmap WHERE mymap CONTAINS 'Walter';"); } /** @@ -278,7 +275,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameIsTrue", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname=true;"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname=true;"); } /** @@ -289,7 +286,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstnameIsFalse", Person.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname=false;"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname=false;"); } /** @@ -300,7 +297,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByIdAndSet", QuotedType.class, "Walter", "White"); - assertThat(query, is(equalTo("SELECT * FROM \"myTable\" WHERE \"my_id\"='Walter' AND \"set\"='White';"))); + assertThat(query).isEqualTo("SELECT * FROM \"myTable\" WHERE \"my_id\"='Walter' AND \"set\"='White';"); } /** @@ -311,7 +308,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByKeyFirstname", TypeWithCompositeId.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM typewithcompositeid WHERE firstname='Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM typewithcompositeid WHERE firstname='Walter';"); } /** @@ -322,7 +319,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByKeyFirstnameOrderByKeyLastnameAsc", TypeWithCompositeId.class, "Walter"); - assertThat(query, is(equalTo("SELECT * FROM typewithcompositeid WHERE firstname='Walter' ORDER BY lastname ASC;"))); + assertThat(query).isEqualTo("SELECT * FROM typewithcompositeid WHERE firstname='Walter' ORDER BY lastname ASC;"); } /** @@ -334,7 +331,7 @@ public class CassandraQueryCreatorUnitTests { String query = createQuery("findByFirstname", Key.class, "Walter"); // ⊙_ʘ rly? ヾ( •́д•̀ ;)ﾉ - assertThat(query, is(equalTo("SELECT * FROM key WHERE firstname='Walter';"))); + assertThat(query).isEqualTo("SELECT * FROM key WHERE firstname='Walter';"); } /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethodUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethodUnitTests.java index 56869b291..f571f2a35 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethodUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethodUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.List; @@ -54,8 +53,8 @@ public class CassandraQueryMethodUnitTests { CassandraQueryMethod queryMethod = queryMethod(SampleRepository.class, "method"); CassandraEntityMetadata metadata = queryMethod.getEntityInformation(); - assertThat(metadata.getJavaType(), is(typeCompatibleWith(Person.class))); - assertThat(metadata.getTableName().toCql(), is("person")); + assertThat(metadata.getJavaType()).isAssignableFrom(Person.class); + assertThat(metadata.getTableName().toCql()).isEqualTo("person"); } /** @@ -78,7 +77,7 @@ public class CassandraQueryMethodUnitTests { CassandraQueryMethod queryMethod = queryMethod(SampleRepository.class, "method"); - assertThat(queryMethod.isCollectionQuery(), is(true)); + assertThat(queryMethod.isCollectionQuery()).isTrue(); } private CassandraQueryMethod queryMethod(Class repository, String name, Class... parameters) throws Exception { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessorUnitTests.java old mode 100644 new mode 100755 index ac3d2c7cb..b61d61838 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessorUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.time.LocalDate; @@ -46,11 +45,9 @@ import com.datastax.driver.core.DataType; @RunWith(MockitoJUnitRunner.class) public class ConvertingParameterAccessorUnitTests { - @Mock - private CassandraParameterAccessor mockParameterAccessor; + @Mock private CassandraParameterAccessor mockParameterAccessor; - @Mock - private CassandraPersistentProperty mockProperty; + @Mock private CassandraPersistentProperty mockProperty; ConvertingParameterAccessor convertingParameterAccessor; @@ -68,35 +65,43 @@ public class ConvertingParameterAccessorUnitTests { */ @Test public void shouldReturnNullBindableValue() { - assertThat(convertingParameterAccessor.getBindableValue(0), is(nullValue())); + + ConvertingParameterAccessor accessor = new ConvertingParameterAccessor(converter, mockParameterAccessor); + + assertThat(accessor.getBindableValue(0)).isNull(); } /** * @see DATACASS-296 */ @Test - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ "rawtypes", "unchecked" }) public void shouldReturnNativeBindableValue() { when(mockParameterAccessor.getBindableValue(0)).thenReturn("hello"); when(mockParameterAccessor.getDataType(0)).thenReturn(DataType.varchar()); when(mockParameterAccessor.getParameterType(0)).thenReturn((Class) String.class); - assertThat(convertingParameterAccessor.getBindableValue(0), is(equalTo((Object) "hello"))); + ConvertingParameterAccessor accessor = new ConvertingParameterAccessor(converter, mockParameterAccessor); + + when(mockParameterAccessor.getBindableValue(0)).thenReturn("hello"); + when(mockParameterAccessor.getDataType(0)).thenReturn(DataType.varchar()); + + assertThat(accessor.getBindableValue(0)).isEqualTo((Object) "hello"); } /** * @see DATACASS-296 */ @Test - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ "rawtypes", "unchecked" }) public void shouldReturnConvertedBindableValue() { LocalDate localDate = LocalDate.of(2010, 7, 4); when(mockParameterAccessor.getBindableValue(0)).thenReturn(localDate); when(mockParameterAccessor.getParameterType(0)).thenReturn((Class) LocalDate.class); - assertThat(convertingParameterAccessor.getBindableValue(0), - is(equalTo((Object) com.datastax.driver.core.LocalDate.fromYearMonthDay(2010, 7, 4)))); + assertThat(convertingParameterAccessor.getBindableValue(0)) + .isEqualTo(com.datastax.driver.core.LocalDate.fromYearMonthDay(2010, 7, 4)); } /** @@ -107,7 +112,7 @@ public class ConvertingParameterAccessorUnitTests { public void shouldReturnDataTypeProvidedByDelegate() { when(mockParameterAccessor.getDataType(0)).thenReturn(DataType.varchar()); - assertThat(convertingParameterAccessor.getDataType(0), is(equalTo(DataType.varchar()))); + assertThat(convertingParameterAccessor.getDataType(0)).isEqualTo(DataType.varchar()); } /** @@ -115,12 +120,12 @@ public class ConvertingParameterAccessorUnitTests { * @see DATACASS-7 */ @Test - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ "rawtypes", "unchecked" }) public void shouldConvertCollections() { LocalDate localDate = LocalDate.of(2010, 7, 4); - when(mockParameterAccessor.iterator()).thenReturn((Iterator) - Collections.singletonList(Collections.singletonList(localDate)).iterator()); + when(mockParameterAccessor.iterator()) + .thenReturn((Iterator) Collections.singletonList(Collections.singletonList(localDate)).iterator()); when(mockParameterAccessor.getDataType(0)).thenReturn(DataType.list(DataType.date())); when(mockParameterAccessor.getParameterType(0)).thenReturn((Class) List.class); when(mockProperty.getType()).thenReturn((Class) List.class); @@ -130,23 +135,23 @@ public class ConvertingParameterAccessorUnitTests { PotentiallyConvertingIterator iterator = (PotentiallyConvertingIterator) convertingParameterAccessor.iterator(); Object converted = iterator.nextConverted(mockProperty); - assertThat(converted, is(instanceOf(List.class))); + assertThat(converted).isInstanceOf(List.class); List list = (List) converted; - assertThat(list.get(0), is(instanceOf(com.datastax.driver.core.LocalDate.class))); + assertThat(list.get(0)).isInstanceOf(com.datastax.driver.core.LocalDate.class); } /** * @see DATACASS-7 */ @Test - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ "rawtypes", "unchecked" }) public void shouldProvideTypeBasedOnValue() { when(mockParameterAccessor.getDataType(0)).thenReturn(null); when(mockParameterAccessor.getParameterType(0)).thenReturn((Class) LocalDate.class); - assertThat(convertingParameterAccessor.getDataType(0), is(equalTo(DataType.date()))); + assertThat(convertingParameterAccessor.getDataType(0)).isEqualTo(DataType.date()); } /** @@ -160,6 +165,6 @@ public class ConvertingParameterAccessorUnitTests { when(mockParameterAccessor.getParameterType(0)).thenReturn((Class) String.class); when(mockParameterAccessor.getDataType(0)).thenReturn(null); - assertThat(convertingParameterAccessor.getDataType(0, mockProperty), is(equalTo(DataType.varchar()))); + assertThat(convertingParameterAccessor.getDataType(0, mockProperty)).isEqualTo(DataType.varchar()); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ParameterBindingParserUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ParameterBindingParserUnitTests.java index 19bec19dd..9deba0a83 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ParameterBindingParserUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ParameterBindingParserUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.cassandra.repository.query.StringBasedCassandraQuery.ParameterBindingParser.*; import java.util.ArrayList; @@ -44,8 +43,8 @@ public class ParameterBindingParserUnitTests { String transformed = INSTANCE.parseAndCollectParameterBindingsFromQueryIntoBindings(query, bindings); - assertThat(transformed, is(equalTo(query))); - assertThat(bindings, is(empty())); + assertThat(transformed).isEqualTo(query); + assertThat(bindings).isEmpty(); } /** @@ -59,8 +58,8 @@ public class ParameterBindingParserUnitTests { String transformed = INSTANCE.parseAndCollectParameterBindingsFromQueryIntoBindings(query, bindings); - assertThat(transformed, is(equalTo(query))); - assertThat(bindings, is(empty())); + assertThat(transformed).isEqualTo(query); + assertThat(bindings).isEmpty(); } /** @@ -74,11 +73,11 @@ public class ParameterBindingParserUnitTests { String transformed = INSTANCE.parseAndCollectParameterBindingsFromQueryIntoBindings(query, bindings); - assertThat(transformed, is(equalTo("SELECT * FROM hello_world WHERE a = ?_param_? and b = ?_param_?"))); - assertThat(bindings, hasSize(2)); + assertThat(transformed).isEqualTo("SELECT * FROM hello_world WHERE a = ?_param_? and b = ?_param_?"); + assertThat(bindings).hasSize(2); - assertThat(bindings.get(0).getParameterIndex(), is(equalTo(0))); - assertThat(bindings.get(1).getParameterIndex(), is(equalTo(13))); + assertThat(bindings.get(0).getParameterIndex()).isEqualTo(0); + assertThat(bindings.get(1).getParameterIndex()).isEqualTo(13); } /** @@ -92,8 +91,8 @@ public class ParameterBindingParserUnitTests { String transformed = INSTANCE.parseAndCollectParameterBindingsFromQueryIntoBindings(query, bindings); - assertThat(transformed, is(equalTo("SELECT * FROM hello_world WHERE a = ?_param_? and b = ?_param_?"))); - assertThat(bindings, hasSize(2)); + assertThat(transformed).isEqualTo("SELECT * FROM hello_world WHERE a = ?_param_? and b = ?_param_?"); + assertThat(bindings).hasSize(2); } /** @@ -107,8 +106,8 @@ public class ParameterBindingParserUnitTests { String transformed = INSTANCE.parseAndCollectParameterBindingsFromQueryIntoBindings(query, bindings); - assertThat(transformed, is(equalTo("SELECT * FROM hello_world WHERE a = ?_param_? and b = ?_param_?"))); - assertThat(bindings, hasSize(2)); + assertThat(transformed).isEqualTo("SELECT * FROM hello_world WHERE a = ?_param_? and b = ?_param_?"); + assertThat(bindings).hasSize(2); } /** @@ -122,8 +121,8 @@ public class ParameterBindingParserUnitTests { String transformed = INSTANCE.parseAndCollectParameterBindingsFromQueryIntoBindings(query, bindings); - assertThat(transformed, is(equalTo("SELECT * FROM hello_world WHERE a = ?_param_? and b = ?_param_?"))); - assertThat(bindings, hasSize(2)); + assertThat(transformed).isEqualTo("SELECT * FROM hello_world WHERE a = ?_param_? and b = ?_param_?"); + assertThat(bindings).hasSize(2); } /** @@ -137,8 +136,8 @@ public class ParameterBindingParserUnitTests { String transformed = INSTANCE.parseAndCollectParameterBindingsFromQueryIntoBindings(query, bindings); - assertThat(transformed, is(equalTo( - "SELECT * FROM hello_world WHERE (a = ?_param_? and b = ?_param_?) and c = (?_param_?) and (d = ?_param_?)"))); - assertThat(bindings, hasSize(4)); + assertThat(transformed).isEqualTo( + "SELECT * FROM hello_world WHERE (a = ?_param_? and b = ?_param_?) and c = (?_param_?) and (d = ?_param_?)"); + assertThat(bindings).hasSize(4); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java index 84c5fc33c..6edc69a3d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.lang.reflect.Method; @@ -48,11 +47,9 @@ import org.springframework.data.repository.core.support.DefaultRepositoryMetadat @RunWith(MockitoJUnitRunner.class) public class PartTreeCassandraQueryUnitTests { - @Rule - public ExpectedException exception = ExpectedException.none(); + @Rule public ExpectedException exception = ExpectedException.none(); - @Mock - private CassandraOperations mockCassandraOperations; + @Mock private CassandraOperations mockCassandraOperations; private CassandraMappingContext mappingContext; private CassandraConverter converter; @@ -72,7 +69,7 @@ public class PartTreeCassandraQueryUnitTests { public void shouldDeriveSimpleQuery() { String query = deriveQueryFromMethod("findByLastname", "foo"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE lastname='foo';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE lastname='foo';"); } /** @@ -82,7 +79,7 @@ public class PartTreeCassandraQueryUnitTests { public void shouldDeriveSimpleQueryWithoutNames() { String query = deriveQueryFromMethod("findPersonBy"); - assertThat(query, is(equalTo("SELECT * FROM person;"))); + assertThat(query).isEqualTo("SELECT * FROM person;"); } /** @@ -90,9 +87,9 @@ public class PartTreeCassandraQueryUnitTests { */ @Test public void shouldDeriveAndQuery() { - String query = deriveQueryFromMethod("findByFirstnameAndLastname", "foo", "bar" ); + String query = deriveQueryFromMethod("findByFirstnameAndLastname", "foo", "bar"); - assertThat(query, is(equalTo("SELECT * FROM person WHERE firstname='foo' AND lastname='bar';"))); + assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname='foo' AND lastname='bar';"); } /** @@ -102,10 +99,9 @@ public class PartTreeCassandraQueryUnitTests { public void usesDynamicProjection() { String query = deriveQueryFromMethod("findDynamicallyProjectedBy", PersonProjection.class); - assertThat(query, is(equalTo("SELECT * FROM person;"))); + assertThat(query).isEqualTo("SELECT * FROM person;"); } - private String deriveQueryFromMethod(String method, Object... args) { Class[] types = new Class[args.length]; @@ -115,7 +111,8 @@ public class PartTreeCassandraQueryUnitTests { PartTreeCassandraQuery partTreeQuery = createQueryForMethod(method, types); - CassandraParameterAccessor accessor = new CassandraParametersParameterAccessor(partTreeQuery.getQueryMethod(), args); + CassandraParameterAccessor accessor = new CassandraParametersParameterAccessor(partTreeQuery.getQueryMethod(), + args); return partTreeQuery.createQuery(new ConvertingParameterAccessor(mockCassandraOperations.getConverter(), accessor)); } @@ -124,8 +121,8 @@ public class PartTreeCassandraQueryUnitTests { try { Method method = Repo.class.getMethod(methodName, paramTypes); ProjectionFactory factory = new SpelAwareProxyProjectionFactory(); - CassandraQueryMethod queryMethod = new CassandraQueryMethod(method, - new DefaultRepositoryMetadata(Repo.class), factory, mappingContext); + CassandraQueryMethod queryMethod = new CassandraQueryMethod(method, new DefaultRepositoryMetadata(Repo.class), + factory, mappingContext); return new PartTreeCassandraQuery(queryMethod, mockCassandraOperations); } catch (NoSuchMethodException e) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryIntegrationUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryIntegrationUnitTests.java old mode 100644 new mode 100755 index 0359d53de..2a2d456d9 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryIntegrationUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryIntegrationUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.lang.reflect.Method; @@ -103,7 +102,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname = 'Matthews';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname = 'Matthews';"); } /** @@ -118,7 +117,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname = 'Mat\th''ew\"s';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname = 'Mat\th''ew\"s';"); } /** @@ -133,7 +132,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname = 0x01020304;"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname = 0x01020304;"); } /** @@ -148,7 +147,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname IN ('White','Heisenberg');"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname IN ('White','Heisenberg');"); } /** @@ -163,7 +162,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastnames = ['White','Heisenberg'] AND age = 42;"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastnames = ['White','Heisenberg'] AND age = 42;"); } /** @@ -204,7 +203,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname IN ('White','Heisenberg');"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname IN ('White','Heisenberg');"); } /** @@ -219,7 +218,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname = 'Matthews';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname = 'Matthews';"); } /** @@ -234,7 +233,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname = 'Matthews';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname = 'Matthews';"); } /** @@ -249,7 +248,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname = 'Matthews';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname = 'Matthews';"); } /** @@ -264,13 +263,13 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname = 'Woohoo';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname = 'Woohoo';"); accessor = new CassandraParametersParameterAccessor(cassandraQuery.getQueryMethod(), "Walter"); actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname = 'Walter';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname = 'Walter';"); } /** @@ -285,7 +284,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - assertThat(actual, is(equalTo("SELECT * FROM person WHERE lastname='Matthews' or firstname = 'Matthews';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE lastname='Matthews' or firstname = 'Matthews';"); } /** @@ -305,7 +304,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { expected.setForceNoValues(true); expected.where(QueryBuilder.eq("lastname", "Matthews")).and(QueryBuilder.eq("firstname", "John")); - assertThat(actual, is(expected.toString())); + assertThat(actual).isEqualTo(expected.getQueryString()); } /** @@ -320,12 +319,7 @@ public class StringBasedCassandraQueryIntegrationUnitTests { String actual = cassandraQuery.createQuery(accessor); - String table = Person.class.getSimpleName().toLowerCase(); - Select expected = QueryBuilder.select().all().from(table); - expected.setForceNoValues(true); - expected.where(QueryBuilder.eq("createdDate", com.datastax.driver.core.LocalDate.fromYearMonthDay(2010, 7, 4))); - - assertThat(actual, is(equalTo("SELECT * FROM person WHERE createdDate='2010-07-04';"))); + assertThat(actual).isEqualTo("SELECT * FROM person WHERE createdDate='2010-07-04';"); } private StringBasedCassandraQuery getQueryMethod(String name, Class... args) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java old mode 100644 new mode 100755 index fe01548f5..e236dd993 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.repository.support; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.Serializable; import java.util.HashMap; @@ -38,7 +38,7 @@ public class BasicMapIdUnitTests { BasicMapId basicMapId = new BasicMapId(map); - assertEquals(basicMapId.get("field1"), map.get("field1")); - assertEquals(basicMapId.get("field2"), map.get("field2")); + assertThat(map.get("field1")).isEqualTo(basicMapId.get("field1")); + assertThat(map.get("field2")).isEqualTo(basicMapId.get("field2")); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryUnitTests.java index 78c2db9e0..e21e8357a 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.repository.support; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.Serializable; @@ -43,17 +42,13 @@ import org.springframework.data.repository.Repository; @SuppressWarnings({ "rawtypes", "unchecked" }) public class CassandraRepositoryFactoryUnitTests { - @Mock - private CassandraConverter converter; + @Mock private CassandraConverter converter; - @Mock - private CassandraMappingContext mappingContext; + @Mock private CassandraMappingContext mappingContext; - @Mock - private CassandraPersistentEntity entity; + @Mock private CassandraPersistentEntity entity; - @Mock - private CassandraTemplate template; + @Mock private CassandraTemplate template; @Before public void setUp() { @@ -71,10 +66,10 @@ public class CassandraRepositoryFactoryUnitTests { CassandraRepositoryFactory repositoryFactory = new CassandraRepositoryFactory(template); - CassandraEntityInformation entityInformation = - repositoryFactory.getEntityInformation(Person.class); + CassandraEntityInformation entityInformation = repositoryFactory + .getEntityInformation(Person.class); - assertTrue(entityInformation instanceof MappingCassandraEntityInformation); + assertThat(entityInformation).isInstanceOf(MappingCassandraEntityInformation.class); } /** @@ -88,9 +83,8 @@ public class CassandraRepositoryFactoryUnitTests { CassandraRepositoryFactory repositoryFactory = new CassandraRepositoryFactory(template); MyPersonRepository repository = repositoryFactory.getRepository(MyPersonRepository.class); - assertThat(repository, is(notNullValue())); + assertThat(repository).isNotNull(); } - interface MyPersonRepository extends Repository { - } + interface MyPersonRepository extends Repository {} } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/MapIdFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/MapIdFactoryUnitTests.java old mode 100644 new mode 100755 index cbd82d8a4..1a17fd80e --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/MapIdFactoryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/MapIdFactoryUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.repository.support; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.cassandra.repository.support.IdInterfaceValidator.*; import static org.springframework.data.cassandra.repository.support.MapIdFactory.*; @@ -61,60 +61,60 @@ public class MapIdFactoryUnitTests { HappyExtendingMapIdAndSerializable id = id(HappyExtendingMapIdAndSerializable.class); - assertNull(id.string()); - assertNull(id.number()); - assertNull(id.getString()); - assertNull(id.getNumber()); + assertThat(id.string()).isNull(); + assertThat(id.number()).isNull(); + assertThat(id.getString()).isNull(); + assertThat(id.getNumber()).isNull(); id.setNumber(i); - assertEquals(i, id.getNumber()); - assertEquals(i, id.number()); - assertEquals(i, id.get("number")); + assertThat(id.getNumber()).isEqualTo(i); + assertThat(id.number()).isEqualTo(i); + assertThat(id.get("number")).isEqualTo(i); HappyExtendingMapIdAndSerializable returned = null; returned = id.number(i = r.nextInt()); - assertSame(returned, id); - assertEquals(i, id.getNumber()); - assertEquals(i, id.number()); - assertEquals(i, id.get("number")); + assertThat(id).isSameAs(returned); + assertThat(id.getNumber()).isEqualTo(i); + assertThat(id.number()).isEqualTo(i); + assertThat(id.get("number")).isEqualTo(i); id.put("number", i = r.nextInt()); - assertEquals(i, id.getNumber()); - assertEquals(i, id.number()); - assertEquals(i, id.get("number")); + assertThat(id.getNumber()).isEqualTo(i); + assertThat(id.number()).isEqualTo(i); + assertThat(id.get("number")).isEqualTo(i); id.setString(s); - assertEquals(s, id.getString()); - assertEquals(s, id.string()); - assertEquals(s, id.get("string")); + assertThat(id.getString()).isEqualTo(s); + assertThat(id.string()).isEqualTo(s); + assertThat(id.get("string")).isEqualTo(s); returned = id.string(s = "" + r.nextInt()); - assertSame(returned, id); - assertEquals(s, id.getString()); - assertEquals(s, id.string()); - assertEquals(s, id.get("string")); + assertThat(id).isSameAs(returned); + assertThat(id.getString()).isEqualTo(s); + assertThat(id.string()).isEqualTo(s); + assertThat(id.get("string")).isEqualTo(s); returned = id.withString(s = "" + r.nextInt()); - assertSame(returned, id); - assertEquals(s, id.getString()); - assertEquals(s, id.string()); - assertEquals(s, id.get("string")); + assertThat(id).isSameAs(returned); + assertThat(id.getString()).isEqualTo(s); + assertThat(id.string()).isEqualTo(s); + assertThat(id.get("string")).isEqualTo(s); id.put("string", s = "" + r.nextInt()); - assertEquals(s, id.getString()); - assertEquals(s, id.string()); - assertEquals(s, id.get("string")); + assertThat(id.getString()).isEqualTo(s); + assertThat(id.string()).isEqualTo(s); + assertThat(id.get("string")).isEqualTo(s); id.setString(null); - assertNull(id.getString()); - assertNull(id.string()); - assertNull(id.get("string")); + assertThat(id.getString()).isNull(); + assertThat(id.string()).isNull(); + assertThat(id.get("string")).isNull(); id.setNumber(null); - assertNull(id.getNumber()); - assertNull(id.number()); - assertNull(id.get("number")); + assertThat(id.getNumber()).isNull(); + assertThat(id.number()).isNull(); + assertThat(id.get("number")).isNull(); } interface HappyExtendingNothing { @@ -145,64 +145,64 @@ public class MapIdFactoryUnitTests { HappyExtendingNothing id = id(HappyExtendingNothing.class); - assertTrue(id instanceof Serializable); - assertTrue(id instanceof MapId); + assertThat(id instanceof Serializable).isTrue(); + assertThat(id instanceof MapId).isTrue(); MapId mapid = (MapId) id; - assertNull(id.string()); - assertNull(id.number()); - assertNull(id.getString()); - assertNull(id.getNumber()); + assertThat(id.string()).isNull(); + assertThat(id.number()).isNull(); + assertThat(id.getString()).isNull(); + assertThat(id.getNumber()).isNull(); id.setNumber(i); - assertEquals(i, id.getNumber()); - assertEquals(i, id.number()); - assertEquals(i, mapid.get("number")); + assertThat(id.getNumber()).isEqualTo(i); + assertThat(id.number()).isEqualTo(i); + assertThat(mapid.get("number")).isEqualTo(i); HappyExtendingNothing returned = null; returned = id.number(i = r.nextInt()); - assertSame(returned, id); - assertEquals(i, id.getNumber()); - assertEquals(i, id.number()); - assertEquals(i, mapid.get("number")); + assertThat(id).isSameAs(returned); + assertThat(id.getNumber()).isEqualTo(i); + assertThat(id.number()).isEqualTo(i); + assertThat(mapid.get("number")).isEqualTo(i); mapid.put("number", i = r.nextInt()); - assertEquals(i, id.getNumber()); - assertEquals(i, id.number()); - assertEquals(i, mapid.get("number")); + assertThat(id.getNumber()).isEqualTo(i); + assertThat(id.number()).isEqualTo(i); + assertThat(mapid.get("number")).isEqualTo(i); id.setString(s); - assertEquals(s, id.getString()); - assertEquals(s, id.string()); - assertEquals(s, mapid.get("string")); + assertThat(id.getString()).isEqualTo(s); + assertThat(id.string()).isEqualTo(s); + assertThat(mapid.get("string")).isEqualTo(s); returned = id.string(s = "" + r.nextInt()); - assertSame(returned, id); - assertEquals(s, id.getString()); - assertEquals(s, id.string()); - assertEquals(s, mapid.get("string")); + assertThat(id).isSameAs(returned); + assertThat(id.getString()).isEqualTo(s); + assertThat(id.string()).isEqualTo(s); + assertThat(mapid.get("string")).isEqualTo(s); returned = id.withString(s = "" + r.nextInt()); - assertSame(returned, id); - assertEquals(s, id.getString()); - assertEquals(s, id.string()); - assertEquals(s, mapid.get("string")); + assertThat(id).isSameAs(returned); + assertThat(id.getString()).isEqualTo(s); + assertThat(id.string()).isEqualTo(s); + assertThat(mapid.get("string")).isEqualTo(s); mapid.put("string", s = "" + r.nextInt()); - assertEquals(s, id.getString()); - assertEquals(s, id.string()); - assertEquals(s, mapid.get("string")); + assertThat(id.getString()).isEqualTo(s); + assertThat(id.string()).isEqualTo(s); + assertThat(mapid.get("string")).isEqualTo(s); id.setString(null); - assertNull(id.getString()); - assertNull(id.string()); - assertNull(mapid.get("string")); + assertThat(id.getString()).isNull(); + assertThat(id.string()).isNull(); + assertThat(mapid.get("string")).isNull(); id.setNumber(null); - assertNull(id.getNumber()); - assertNull(id.number()); - assertNull(mapid.get("number")); + assertThat(id.getNumber()).isNull(); + assertThat(id.number()).isNull(); + assertThat(mapid.get("number")).isNull(); } class IdClass {} @@ -276,7 +276,7 @@ public class MapIdFactoryUnitTests { validate(i); fail("should've caught IdInterfaceException validating interface " + i); } catch (IdInterfaceExceptions e) { - assertEquals(1, e.getCount()); + assertThat(e.getCount()).isEqualTo(1); } } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/collections/CollectionsRowValueProviderIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/collections/CollectionsRowValueProviderIntegrationTests.java old mode 100644 new mode 100755 index d02eb2a37..530d7934c --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/collections/CollectionsRowValueProviderIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/collections/CollectionsRowValueProviderIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.collections; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.IOException; import java.util.Date; @@ -86,9 +86,9 @@ public class CollectionsRowValueProviderIntegrationTests extends AbstractKeyspac BookHistory b = operations.selectOne(select, BookHistory.class); - assertNotNull(b.getCheckOuts()); - assertEquals(b.getTitle(), "Spring Data Cassandra Guide"); - assertEquals(b.getAuthor(), "Cassandra Guru"); + assertThat(b.getCheckOuts()).isNotNull(); + assertThat("Spring Data Cassandra Guide").isEqualTo(b.getTitle()); + assertThat("Cassandra Guru").isEqualTo(b.getAuthor()); } @@ -122,9 +122,10 @@ public class CollectionsRowValueProviderIntegrationTests extends AbstractKeyspac BookReference b = operations.selectOne(select, BookReference.class); - assertNotNull(b.getReferences()); - assertNotNull(b.getBookmarks()); - assertEquals(b.getTitle(), "Spring Data Cassandra Guide"); - assertEquals(b.getAuthor(), "Cassandra Guru"); + assertThat(b.getReferences()).isNotNull(); + assertThat(b.getBookmarks()).isNotNull(); + assertThat("Spring Data Cassandra Guide").isEqualTo(b.getTitle()); + assertThat("Cassandra Guru").isEqualTo(b.getAuthor()); + } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryIntegrationTests.java old mode 100644 new mode 100755 index 2b9d871cc..41a22f850 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.composites; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.springframework.data.cassandra.core.CassandraOperations; @@ -54,9 +54,9 @@ public class CommentRepositoryIntegrationTests { Comment retrieved = repository.findOne(key); - assertNotSame(c, retrieved); - assertEquals(c, retrieved); - assertEquals(c.getText(), retrieved.getText()); + assertThat(retrieved).isNotSameAs(c); + assertThat(retrieved).isEqualTo(c); + assertThat(retrieved.getText()).isEqualTo(c.getText()); } public void testUpdateNonKeyField() { @@ -73,9 +73,9 @@ public class CommentRepositoryIntegrationTests { Comment retrieved = repository.findOne(key); - assertNotSame(c, retrieved); - assertEquals(c, retrieved); - assertEquals(c.getText(), retrieved.getText()); + assertThat(retrieved).isNotSameAs(c); + assertThat(retrieved).isEqualTo(c); + assertThat(retrieved.getText()).isEqualTo(c.getText()); String newText = "x" + retrieved.getText(); retrieved.setText(newText); @@ -84,8 +84,8 @@ public class CommentRepositoryIntegrationTests { Comment updated = repository.findOne(key); - assertNotSame(retrieved, updated); - assertEquals(newText, updated.getText()); + assertThat(updated).isNotSameAs(retrieved); + assertThat(updated.getText()).isEqualTo(newText); } public void testDelete() { @@ -102,12 +102,12 @@ public class CommentRepositoryIntegrationTests { Comment retrieved = repository.findOne(key); - assertNotSame(c, retrieved); - assertEquals(c, retrieved); - assertEquals(c.getText(), retrieved.getText()); + assertThat(retrieved).isNotSameAs(c); + assertThat(retrieved).isEqualTo(c); + assertThat(retrieved.getText()).isEqualTo(c.getText()); repository.delete(retrieved); - assertNull(repository.findOne(key)); + assertThat(repository.findOne(key)).isNull(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryJavaConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryXmlConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/SchemaActionIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/SchemaActionIntegrationTests.java old mode 100644 new mode 100755 index d00784d38..4e9673949 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/SchemaActionIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/SchemaActionIntegrationTests.java @@ -16,8 +16,7 @@ package org.springframework.data.cassandra.test.integration.config; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collections; import java.util.List; @@ -56,18 +55,15 @@ public class SchemaActionIntegrationTests extends AbstractEmbeddedCassandraInteg protected static final String KEYSPACE_NAME = SchemaActionIntegrationTests.class.getSimpleName().toLowerCase(); - protected static final String PERSON_TABLE_DEFINITION_CQL = String.format( - "CREATE TABLE %s.person (id int, firstName text, lastName text, PRIMARY KEY(id));", KEYSPACE_NAME); + protected static final String PERSON_TABLE_DEFINITION_CQL = String + .format("CREATE TABLE %s.person (id int, firstName text, lastName text, PRIMARY KEY(id));", KEYSPACE_NAME); - @Rule - public ExpectedException exception = ExpectedException.none(); + @Rule public ExpectedException exception = ExpectedException.none(); - @Rule - public KeyspaceRule KEYSPACE_RULE = new KeyspaceRule(cassandraEnvironment, KEYSPACE_NAME); + @Rule public KeyspaceRule KEYSPACE_RULE = new KeyspaceRule(cassandraEnvironment, KEYSPACE_NAME); protected ConfigurableApplicationContext newApplicationContext(Class... annotatedClasses) { - AnnotationConfigApplicationContext applicationContext = - new AnnotationConfigApplicationContext(annotatedClasses); + AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(annotatedClasses); applicationContext.registerShutdownHook(); @@ -91,17 +87,16 @@ public class SchemaActionIntegrationTests extends AbstractEmbeddedCassandraInteg Metadata clusterMetadata = session.getCluster().getMetadata(); KeyspaceMetadata keyspaceMetadata = clusterMetadata.getKeyspace(KEYSPACE_NAME); - assertThat(String.format("Keyspace [%s] does not exist!", KEYSPACE_NAME), keyspaceMetadata, is(notNullValue())); + assertThat(keyspaceMetadata).isNotNull(); TableMetadata tableMetadata = keyspaceMetadata.getTable(tableName); - assertThat(String.format("Table [%s] does not exist!", tableName), tableMetadata, is(notNullValue())); + assertThat(tableMetadata).isNotNull(); - assertThat(tableMetadata.getColumns().size(), is(equalTo(columns.length))); + assertThat(tableMetadata.getColumns()).hasSize(columns.length); for (String columnName : columns) { - assertThat(String.format("Column [%s] dos not exist!", columnName), tableMetadata.getColumn(columnName), - is(notNullValue())); + assertThat(tableMetadata.getColumn(columnName)).isNotNull(); } } @@ -119,16 +114,19 @@ public class SchemaActionIntegrationTests extends AbstractEmbeddedCassandraInteg @Test public void createWithExistingTableThrowsErrorWhenCreatingTableFromEntity() { - exception.expect(BeanCreationException.class); - exception.expectMessage(containsString(String.format("Table %s.person already exists", KEYSPACE_NAME))); - doInSessionWithConfiguration(CreateWithExistingTableConfiguration.class, new SessionCallback() { - @Override - public Object doInSession(Session s) throws DataAccessException { - fail(String.format("%s should have failed!", CreateWithExistingTableConfiguration.class.getSimpleName())); - return null; - } - }); + try { + doInSessionWithConfiguration(CreateWithExistingTableConfiguration.class, new SessionCallback() { + @Override + public Object doInSession(Session s) throws DataAccessException { + fail(String.format("%s should have failed!", CreateWithExistingTableConfiguration.class.getSimpleName())); + return null; + } + }); + fail("Missing BeanCreationException"); + } catch (BeanCreationException e) { + assertThat(e).hasMessageContaining(String.format("Table %s.person already exists", KEYSPACE_NAME)); + } } @Test diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/AsynchronousCassandraTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/AsynchronousCassandraTemplateIntegrationTests.java old mode 100644 new mode 100755 index 857ac50c9..48c682c05 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/AsynchronousCassandraTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/AsynchronousCassandraTemplateIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.cassandra.repository.support.BasicMapId.*; @@ -89,7 +88,7 @@ public class AsynchronousCassandraTemplateIntegrationTests extends AbstractKeysp throw listener.exception; } - assertEquals(person, listener.entities.iterator().next()); + assertThat(listener.entities.iterator().next()).isEqualTo(person); } @Test(expected = CancellationException.class) @@ -153,7 +152,7 @@ public class AsynchronousCassandraTemplateIntegrationTests extends AbstractKeysp throw listener.exception; } - assertEquals(person, listener.entities.iterator().next()); + assertThat(listener.entities.iterator().next()).isEqualTo(person); } @Test @@ -179,7 +178,7 @@ public class AsynchronousCassandraTemplateIntegrationTests extends AbstractKeysp if (listener.exception != null) { throw listener.exception; } - assertFalse(operations.exists(Person.class, id("id", person.id))); + assertThat(operations.exists(Person.class, id("id", person.id))).isFalse(); } @Test(expected = CancellationException.class) @@ -217,8 +216,8 @@ public class AsynchronousCassandraTemplateIntegrationTests extends AbstractKeysp operations.selectOneAsynchronously(cql, Person.class, objectListener); objectListener.await(); - assertThat(objectListener.getResult(), is(notNullValue())); - assertThat(objectListener.getResult().id, is(equalTo(person.id))); + assertThat(objectListener.getResult()).isNotNull(); + assertThat(objectListener.getResult().id).isEqualTo(person.id); } /** @@ -233,7 +232,7 @@ public class AsynchronousCassandraTemplateIntegrationTests extends AbstractKeysp operations.selectOneAsynchronously(cql, Person.class, objectListener); objectListener.await(); - assertThat(objectListener.getResult(), is(nullValue())); + assertThat(objectListener.getResult()).isNull(); } @Table diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/CassandraAdminTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/CassandraAdminTemplateIntegrationTests.java old mode 100644 new mode 100755 index 02b68ca55..90b1951a8 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/CassandraAdminTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/CassandraAdminTemplateIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.core; -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.MatcherAssert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; @@ -65,27 +64,27 @@ public class CassandraAdminTemplateIntegrationTests extends AbstractKeyspaceCrea @Test public void testCreateTables() throws Exception { - assertThat(getKeyspaceMetadata().getTables().size(), is(0)); + assertThat(getKeyspaceMetadata().getTables()).hasSize(0); cassandraAdminTemplate.createTable(true, CqlIdentifier.cqlId("book"), Book.class, null); - assertThat(getKeyspaceMetadata().getTables().size(), is(1)); + assertThat(getKeyspaceMetadata().getTables()).hasSize(1); cassandraAdminTemplate.createTable(true, CqlIdentifier.cqlId("book"), Book.class, null); - assertThat(getKeyspaceMetadata().getTables().size(), is(1)); + assertThat(getKeyspaceMetadata().getTables()).hasSize(1); } @Test public void testDropTable() throws Exception { cassandraAdminTemplate.createTable(true, CqlIdentifier.cqlId("book"), Book.class, null); - assertThat(getKeyspaceMetadata().getTables().size(), is(1)); + assertThat(getKeyspaceMetadata().getTables()).hasSize(1); cassandraAdminTemplate.dropTable(Book.class); - assertThat(getKeyspaceMetadata().getTables().size(), is(0)); + assertThat(getKeyspaceMetadata().getTables()).hasSize(0); cassandraAdminTemplate.createTable(true, CqlIdentifier.cqlId("book"), Book.class, null); cassandraAdminTemplate.dropTable(CqlIdentifier.cqlId("book")); - assertThat(getKeyspaceMetadata().getTables().size(), is(0)); + assertThat(getKeyspaceMetadata().getTables()).hasSize(0); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/CassandraOperationsIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/CassandraOperationsIntegrationTests.java old mode 100644 new mode 100755 index 06e36ee9e..4ad83a0da --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/CassandraOperationsIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/CassandraOperationsIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.Arrays; @@ -177,15 +176,14 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin public void insertEmptyList() { List list = template.insert(new ArrayList()); - assertThat(list, is(notNullValue(List.class))); - assertThat(list.isEmpty(), is(true)); + assertThat(list.isEmpty()).isTrue(); } @Test public void insertNullList() { List list = template.insert((List) null); - assertThat(list, is(nullValue(List.class))); + assertThat(list).isNull(); } @Test @@ -209,7 +207,7 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin template.insert(books, options); - assertThat(template.count(Book.class), is(equalTo(80l))); + assertThat(template.count(Book.class)).isEqualTo(80l); } @Test @@ -583,8 +581,8 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin Book book = template.selectOne(select, Book.class); - assertThat(book.getTitle(), is(equalTo("Spring Data Cassandra Guide"))); - assertThat(book.getAuthor(), is(equalTo("Cassandra Guru"))); + assertThat(book.getTitle()).isEqualTo("Spring Data Cassandra Guide"); + assertThat(book.getAuthor()).isEqualTo("Cassandra Guru"); } @@ -599,11 +597,11 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin List selectedBooks = template.select(select, Book.class); - assertThat(selectedBooks.size(), is(equalTo(20))); + assertThat(selectedBooks).hasSize(20); for (Book book : selectedBooks) { - assertThat(book.isInStock(), is(true)); - assertThat(book.getCondition(), is(equalTo(BookCondition.NEW))); + assertThat(book.isInStock()).isTrue(); + assertThat(book.getCondition()).isEqualTo(BookCondition.NEW); } } @@ -615,7 +613,7 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin template.insert(books); - assertThat(template.count(Book.class), is(equalTo(count))); + assertThat(template.count(Book.class)).isEqualTo(count); } @Test @@ -626,7 +624,7 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin template.insert(books); - assertThat(template.count(Book.class), is(equalTo(count))); + assertThat(template.count(Book.class)).isEqualTo(count); } /** @@ -647,8 +645,8 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin Book loaded = template.selectOneById(Book.class, book.getIsbn()); - assertThat(loaded.getTitle(), is(nullValue())); - assertThat(loaded.getAuthor(), is(equalTo("author"))); + assertThat(loaded.getTitle()).isNull(); + assertThat(loaded.getAuthor()).isEqualTo("author"); } /** @@ -670,8 +668,8 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin Book loaded = template.selectOneById(Book.class, book.getIsbn()); - assertThat(loaded.getTitle(), is(nullValue())); - assertThat(loaded.getAuthor(), is(equalTo("author"))); + assertThat(loaded.getTitle()).isNull(); + assertThat(loaded.getAuthor()).isEqualTo("author"); } /** @@ -689,9 +687,9 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin Book loaded = template.selectOneById(Book.class, book.getIsbn()); - assertThat(loaded, is(notNullValue())); - assertThat(loaded.getAuthor(), is(equalTo("author"))); - assertThat(loaded.getTitle(), is(equalTo("title"))); + assertThat(loaded).isNotNull(); + assertThat(loaded.getAuthor()).isEqualTo("author"); + assertThat(loaded.getTitle()).isEqualTo("title"); } /** @@ -713,8 +711,8 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin BookReference loaded = template.selectOneById(BookReference.class, bookReference.getIsbn()); - assertThat(loaded.getTitle(), is(nullValue())); - assertThat(loaded.getBookmarks(), is(nullValue())); + assertThat(loaded.getTitle()).isNull(); + assertThat(loaded.getBookmarks()).isNull(); } /** @@ -723,7 +721,7 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin @Test public void stream() throws InterruptedException { - while(template.select("SELECT * FROM book", Book.class).size() != 0){ + while (template.select("SELECT * FROM book", Book.class).size() != 0) { template.truncate("book"); Thread.sleep(10); } @@ -732,7 +730,7 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin Iterator iterator = template.stream("SELECT * FROM book", Book.class); - assertThat(iterator, is(notNullValue(Iterator.class))); + assertThat(iterator).isNotNull(); List selectedBooks = new ArrayList(); @@ -740,8 +738,8 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin selectedBooks.add(book); } - assertThat(selectedBooks.size(), is(equalTo(20))); - assertThat(selectedBooks.get(0), is(instanceOf(Book.class))); + assertThat(selectedBooks).hasSize(20); + assertThat(selectedBooks.get(0)).isInstanceOf(Book.class); } /** @@ -762,15 +760,15 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin UserToken loaded = template.selectOneById(UserToken.class, BasicMapId.id("userId", userToken.getUserId()).with("token", userToken.getToken())); - assertThat(loaded, is(notNullValue())); - assertThat(loaded.getUserComment(), is(equalTo("comment"))); + assertThat(loaded).isNotNull(); + assertThat(loaded.getUserComment()).isEqualTo("comment"); template.delete(userToken); UserToken loadAfterDelete = template.selectOneById(UserToken.class, BasicMapId.id("userId", userToken.getUserId()).with("token", userToken.getToken())); - assertThat(loadAfterDelete, is(nullValue())); + assertThat(loadAfterDelete).isNull(); } /** @@ -791,15 +789,15 @@ public class CassandraOperationsIntegrationTests extends AbstractKeyspaceCreatin UserToken loaded = template.selectOneById(UserToken.class, BasicMapId.id("userId", userToken.getUserId()).with("token", userToken.getToken())); - assertThat(loaded, is(notNullValue())); - assertThat(loaded.getUserComment(), is(equalTo("comment"))); + assertThat(loaded).isNotNull(); + assertThat(loaded.getUserComment()).isEqualTo("comment"); template.delete(Collections.singletonList(userToken)); UserToken loadAfterDelete = template.selectOneById(UserToken.class, BasicMapId.id("userId", userToken.getUserId()).with("token", userToken.getToken())); - assertThat(loadAfterDelete, is(nullValue())); + assertThat(loadAfterDelete).isNull(); } WriteOptions newWriteOptions(ConsistencyLevel consistencyLevel, RetryPolicy retryPolicy, int timeToLive) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java old mode 100644 new mode 100755 index 479ed8752..e89d0803c --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.Date; @@ -77,7 +77,7 @@ public class CompositeKeyCrudIntegrationTests extends AbstractKeyspaceCreatingIn select.setConsistencyLevel(ConsistencyLevel.ONE); List correlationEntities = operations.select(select, CorrelationEntity.class); - assertEquals(2, correlationEntities.size()); + assertThat(correlationEntities).hasSize(2); QueryOptions qo = new QueryOptions(); qo.setConsistencyLevel(org.springframework.cassandra.core.ConsistencyLevel.ONE); @@ -88,7 +88,7 @@ public class CompositeKeyCrudIntegrationTests extends AbstractKeyspaceCreatingIn correlationEntities = operations.select(select, CorrelationEntity.class); - assertEquals(0, correlationEntities.size()); + assertThat(correlationEntities).isEmpty(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryJavaConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java old mode 100644 new mode 100755 index f4e07c15d..df8c46f3b --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.UUID; @@ -48,26 +48,26 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests { // insert Implicit s = implicitRepository.save(entity); - assertSame(s, entity); + assertThat(entity).isSameAs(s); // select Implicit f = implicitRepository.findOne(key); - assertNotSame(f, entity); + assertThat(entity).isNotSameAs(f); String stringValue = query("stringvalue", "\"Implicit\"", "\"keyZero\"", f.getPrimaryKey().getKeyZero(), "\"keyOne\"", f.getPrimaryKey().getKeyOne()); - assertEquals(f.getStringValue(), stringValue); + assertThat(stringValue).isEqualTo(f.getStringValue()); // update f.setStringValue(f.getStringValue() + "X"); Implicit u = implicitRepository.save(f); - assertSame(u, f); + assertThat(f).isSameAs(u); f = implicitRepository.findOne(u.getPrimaryKey()); - assertNotSame(f, u); - assertEquals(u.getStringValue(), f.getStringValue()); + assertThat(u).isNotSameAs(f); + assertThat(f.getStringValue()).isEqualTo(u.getStringValue()); // delete implicitRepository.delete(key); - assertNull(implicitRepository.findOne(key)); + assertThat(implicitRepository.findOne(key)).isNull(); } public void testExplicit(String tableName, String stringValueColumnName, String keyZeroColumnName, @@ -77,25 +77,25 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests { // insert Explicit s = explicitRepository.save(entity); - assertSame(s, entity); + assertThat(entity).isSameAs(s); // select Explicit f = explicitRepository.findOne(key); - assertNotSame(f, entity); + assertThat(entity).isNotSameAs(f); String stringValue = query(stringValueColumnName, tableName, keyZeroColumnName, f.getPrimaryKey().getKeyZero(), keyOneColumnName, f.getPrimaryKey().getKeyOne()); - assertEquals(f.getStringValue(), stringValue); + assertThat(stringValue).isEqualTo(f.getStringValue()); // update f.setStringValue(f.getStringValue() + "X"); Explicit u = explicitRepository.save(f); - assertSame(u, f); + assertThat(f).isSameAs(u); f = explicitRepository.findOne(u.getPrimaryKey()); - assertNotSame(f, u); - assertEquals(u.getStringValue(), f.getStringValue()); + assertThat(u).isNotSameAs(f); + assertThat(f.getStringValue()).isEqualTo(u.getStringValue()); // delete explicitRepository.delete(key); - assertNull(explicitRepository.findOne(key)); + assertThat(explicitRepository.findOne(key)).isNull(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryJavaConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java old mode 100644 new mode 100755 index 87e75bf9e..d834ec472 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.forcequote.config; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.springframework.data.cassandra.core.CassandraOperations; @@ -46,17 +46,17 @@ public class ForceQuotedRepositoryTests { String key = entity.getPrimaryKey(); Implicit s = implicitRepository.save(entity); - assertSame(s, entity); + assertThat(entity).isSameAs(s); Implicit f = implicitRepository.findOne(key); - assertNotSame(f, entity); + assertThat(entity).isNotSameAs(f); String stringValue = query("stringvalue", "\"Implicit\"", "primarykey", f.getPrimaryKey()); - assertEquals(f.getStringValue(), stringValue); + assertThat(stringValue).isEqualTo(f.getStringValue()); implicitRepository.delete(key); - assertNull(implicitRepository.findOne(key)); + assertThat(implicitRepository.findOne(key)).isNull(); } public void testExplicit(String tableName) { @@ -64,17 +64,17 @@ public class ForceQuotedRepositoryTests { String key = entity.getPrimaryKey(); Explicit s = explicitRepository.save(entity); - assertSame(s, entity); + assertThat(entity).isSameAs(s); Explicit f = explicitRepository.findOne(key); - assertNotSame(f, entity); + assertThat(entity).isNotSameAs(f); String stringValue = query("stringvalue", String.format("\"%s\"", tableName), "primarykey", f.getPrimaryKey()); - assertEquals(f.getStringValue(), stringValue); + assertThat(stringValue).isEqualTo(f.getStringValue()); explicitRepository.delete(key); - assertNull(explicitRepository.findOne(key)); + assertThat(explicitRepository.findOne(key)).isNull(); } public void testImplicitProperties() { @@ -82,17 +82,17 @@ public class ForceQuotedRepositoryTests { String key = entity.getPrimaryKey(); ImplicitProperties s = implicitPropertiesRepository.save(entity); - assertSame(s, entity); + assertThat(entity).isSameAs(s); ImplicitProperties f = implicitPropertiesRepository.findOne(key); - assertNotSame(f, entity); + assertThat(entity).isNotSameAs(f); String stringValue = query("\"stringValue\"", "implicitproperties", "\"primaryKey\"", f.getPrimaryKey()); - assertEquals(f.getStringValue(), stringValue); + assertThat(stringValue).isEqualTo(f.getStringValue()); implicitPropertiesRepository.delete(key); - assertNull(implicitPropertiesRepository.findOne(key)); + assertThat(implicitPropertiesRepository.findOne(key)).isNull(); } public void testExplicitProperties(String stringValueColumnName, String primaryKeyColumnName) { @@ -100,17 +100,17 @@ public class ForceQuotedRepositoryTests { String key = entity.getPrimaryKey(); ExplicitProperties s = explicitPropertiesRepository.save(entity); - assertSame(s, entity); + assertThat(entity).isSameAs(s); ExplicitProperties f = explicitPropertiesRepository.findOne(key); - assertNotSame(f, entity); + assertThat(entity).isNotSameAs(f); String stringValue = query(String.format("\"%s\"", stringValueColumnName), "explicitproperties", String.format("\"%s\"", primaryKeyColumnName), f.getPrimaryKey()); - assertEquals(f.getStringValue(), stringValue); + assertThat(stringValue).isEqualTo(f.getStringValue()); implicitPropertiesRepository.delete(key); - assertNull(implicitPropertiesRepository.findOne(key)); + assertThat(implicitPropertiesRepository.findOne(key)).isNull(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/customconversion/CustomConversionTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/customconversion/CustomConversionTests.java old mode 100644 new mode 100755 index e865c9983..15592ff12 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/customconversion/CustomConversionTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/customconversion/CustomConversionTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.mapping.customconversion; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import java.io.IOException; import java.util.ArrayList; @@ -92,8 +91,8 @@ public class CustomConversionTests extends AbstractKeyspaceCreatingIntegrationTe Row row = cassandraOperations.selectOne(QueryBuilder.select("id", "person").from("employee"), Row.class); - assertThat(row.getString("id"), is(equalTo("employee-id"))); - assertThat(row.getString("person"), containsString("\"firstname\":\"Homer\"")); + assertThat(row.getString("id")).isEqualTo("employee-id"); + assertThat(row.getString("person")).contains("\"firstname\":\"Homer\""); } /** @@ -112,8 +111,8 @@ public class CustomConversionTests extends AbstractKeyspaceCreatingIntegrationTe Row row = cassandraOperations.selectOne(QueryBuilder.select("id", "person").from("employee"), Row.class); - assertThat(row.getString("id"), is(equalTo("employee-id"))); - assertThat(row.getString("person"), containsString("\"firstname\":\"Homer\"")); + assertThat(row.getString("id")).isEqualTo("employee-id"); + assertThat(row.getString("person")).contains("\"firstname\":\"Homer\""); } /** @@ -133,11 +132,11 @@ public class CustomConversionTests extends AbstractKeyspaceCreatingIntegrationTe Row row = cassandraOperations.selectOne(QueryBuilder.select("id", "person", "friends", "people").from("employee"), Row.class); - assertThat(row.getObject("friends"), is(instanceOf(List.class))); - assertThat(row.getList("friends", String.class), hasSize(2)); + assertThat(row.getObject("friends")).isInstanceOf(List.class); + assertThat(row.getList("friends", String.class)).hasSize(2); - assertThat(row.getObject("people"), is(instanceOf(Set.class))); - assertThat(row.getSet("people", String.class), hasSize(1)); + assertThat(row.getObject("people")).isInstanceOf(Set.class); + assertThat(row.getSet("people", String.class)).hasSize(1); } /** @@ -156,11 +155,11 @@ public class CustomConversionTests extends AbstractKeyspaceCreatingIntegrationTe Row row = cassandraOperations.selectOne(QueryBuilder.select("id", "person", "friends", "people").from("employee"), Row.class); - assertThat(row.getObject("friends"), is(instanceOf(List.class))); - assertThat(row.getList("friends", String.class), hasSize(2)); + assertThat(row.getObject("friends")).isInstanceOf(List.class); + assertThat(row.getList("friends", String.class)).hasSize(2); - assertThat(row.getObject("people"), is(instanceOf(Set.class))); - assertThat(row.getSet("people", String.class), hasSize(1)); + assertThat(row.getObject("people")).isInstanceOf(Set.class); + assertThat(row.getSet("people", String.class)).hasSize(1); } /** @@ -175,10 +174,10 @@ public class CustomConversionTests extends AbstractKeyspaceCreatingIntegrationTe Employee employee = cassandraOperations.selectOne(QueryBuilder.select("id", "person").from("employee"), Employee.class); - assertThat(employee.getId(), is(equalTo("employee-id"))); - assertThat(employee.getPerson(), is(notNullValue())); - assertThat(employee.getPerson().getFirstname(), is(equalTo("Homer"))); - assertThat(employee.getPerson().getLastname(), is(equalTo("Simpson"))); + assertThat(employee.getId()).isEqualTo("employee-id"); + assertThat(employee.getPerson()).isNotNull(); + assertThat(employee.getPerson().getFirstname()).isEqualTo("Homer"); + assertThat(employee.getPerson().getLastname()).isEqualTo("Simpson"); } /** @@ -193,11 +192,11 @@ public class CustomConversionTests extends AbstractKeyspaceCreatingIntegrationTe Employee employee = cassandraOperations.selectOne(QueryBuilder.select("id", "people").from("employee"), Employee.class); - assertThat(employee.getId(), is(equalTo("employee-id"))); - assertThat(employee.getPeople(), is(notNullValue())); + assertThat(employee.getId()).isEqualTo("employee-id"); + assertThat(employee.getPeople()).isNotNull(); Person apu = employee.getPeople().iterator().next(); - assertThat(apu.getFirstname(), is(equalTo("Apu"))); + assertThat(apu.getFirstname()).isEqualTo("Apu"); } /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java old mode 100644 new mode 100755 index 1bde946ce..e3bce187f --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.mapping.mapid.proxy; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.cassandra.repository.support.MapIdFactory.*; import org.junit.Before; @@ -59,27 +59,27 @@ public class CassandraTemplateMapIdProxyDelegateIntegrationTests extends Abstrac SinglePkc inserted = new SinglePkc(uuid()); inserted.setValue(uuid()); SinglePkc saved = operations.insert(inserted); - assertSame(saved, inserted); + assertThat(inserted).isSameAs(saved); // select SinglePkcId id = id(SinglePkcId.class).key(saved.getKey()); SinglePkc selected = operations.selectOneById(SinglePkc.class, id); - assertNotSame(selected, saved); - assertEquals(saved.getKey(), selected.getKey()); - assertEquals(saved.getValue(), selected.getValue()); + assertThat(saved).isNotSameAs(selected); + assertThat(selected.getKey()).isEqualTo(saved.getKey()); + assertThat(selected.getValue()).isEqualTo(saved.getValue()); // update selected.setValue(uuid()); SinglePkc updated = operations.update(selected); - assertSame(updated, selected); + assertThat(selected).isSameAs(updated); selected = operations.selectOneById(SinglePkc.class, id); - assertNotSame(selected, updated); - assertEquals(updated.getValue(), selected.getValue()); + assertThat(updated).isNotSameAs(selected); + assertThat(selected.getValue()).isEqualTo(updated.getValue()); // delete operations.delete(selected); - assertNull(operations.selectOneById(SinglePkc.class, id)); + assertThat(operations.selectOneById(SinglePkc.class, id)).isNull(); } public interface SinglePkcId { @@ -123,28 +123,28 @@ public class CassandraTemplateMapIdProxyDelegateIntegrationTests extends Abstrac MultiPkc inserted = new MultiPkc(uuid(), uuid()); inserted.setValue(uuid()); MultiPkc saved = operations.insert(inserted); - assertSame(saved, inserted); + assertThat(inserted).isSameAs(saved); // select MultiPkcId id = id(MultiPkcId.class).key0(saved.getKey0()).key1(saved.getKey1()); MultiPkc selected = operations.selectOneById(MultiPkc.class, id); - assertNotSame(selected, saved); - assertEquals(saved.getKey0(), selected.getKey0()); - assertEquals(saved.getKey1(), selected.getKey1()); - assertEquals(saved.getValue(), selected.getValue()); + assertThat(saved).isNotSameAs(selected); + assertThat(selected.getKey0()).isEqualTo(saved.getKey0()); + assertThat(selected.getKey1()).isEqualTo(saved.getKey1()); + assertThat(selected.getValue()).isEqualTo(saved.getValue()); // update selected.setValue(uuid()); MultiPkc updated = operations.update(selected); - assertSame(updated, selected); + assertThat(selected).isSameAs(updated); selected = operations.selectOneById(MultiPkc.class, id); - assertNotSame(selected, updated); - assertEquals(updated.getValue(), selected.getValue()); + assertThat(updated).isNotSameAs(selected); + assertThat(selected.getValue()).isEqualTo(updated.getValue()); // delete operations.delete(selected); - assertNull(operations.selectOneById(MultiPkc.class, id)); + assertThat(operations.selectOneById(MultiPkc.class, id)).isNull(); } public interface MultiPkcId { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java old mode 100644 new mode 100755 index 63ca1d62e..66dbca1e1 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.mapping.mapid.repo; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.cassandra.repository.support.BasicMapId.*; import org.junit.Before; @@ -56,9 +56,9 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC @Before public void before() { - assertNotNull(template); - assertNotNull(singlePrimaryKecColumnRepository); - assertNotNull(multiPrimaryKeyColumnsRepository); + assertThat(template).isNotNull(); + assertThat(singlePrimaryKecColumnRepository).isNotNull(); + assertThat(multiPrimaryKeyColumnsRepository).isNotNull(); } @Test @@ -68,27 +68,27 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC SinglePrimaryKeyColumn inserted = new SinglePrimaryKeyColumn(uuid()); inserted.setValue(uuid()); SinglePrimaryKeyColumn saved = singlePrimaryKecColumnRepository.save(inserted); - assertSame(saved, inserted); + assertThat(inserted).isSameAs(saved); // select MapId id = id("key", saved.getKey()); SinglePrimaryKeyColumn selected = singlePrimaryKecColumnRepository.findOne(id); - assertNotSame(selected, saved); - assertEquals(saved.getKey(), selected.getKey()); - assertEquals(saved.getValue(), selected.getValue()); + assertThat(saved).isNotSameAs(selected); + assertThat(selected.getKey()).isEqualTo(saved.getKey()); + assertThat(selected.getValue()).isEqualTo(saved.getValue()); // update selected.setValue(uuid()); SinglePrimaryKeyColumn updated = singlePrimaryKecColumnRepository.save(selected); - assertSame(updated, selected); + assertThat(selected).isSameAs(updated); selected = singlePrimaryKecColumnRepository.findOne(id); - assertNotSame(selected, updated); - assertEquals(updated.getValue(), selected.getValue()); + assertThat(updated).isNotSameAs(selected); + assertThat(selected.getValue()).isEqualTo(updated.getValue()); // delete singlePrimaryKecColumnRepository.delete(selected); - assertNull(singlePrimaryKecColumnRepository.findOne(id)); + assertThat(singlePrimaryKecColumnRepository.findOne(id)).isNull(); } @Test @@ -98,28 +98,28 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC MultiPrimaryKeyColumns inserted = new MultiPrimaryKeyColumns(uuid(), uuid()); inserted.setValue(uuid()); MultiPrimaryKeyColumns saved = multiPrimaryKeyColumnsRepository.save(inserted); - assertSame(saved, inserted); + assertThat(inserted).isSameAs(saved); // select MapId id = id("key0", saved.getKey0()).with("key1", saved.getKey1()); MultiPrimaryKeyColumns selected = multiPrimaryKeyColumnsRepository.findOne(id); - assertNotSame(selected, saved); - assertEquals(saved.getKey0(), selected.getKey0()); - assertEquals(saved.getKey1(), selected.getKey1()); - assertEquals(saved.getValue(), selected.getValue()); + assertThat(saved).isNotSameAs(selected); + assertThat(selected.getKey0()).isEqualTo(saved.getKey0()); + assertThat(selected.getKey1()).isEqualTo(saved.getKey1()); + assertThat(selected.getValue()).isEqualTo(saved.getValue()); // update selected.setValue(uuid()); MultiPrimaryKeyColumns updated = multiPrimaryKeyColumnsRepository.save(selected); - assertSame(updated, selected); + assertThat(selected).isSameAs(updated); selected = multiPrimaryKeyColumnsRepository.findOne(id); - assertNotSame(selected, updated); - assertEquals(updated.getValue(), selected.getValue()); + assertThat(updated).isNotSameAs(selected); + assertThat(selected.getValue()).isEqualTo(updated.getValue()); // delete template.delete(selected); - assertNull(multiPrimaryKeyColumnsRepository.findOne(id)); + assertThat(multiPrimaryKeyColumnsRepository.findOne(id)).isNull(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java old mode 100644 new mode 100755 index 2389f3ae4..3e1790197 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.test.integration.mapping.mapid.template; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.cassandra.repository.support.BasicMapId.*; import org.junit.Before; @@ -59,27 +59,27 @@ public class CassandraTemplateMapIdIntegrationTest extends AbstractKeyspaceCreat SinglePkc inserted = new SinglePkc(uuid()); inserted.setValue(uuid()); SinglePkc saved = operations.insert(inserted); - assertSame(saved, inserted); + assertThat(inserted).isSameAs(saved); // select MapId id = id("key", saved.getKey()); SinglePkc selected = operations.selectOneById(SinglePkc.class, id); - assertNotSame(selected, saved); - assertEquals(saved.getKey(), selected.getKey()); - assertEquals(saved.getValue(), selected.getValue()); + assertThat(saved).isNotSameAs(selected); + assertThat(selected.getKey()).isEqualTo(saved.getKey()); + assertThat(selected.getValue()).isEqualTo(saved.getValue()); // update selected.setValue(uuid()); SinglePkc updated = operations.update(selected); - assertSame(updated, selected); + assertThat(selected).isSameAs(updated); selected = operations.selectOneById(SinglePkc.class, id); - assertNotSame(selected, updated); - assertEquals(updated.getValue(), selected.getValue()); + assertThat(updated).isNotSameAs(selected); + assertThat(selected.getValue()).isEqualTo(updated.getValue()); // delete operations.delete(selected); - assertNull(operations.selectOneById(SinglePkc.class, id)); + assertThat(operations.selectOneById(SinglePkc.class, id)).isNull(); } @Table @@ -117,28 +117,28 @@ public class CassandraTemplateMapIdIntegrationTest extends AbstractKeyspaceCreat MultiPkc inserted = new MultiPkc(uuid(), uuid()); inserted.setValue(uuid()); MultiPkc saved = operations.insert(inserted); - assertSame(saved, inserted); + assertThat(inserted).isSameAs(saved); // select MapId id = id("key0", saved.getKey0()).with("key1", saved.getKey1()); MultiPkc selected = operations.selectOneById(MultiPkc.class, id); - assertNotSame(selected, saved); - assertEquals(saved.getKey0(), selected.getKey0()); - assertEquals(saved.getKey1(), selected.getKey1()); - assertEquals(saved.getValue(), selected.getValue()); + assertThat(saved).isNotSameAs(selected); + assertThat(selected.getKey0()).isEqualTo(saved.getKey0()); + assertThat(selected.getKey1()).isEqualTo(saved.getKey1()); + assertThat(selected.getValue()).isEqualTo(saved.getValue()); // update selected.setValue(uuid()); MultiPkc updated = operations.update(selected); - assertSame(updated, selected); + assertThat(selected).isSameAs(updated); selected = operations.selectOneById(MultiPkc.class, id); - assertNotSame(selected, updated); - assertEquals(updated.getValue(), selected.getValue()); + assertThat(updated).isNotSameAs(selected); + assertThat(selected.getValue()).isEqualTo(updated.getValue()); // delete operations.delete(selected); - assertNull(operations.selectOneById(MultiPkc.class, id)); + assertThat(operations.selectOneById(MultiPkc.class, id)).isNull(); } @Table diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CassandraTypeMappingIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CassandraTypeMappingIntegrationTest.java old mode 100644 new mode 100755 index 4d3f964e4..3012ab5e2 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CassandraTypeMappingIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/types/CassandraTypeMappingIntegrationTest.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.mapping.types; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.math.BigDecimal; import java.math.BigInteger; @@ -41,9 +40,6 @@ import org.springframework.data.cassandra.test.integration.support.SchemaTestUti import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.LocalDate; import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.exceptions.InvalidQueryException; -import com.datastax.driver.core.querybuilder.Insert; -import com.datastax.driver.core.querybuilder.QueryBuilder; /** * Integration tests for type mapping using {@link CassandraOperations}. @@ -80,7 +76,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getInet(), is(equalTo(entity.getInet()))); + assertThat(loaded.getInet()).isEqualTo(entity.getInet()); } /** @@ -95,7 +91,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getUuid(), is(equalTo(entity.getUuid()))); + assertThat(loaded.getUuid()).isEqualTo(entity.getUuid()); } /** @@ -110,7 +106,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBoxedShort(), is(equalTo(entity.getBoxedShort()))); + assertThat(loaded.getBoxedShort()).isEqualTo(entity.getBoxedShort()); } /** @@ -125,7 +121,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getPrimitiveShort(), is(equalTo(entity.getPrimitiveShort()))); + assertThat(loaded.getPrimitiveShort()).isEqualTo(entity.getPrimitiveShort()); } /** @@ -140,7 +136,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBoxedByte(), is(equalTo(entity.getBoxedByte()))); + assertThat(loaded.getBoxedByte()).isEqualTo(entity.getBoxedByte()); } /** @@ -155,7 +151,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getPrimitiveByte(), is(equalTo(entity.getPrimitiveByte()))); + assertThat(loaded.getPrimitiveByte()).isEqualTo(entity.getPrimitiveByte()); } /** @@ -170,7 +166,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBoxedLong(), is(equalTo(entity.getBoxedLong()))); + assertThat(loaded.getBoxedLong()).isEqualTo(entity.getBoxedLong()); } /** @@ -185,7 +181,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getPrimitiveLong(), is(equalTo(entity.getPrimitiveLong()))); + assertThat(loaded.getPrimitiveLong()).isEqualTo(entity.getPrimitiveLong()); } /** @@ -200,7 +196,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBoxedInteger(), is(equalTo(entity.getBoxedInteger()))); + assertThat(loaded.getBoxedInteger()).isEqualTo(entity.getBoxedInteger()); } /** @@ -215,7 +211,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getPrimitiveInteger(), is(equalTo(entity.getPrimitiveInteger()))); + assertThat(loaded.getPrimitiveInteger()).isEqualTo(entity.getPrimitiveInteger()); } /** @@ -230,7 +226,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBoxedFloat(), is(equalTo(entity.getBoxedFloat()))); + assertThat(loaded.getBoxedFloat()).isEqualTo(entity.getBoxedFloat()); } /** @@ -245,7 +241,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getPrimitiveFloat(), is(equalTo(entity.getPrimitiveFloat()))); + assertThat(loaded.getPrimitiveFloat()).isEqualTo(entity.getPrimitiveFloat()); } /** @@ -260,7 +256,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBoxedDouble(), is(equalTo(entity.getBoxedDouble()))); + assertThat(loaded.getBoxedDouble()).isEqualTo(entity.getBoxedDouble()); } /** @@ -275,7 +271,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getPrimitiveDouble(), is(equalTo(entity.getPrimitiveDouble()))); + assertThat(loaded.getPrimitiveDouble()).isEqualTo(entity.getPrimitiveDouble()); } /** @@ -290,7 +286,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBoxedBoolean(), is(equalTo(entity.getBoxedBoolean()))); + assertThat(loaded.getBoxedBoolean()).isEqualTo(entity.getBoxedBoolean()); } /** @@ -305,7 +301,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.isPrimitiveBoolean(), is(equalTo(entity.isPrimitiveBoolean()))); + assertThat(loaded.isPrimitiveBoolean()).isEqualTo(entity.isPrimitiveBoolean()); } /** @@ -321,7 +317,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getTimestamp(), is(equalTo(entity.getTimestamp()))); + assertThat(loaded.getTimestamp()).isEqualTo(entity.getTimestamp()); } /** @@ -336,7 +332,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getDate(), is(equalTo(entity.getDate()))); + assertThat(loaded.getDate()).isEqualTo(entity.getDate()); } /** @@ -351,7 +347,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBigInteger(), is(equalTo(entity.getBigInteger()))); + assertThat(loaded.getBigInteger()).isEqualTo(entity.getBigInteger()); } /** @@ -366,7 +362,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBigDecimal(), is(equalTo(entity.getBigDecimal()))); + assertThat(loaded.getBigDecimal()).isEqualTo(entity.getBigDecimal()); } /** @@ -384,7 +380,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin ByteBuffer blob = loaded.getBlob(); byte[] bytes = new byte[blob.remaining()]; blob.get(bytes); - assertThat(new String(bytes), is(equalTo("Hello"))); + assertThat(new String(bytes)).isEqualTo("Hello"); } /** @@ -399,7 +395,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getSetOfString(), is(equalTo(entity.getSetOfString()))); + assertThat(loaded.getSetOfString()).isEqualTo(entity.getSetOfString()); } /** @@ -414,7 +410,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getSetOfString(), is(nullValue())); + assertThat(loaded.getSetOfString()).isNull(); } /** @@ -429,7 +425,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getListOfString(), is(equalTo(entity.getListOfString()))); + assertThat(loaded.getListOfString()).isEqualTo(entity.getListOfString()); } /** @@ -444,7 +440,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getListOfString(), is(nullValue())); + assertThat(loaded.getListOfString()).isNull(); } /** @@ -459,7 +455,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getMapOfString(), is(equalTo(entity.getMapOfString()))); + assertThat(loaded.getMapOfString()).isEqualTo(entity.getMapOfString()); } /** @@ -474,7 +470,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getMapOfString(), is(nullValue())); + assertThat(loaded.getMapOfString()).isNull(); } /** @@ -489,7 +485,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getAnEnum(), is(equalTo(entity.getAnEnum()))); + assertThat(loaded.getAnEnum()).isEqualTo(entity.getAnEnum()); } /** @@ -503,14 +499,13 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin String id = "1"; long time = 21312214L; - PreparedStatement prepare = operations.getSession() - .prepare("INSERT INTO timeentity (id, time) values(?,?)"); + PreparedStatement prepare = operations.getSession().prepare("INSERT INTO timeentity (id, time) values(?,?)"); BoundStatement boundStatement = prepare.bind(id, time); operations.execute(boundStatement); TimeEntity loaded = operations.selectOneById(TimeEntity.class, id); - assertThat(loaded.getTime(), is(equalTo(time))); + assertThat(loaded.getTime()).isEqualTo(time); } /** @@ -525,7 +520,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getLocalDate(), is(equalTo(entity.getLocalDate()))); + assertThat(loaded.getLocalDate()).isEqualTo(entity.getLocalDate()); } /** @@ -540,7 +535,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getLocalDateTime(), is(equalTo(entity.getLocalDateTime()))); + assertThat(loaded.getLocalDateTime()).isEqualTo(entity.getLocalDateTime()); } /** @@ -555,7 +550,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getLocalTime(), is(equalTo(entity.getLocalTime()))); + assertThat(loaded.getLocalTime()).isEqualTo(entity.getLocalTime()); } /** @@ -570,7 +565,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getInstant(), is(equalTo(entity.getInstant()))); + assertThat(loaded.getInstant()).isEqualTo(entity.getInstant()); } /** @@ -585,7 +580,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getZoneId(), is(equalTo(entity.getZoneId()))); + assertThat(loaded.getZoneId()).isEqualTo(entity.getZoneId()); } /** @@ -600,7 +595,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getJodaLocalDate(), is(equalTo(entity.getJodaLocalDate()))); + assertThat(loaded.getJodaLocalDate()).isEqualTo(entity.getJodaLocalDate()); } /** @@ -615,7 +610,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getJodaDateMidnight(), is(equalTo(entity.getJodaDateMidnight()))); + assertThat(loaded.getJodaDateMidnight()).isEqualTo(entity.getJodaDateMidnight()); } /** @@ -630,7 +625,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getJodaDateTime(), is(equalTo(entity.getJodaDateTime()))); + assertThat(loaded.getJodaDateTime()).isEqualTo(entity.getJodaDateTime()); } /** @@ -645,7 +640,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBpLocalDate(), is(equalTo(entity.getBpLocalDate()))); + assertThat(loaded.getBpLocalDate()).isEqualTo(entity.getBpLocalDate()); } /** @@ -660,7 +655,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBpLocalDateTime(), is(equalTo(entity.getBpLocalDateTime()))); + assertThat(loaded.getBpLocalDateTime()).isEqualTo(entity.getBpLocalDateTime()); } /** @@ -675,7 +670,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBpLocalTime(), is(equalTo(entity.getBpLocalTime()))); + assertThat(loaded.getBpLocalTime()).isEqualTo(entity.getBpLocalTime()); } /** @@ -690,7 +685,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBpZoneId(), is(equalTo(entity.getBpZoneId()))); + assertThat(loaded.getBpZoneId()).isEqualTo(entity.getBpZoneId()); } /** @@ -705,7 +700,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.insert(entity); AllPossibleTypes loaded = operations.selectOneById(AllPossibleTypes.class, entity.getId()); - assertThat(loaded.getBpZoneId(), is(equalTo(entity.getBpZoneId()))); + assertThat(loaded.getBpZoneId()).isEqualTo(entity.getBpZoneId()); } /** @@ -721,7 +716,7 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin operations.update(entity); CounterEntity loaded = operations.selectOneById(CounterEntity.class, entity.getId()); - assertThat(loaded.getCount(), is(equalTo(entity.getCount()))); + assertThat(loaded.getCount()).isEqualTo(entity.getCount()); } public enum Condition { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/minimal/config/AbsoluteMinimumXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/minimal/config/AbsoluteMinimumXmlConfigIntegrationTests.java old mode 100644 new mode 100755 index a25d707d0..085281c93 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/minimal/config/AbsoluteMinimumXmlConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/minimal/config/AbsoluteMinimumXmlConfigIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.minimal.config; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,7 +40,7 @@ public class AbsoluteMinimumXmlConfigIntegrationTests extends AbstractSpringData @Test public void test() { - assertNotNull(context); + assertThat(context).isNotNull(); context.getPersistentEntity(AbsMin.class); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CassandraOperationsProducer.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CassandraOperationsProducer.java index 8513652c7..5c37681d7 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CassandraOperationsProducer.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CassandraOperationsProducer.java @@ -79,10 +79,10 @@ class CassandraOperationsProducer { } @OtherQualifier - @UserDB - @Produces + @UserDB + @Produces @ApplicationScoped - public CassandraOperations createQualifiedCassandraOperations(CassandraOperations cassandraOperations){ + public CassandraOperations createQualifiedCassandraOperations(CassandraOperations cassandraOperations) { return cassandraOperations; } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java old mode 100644 new mode 100755 index 68e9d49c5..ad75ad59c --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.repository.cdi; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.apache.webbeans.cditest.CdiTestContainer; import org.apache.webbeans.cditest.CdiTestContainerLoader; @@ -52,14 +51,14 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest @AfterClass public static void shutdown() throws Exception { - + cdiContainer.stopContexts(); cdiContainer.shutdownContainer(); } @Before public void setUp() { - + CdiRepositoryClient client = cdiContainer.getInstance(CdiRepositoryClient.class); repository = client.getRepository(); personRepository = client.getSamplePersonRepository(); @@ -71,9 +70,9 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest */ @Test public void testCdiRepository() { - - assertNotNull(repository); - + + assertThat(repository).isNotNull(); + repository.deleteAll(); User bean = new User(); @@ -83,23 +82,23 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest repository.save(bean); - assertTrue(repository.exists(bean.getUsername())); + assertThat(repository.exists(bean.getUsername())).isTrue(); User retrieved = repository.findOne(bean.getUsername()); - assertNotNull(retrieved); - assertEquals(bean.getUsername(), retrieved.getUsername()); - assertEquals(bean.getFirstName(), retrieved.getFirstName()); - assertEquals(bean.getLastName(), retrieved.getLastName()); + assertThat(retrieved).isNotNull(); + assertThat(retrieved.getUsername()).isEqualTo(bean.getUsername()); + assertThat(retrieved.getFirstName()).isEqualTo(bean.getFirstName()); + assertThat(retrieved.getLastName()).isEqualTo(bean.getLastName()); - assertEquals(1, repository.count()); + assertThat(repository.count()).isEqualTo(1); - assertTrue(repository.exists(bean.getUsername())); + assertThat(repository.exists(bean.getUsername())).isTrue(); repository.delete(bean); - assertEquals(0, repository.count()); + assertThat(repository.count()).isEqualTo(0); retrieved = repository.findOne(bean.getUsername()); - assertNull(retrieved); + assertThat(retrieved).isNull(); } /** @@ -107,8 +106,8 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest */ @Test public void testQualifiedCdiRepository() { - - assertNotNull(qualifiedUserRepository); + + assertThat(qualifiedUserRepository).isNotNull(); qualifiedUserRepository.deleteAll(); User bean = new User(); @@ -118,7 +117,7 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest qualifiedUserRepository.save(bean); - assertTrue(qualifiedUserRepository.exists(bean.getUsername())); + assertThat(qualifiedUserRepository.exists(bean.getUsername())).isTrue(); } /** @@ -127,6 +126,6 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest @Test public void returnOneFromCustomImpl() { - assertThat(personRepository.returnOne(), is(1)); + assertThat(personRepository.returnOne()).isEqualTo(1); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/bigintparam/BigIntParamIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/bigintparam/BigIntParamIntegrationTests.java old mode 100644 new mode 100755 index c1320bbea..cc20f3258 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/bigintparam/BigIntParamIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/bigintparam/BigIntParamIntegrationTests.java @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.test.integration.repository.querymethods.bigintparam; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.math.BigInteger; @@ -63,6 +63,6 @@ public class BigIntParamIntegrationTests extends AbstractSpringDataEmbeddedCassa repo.save(saved); BigThing found = repo.findThingByBigInteger(new BigInteger("42")); - assertNotNull(found); + assertThat(found).isNotNull(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/conversion/ParameterConversionIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/conversion/ParameterConversionIntegrationTests.java index 2567ff361..7c62c33c7 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/conversion/ParameterConversionIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/conversion/ParameterConversionIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.repository.querymethods.conversion; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import java.io.IOException; import java.util.Arrays; @@ -101,33 +100,33 @@ public class ParameterConversionIntegrationTests extends AbstractSpringDataEmbed * @see DATACASS-7 */ @Test - public void shouldFindByConvertedParameter() { + public void shouldFindByConvertedParameter() { List contacts = contactRepository.findByAddress(walter.getAddress()); - assertThat(contacts, hasItems(walter, flynn)); + assertThat(contacts).contains(walter, flynn); } /** * @see DATACASS-7 */ @Test - public void shouldFindByStringParameter() { + public void shouldFindByStringParameter() { String parameter = AddressWriteConverter.INSTANCE.convert(walter.getAddress()); List contacts = contactRepository.findByAddress(parameter); - assertThat(contacts, hasItems(walter, flynn)); + assertThat(contacts).contains(walter, flynn); } /** * @see DATACASS-7 */ @Test - public void findByAddressesIn() { + public void findByAddressesIn() { - assertThat(contactRepository.findByAddressesContains(flynn.address), containsInAnyOrder(flynn, walter)); - assertThat(contactRepository.findByAddressesContains(walter.addresses.get(1)), contains(walter)); + assertThat(contactRepository.findByAddressesContains(flynn.address)).contains(flynn, walter); + assertThat(contactRepository.findByAddressesContains(walter.addresses.get(1))).contains(walter); } interface ContactRepository extends CassandraRepository { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/datekey/DateKeyIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/datekey/DateKeyIntegrationTests.java old mode 100644 new mode 100755 index 756df1238..a321ca005 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/datekey/DateKeyIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/datekey/DateKeyIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.repository.querymethods.datekey; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Date; @@ -62,6 +62,6 @@ public class DateKeyIntegrationTests extends AbstractSpringDataEmbeddedCassandra repo.save(saved); DateThing found = repo.findThingByDate(date); - assertNotNull(found); + assertThat(found).isNotNull(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/QueryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/QueryIntegrationTests.java old mode 100644 new mode 100755 index a78d40eb7..66f022113 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/QueryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/QueryIntegrationTests.java @@ -15,11 +15,8 @@ */ package org.springframework.data.cassandra.test.integration.repository.querymethods.declared; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; -import java.time.LocalDate; -import java.time.ZoneId; import java.util.Collection; import java.util.Date; import java.util.List; @@ -82,12 +79,12 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa List results = personRepository.findFolksWithLastnameAsList(saved.getLastname()); - assertNotNull(results); - assertTrue(results.size() == 1); + assertThat(results).isNotNull(); + assertThat(results.size() == 1).isTrue(); Person found = results.iterator().next(); - assertNotNull(found); - assertEquals(found.getLastname(), saved.getLastname()); - assertEquals(found.getFirstname(), saved.getFirstname()); + assertThat(found).isNotNull(); + assertThat(saved.getLastname()).isEqualTo(found.getLastname()); + assertThat(saved.getFirstname()).isEqualTo(found.getFirstname()); } @Test @@ -107,13 +104,13 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa List results = personRepository.findFolksWithLastnameAsList(saved.getLastname()); - assertNotNull(results); - assertTrue(results.size() == 2); + assertThat(results).isNotNull(); + assertThat(results.size() == 2).isTrue(); boolean first = true; for (Person person : results) { - assertNotNull(person); - assertEquals(saved.getLastname(), person.getLastname()); - assertEquals(first ? saved.getFirstname() : saved2.getFirstname(), person.getFirstname()); + assertThat(person).isNotNull(); + assertThat(person.getLastname()).isEqualTo(saved.getLastname()); + assertThat(person.getFirstname()).isEqualTo(first ? saved.getFirstname() : saved2.getFirstname()); first = false; } } @@ -130,12 +127,12 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa List> results = personRepository .findFolksWithLastnameAsListOfMapOfStringToObject(saved.getLastname()); - assertNotNull(results); - assertTrue(results.size() == 1); + assertThat(results).isNotNull(); + assertThat(results.size() == 1).isTrue(); Map found = results.iterator().next(); - assertNotNull(found); - assertEquals(found.get("lastname"), saved.getLastname()); - assertEquals(found.get("firstname"), saved.getFirstname()); + assertThat(found).isNotNull(); + assertThat(saved.getLastname()).isEqualTo(found.get("lastname")); + assertThat(saved.getFirstname()).isEqualTo(found.get("firstname")); } @Test @@ -149,9 +146,9 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa Person found = personRepository.findSingle(saved.getLastname(), saved.getFirstname()); - assertNotNull(found); - assertEquals(found.getLastname(), saved.getLastname()); - assertEquals(found.getFirstname(), saved.getFirstname()); + assertThat(found).isNotNull(); + assertThat(saved.getLastname()).isEqualTo(found.getLastname()); + assertThat(saved.getFirstname()).isEqualTo(found.getFirstname()); } @Test @@ -171,13 +168,13 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa Collection results = personRepository.findFolksWithLastnameAsList(saved.getLastname()); - assertNotNull(results); - assertTrue(results.size() == 2); + assertThat(results).isNotNull(); + assertThat(results.size() == 2).isTrue(); boolean first = true; for (Person person : results) { - assertNotNull(person); - assertEquals(saved.getLastname(), person.getLastname()); - assertEquals(first ? saved.getFirstname() : saved2.getFirstname(), person.getFirstname()); + assertThat(person).isNotNull(); + assertThat(person.getLastname()).isEqualTo(saved.getLastname()); + assertThat(person.getFirstname()).isEqualTo(first ? saved.getFirstname() : saved2.getFirstname()); first = false; } } @@ -194,8 +191,8 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa String nickname = personRepository.findSingleNickname(saved.getLastname(), saved.getFirstname()); - assertNotNull(nickname); - assertEquals(saved.getNickname(), nickname); + assertThat(nickname).isNotNull(); + assertThat(nickname).isEqualTo(saved.getNickname()); } @Test @@ -210,7 +207,7 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa boolean value = personRepository.findSingleCool(saved.getLastname(), saved.getFirstname()); - assertEquals(saved.isCool(), value); + assertThat(value).isEqualTo(saved.isCool()); } @Test @@ -225,7 +222,7 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa Date value = personRepository.findSingleBirthdate(saved.getLastname(), saved.getFirstname()); - assertEquals(saved.getBirthDate(), value); + assertThat(value).isEqualTo(saved.getBirthDate()); } @Test @@ -240,7 +237,7 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa int value = personRepository.findSingleNumberOfChildren(saved.getLastname(), saved.getFirstname()); - assertEquals(saved.getNumberOfChildren(), value); + assertThat(value).isEqualTo(saved.getNumberOfChildren()); } @Test @@ -254,12 +251,12 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa Person[] results = personRepository.findFolksWithLastnameAsArray(saved.getLastname()); - assertNotNull(results); - assertTrue(results.length == 1); + assertThat(results).isNotNull(); + assertThat(results.length == 1).isTrue(); Person found = results[0]; - assertNotNull(found); - assertEquals(found.getLastname(), saved.getLastname()); - assertEquals(found.getFirstname(), saved.getFirstname()); + assertThat(found).isNotNull(); + assertThat(saved.getLastname()).isEqualTo(found.getLastname()); + assertThat(saved.getFirstname()).isEqualTo(found.getFirstname()); } @Test @@ -274,12 +271,12 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa List results = personRepository.findFolksWithLastnameAsList(lastname); - assertNotNull(results); - assertTrue(results.size() == 1); + assertThat(results).isNotNull(); + assertThat(results.size() == 1).isTrue(); for (Person person : results) { - assertNotNull(person); - assertEquals(saved.getLastname(), person.getLastname()); - assertEquals(saved.getFirstname(), person.getFirstname()); + assertThat(person).isNotNull(); + assertThat(person.getLastname()).isEqualTo(saved.getLastname()); + assertThat(person.getFirstname()).isEqualTo(saved.getFirstname()); } } @@ -297,9 +294,7 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa Optional savedPerson = personRepository.findOptionalWithLastnameAndFirstname(personToSave.getLastname(), personToSave.getFirstname()); - assertThat(savedPerson, is(notNullValue(Optional.class))); - assertThat(savedPerson.isPresent(), is(true)); - assertThat(savedPerson.get(), is(notNullValue(Person.class))); + assertThat(savedPerson.isPresent()).isTrue(); } @Test @@ -307,7 +302,7 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa Optional optional = personRepository.findOptionalWithLastnameAndFirstname("not", "existent"); - assertThat(optional.isPresent(), is(false)); + assertThat(optional.isPresent()).isFalse(); } /** @@ -331,10 +326,10 @@ public abstract class QueryIntegrationTests extends AbstractSpringDataEmbeddedCa long count = allPeople.peek(new Consumer() { @Override public void accept(Person person) { - assertThat(person, is(instanceOf(Person.class))); + assertThat(person).isInstanceOf(Person.class); } }).count(); - assertThat(count, is(equalTo(100L))); + assertThat(count).isEqualTo(100L); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/anno/PersonRepositoryWithQueryAnnotations.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/anno/PersonRepositoryWithQueryAnnotations.java index 8e86cc902..65596ccb8 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/anno/PersonRepositoryWithQueryAnnotations.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/anno/PersonRepositoryWithQueryAnnotations.java @@ -15,8 +15,6 @@ */ package org.springframework.data.cassandra.test.integration.repository.querymethods.declared.anno; -import java.time.LocalDate; -import java.time.ZoneId; import java.util.Date; import java.util.List; import java.util.Map; @@ -27,9 +25,9 @@ import org.springframework.data.cassandra.repository.Query; import org.springframework.data.cassandra.test.integration.repository.querymethods.declared.Person; import org.springframework.data.cassandra.test.integration.repository.querymethods.declared.base.PersonRepository; import org.springframework.data.cassandra.test.integration.repository.querymethods.declared.named.PersonRepositoryWithNamedQueries; +import org.springframework.data.repository.query.Param; import com.datastax.driver.core.ResultSet; -import org.springframework.data.repository.query.Param; /** * we extend {@link PersonRepositoryWithNamedQueries} here just to keep the test codebase in sync. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/anno/QueryAnnotationIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/anno/QueryAnnotationIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/base/PersonRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/base/PersonRepository.java index 41ee384fa..cab8d9604 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/base/PersonRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/base/PersonRepository.java @@ -15,8 +15,6 @@ */ package org.springframework.data.cassandra.test.integration.repository.querymethods.declared.base; -import java.time.LocalDate; -import java.time.ZoneId; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/named/NamedQueryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/declared/named/NamedQueryIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/derived/QueryDerivationIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/derived/QueryDerivationIntegrationTests.java index 80a94a2db..732f9d756 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/derived/QueryDerivationIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/derived/QueryDerivationIntegrationTests.java @@ -15,8 +15,8 @@ */ package org.springframework.data.cassandra.test.integration.repository.querymethods.derived; +import static org.assertj.core.api.Assertions.*; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import static org.junit.Assume.*; import java.time.LocalDate; @@ -69,11 +69,9 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC } - @Autowired - private CassandraOperations template; + @Autowired private CassandraOperations template; - @Autowired - private PersonRepository personRepository; + @Autowired private PersonRepository personRepository; private Person walter; private Person skyler; @@ -99,7 +97,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC List result = personRepository.findByLastname("White"); - assertThat(result, hasItems(walter, skyler, flynn)); + assertThat(result).contains(walter, skyler, flynn); } /** @@ -110,7 +108,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC List result = personRepository.findByLastname("White", new Sort("firstname")); - assertThat(result, contains(flynn, skyler, walter)); + assertThat(result).contains(flynn, skyler, walter); } /** @@ -121,7 +119,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC List result = personRepository.findByLastnameOrderByFirstnameAsc("White"); - assertThat(result, contains(flynn, skyler, walter)); + assertThat(result).contains(flynn, skyler, walter); } /** @@ -132,7 +130,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC Person result = personRepository.findByFirstnameAndLastname("Walter", "White"); - assertThat(result, is(walter)); + assertThat(result).isEqualTo(walter); } /** @@ -143,11 +141,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC Collection collection = personRepository.findPersonProjectedBy(); - assertThat(collection, hasSize(3)); - - for (PersonProjection personProjection : collection) { - assertThat(personProjection.getLastname(), is(equalTo("White"))); - } + assertThat(collection).hasSize(3).extracting("lastname").contains("White", "White", "White"); } /** @@ -165,7 +159,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC Person result = personRepository.findByNumberOfChildren(NumberOfChildren.TWO); - assertThat(result, is(walter)); + assertThat(result).isEqualTo(walter); } /** @@ -184,7 +178,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC Person result = personRepository.findByCreatedDate(walter.getCreatedDate()); - assertThat(result, is(walter)); + assertThat(result).isEqualTo(walter); } /** @@ -199,7 +193,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC List result = personRepository.findByFirstname("Walter"); - assertThat(result, hasSize(1)); + assertThat(result).hasSize(1); } /** @@ -219,7 +213,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC walter.setNickname("Heisenberg"); personRepository.save(walter); - assertThat(personRepository.findByNicknameStartsWith("Heis"), is(walter)); + assertThat(personRepository.findByNicknameStartsWith("Heis")).isEqualTo(walter); } /** @@ -240,6 +234,6 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC walter.setNickname("Heisenberg"); personRepository.save(walter); - assertThat(personRepository.findByNicknameContains("eisenber"), is(walter)); + assertThat(personRepository.findByNicknameContains("eisenber")).isEqualTo(walter); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/intparam/IntParamIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/intparam/IntParamIntegrationTests.java old mode 100644 new mode 100755 index 7da32648c..8d8d8126b --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/intparam/IntParamIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/intparam/IntParamIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.repository.querymethods.intparam; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,9 +58,9 @@ public class IntParamIntegrationTests extends AbstractSpringDataEmbeddedCassandr repo.save(saved); IntThing found = repo.findThingByIntPrimitive(number); - assertNotNull(found); + assertThat(found).isNotNull(); found = repo.findThingByIntReference(new Integer(number)); - assertNotNull(found); + assertThat(found).isNotNull(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java old mode 100644 new mode 100755 index 5d4ed76da..08f912072 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java @@ -15,14 +15,12 @@ */ package org.springframework.data.cassandra.test.integration.repository.simple; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Assert; import org.springframework.data.cassandra.core.CassandraOperations; import com.google.common.collect.Lists; @@ -92,30 +90,30 @@ public class UserRepositoryIntegrationTests { public void findByNamedQuery() { String name = repository.findByNamedQuery("bob"); - Assert.assertNotNull(name); - Assert.assertEquals("Bob", name); + assertThat(name).isNotNull(); + assertThat(name).isEqualTo("Bob"); } public void findsUserById() throws Exception { User user = repository.findOne(bob.getUsername()); - Assert.assertNotNull(user); + assertThat(user).isNotNull(); assertEquals(bob, user); } public void findsAll() throws Exception { List result = Lists.newArrayList(repository.findAll()); - assertThat(result.size(), is(all.size())); - assertThat(result.containsAll(all), is(true)); + assertThat(result).hasSize(all.size()); + assertThat(result.containsAll(all)).isTrue(); } public void findsAllWithGivenIds() { Iterable result = repository.findAll(Arrays.asList(bob.getUsername(), tom.getUsername())); - assertThat(result, hasItems(bob, tom)); - assertThat(result, not(hasItems(alice, scott))); + assertThat(result).contains(bob, tom); + assertThat(result).doesNotContain(alice, scott); } public void deletesUserCorrectly() throws Exception { @@ -124,8 +122,8 @@ public class UserRepositoryIntegrationTests { List result = Lists.newArrayList(repository.findAll()); - assertThat(result.size(), is(all.size() - 1)); - assertThat(result, not(hasItem(tom))); + assertThat(result).hasSize(all.size() - 1); + assertThat(result).doesNotContain(tom); } public void deletesUserByIdCorrectly() { @@ -134,19 +132,19 @@ public class UserRepositoryIntegrationTests { List result = Lists.newArrayList(repository.findAll()); - assertThat(result.size(), is(all.size() - 1)); - assertThat(result, not(hasItem(tom))); + assertThat(result).hasSize(all.size() - 1); + assertThat(result).doesNotContain(tom); } public void exists() { String id = "tom"; - assertTrue(repository.exists(id)); + assertThat(repository.exists(id)).isTrue(); repository.delete(id); - assertTrue(!repository.exists(id)); + assertThat(!repository.exists(id)).isTrue(); } @@ -156,21 +154,21 @@ public class UserRepositoryIntegrationTests { public void save() { tom.setPassword(null); - tom.setFriends(Collections.emptySet()); + tom.setFriends(Collections. emptySet()); repository.save(tom); User loadedTom = repository.findOne(tom.getUsername()); - assertThat(loadedTom.getPassword(), is(nullValue())); - assertThat(loadedTom.getFriends(), is(nullValue())); + assertThat(loadedTom.getPassword()).isNull(); + assertThat(loadedTom.getFriends()).isNull(); } private static void assertEquals(User user1, User user2) { - Assert.assertEquals(user1.getUsername(), user2.getUsername()); - Assert.assertEquals(user1.getFirstName(), user2.getFirstName()); - Assert.assertEquals(user1.getLastName(), user2.getLastName()); - Assert.assertEquals(user1.getPlace(), user2.getPlace()); - Assert.assertEquals(user1.getPassword(), user2.getPassword()); + assertThat(user2.getUsername()).isEqualTo(user1.getUsername()); + assertThat(user2.getFirstName()).isEqualTo(user1.getFirstName()); + assertThat(user2.getLastName()).isEqualTo(user1.getLastName()); + assertThat(user2.getPlace()).isEqualTo(user1.getPlace()); + assertThat(user2.getPassword()).isEqualTo(user1.getPassword()); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTestsDelegator.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTestsDelegator.java index d4f6f6f04..a128e43d4 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTestsDelegator.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTestsDelegator.java @@ -31,11 +31,9 @@ import org.springframework.data.cassandra.test.integration.support.AbstractSprin public abstract class UserRepositoryIntegrationTestsDelegator extends AbstractSpringDataEmbeddedCassandraIntegrationTest { - @Autowired - CassandraOperations template; + @Autowired CassandraOperations template; - @Autowired - UserRepository repository; + @Autowired UserRepository repository; UserRepositoryIntegrationTests tests; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java old mode 100644 new mode 100755 index c72d8735e..0c30424d1 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.test.integration.repository.simple; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.Serializable; @@ -58,7 +57,7 @@ public class UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests */ @Test public void targetRepositoryClassShouldBeConfiguredCustomBaseRepositoryClass() throws Exception { - assertThat(((Advised) repository).getTargetSource().getTarget(), is(instanceOf(CustomCassandraRepository.class))); + assertThat(((Advised) repository).getTargetSource().getTarget()).isInstanceOf(CustomCassandraRepository.class); } public static class CustomCassandraRepository extends SimpleCassandraRepository { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests.java old mode 100644 new mode 100755 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java old mode 100644 new mode 100755 index 927f1ae2b..d6501486d --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java @@ -40,7 +40,7 @@ public abstract class AbstractSpringDataEmbeddedCassandraIntegrationTest public void deleteAllEntities() { for (CassandraPersistentEntity entity : template.getConverter().getMappingContext().getPersistentEntities()) { - if(entity.getType().isInterface()){ + if (entity.getType().isInterface()) { continue; } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/CassandraVersion.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/CassandraVersion.java index 1bb06bb42..fb6b40dc1 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/CassandraVersion.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/CassandraVersion.java @@ -15,8 +15,6 @@ */ package org.springframework.data.cassandra.test.integration.support; -import lombok.experimental.UtilityClass; - import org.springframework.data.util.Version; import org.springframework.util.Assert; @@ -24,6 +22,8 @@ import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; +import lombok.experimental.UtilityClass; + /** * Utility to retrieve the Cassandra release version. * diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/xmlentityscanning/XmlEntityScanningIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/xmlentityscanning/XmlEntityScanningIntegrationTests.java old mode 100644 new mode 100755