SpringCloud/spring-cloud-connectors
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RedisServiceConnectorCreator tests.

Browse Source
This commit is contained in:
Scott Frederick
2017-11-03 16:16:40 -05:00
parent d65f03a93c
commit 8145a53f1f
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
View File

@@ -2,6 +2,7 @@ package org.springframework.cloud.service.redis;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import org.junit.Before; import org.junit.Before;
@@ -59,12 +60,15 @@ public class RedisServiceConnectorCreatorTest {
assertEquals(serviceInfo.getHost(), connectionFactory.getHostName()); assertEquals(serviceInfo.getHost(), connectionFactory.getHostName());
assertEquals(serviceInfo.getPort(), connectionFactory.getPort()); assertEquals(serviceInfo.getPort(), connectionFactory.getPort());
assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword()); assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword());
} } else if (connector instanceof LettuceConnectionFactory) {
if (connector instanceof LettuceConnectionFactory) {
LettuceConnectionFactory connectionFactory = (LettuceConnectionFactory) connector; LettuceConnectionFactory connectionFactory = (LettuceConnectionFactory) connector;
assertEquals(serviceInfo.getHost(), connectionFactory.getHostName()); assertEquals(serviceInfo.getHost(), connectionFactory.getHostName());
assertEquals(serviceInfo.getPort(), connectionFactory.getPort()); assertEquals(serviceInfo.getPort(), connectionFactory.getPort());
assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword()); assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword());
} else {
fail("Expected RedisConnectionFactory of type " +
JedisConnectionFactory.class.getName() + " or " + LettuceConnectionFactory.class.getName() +
" but was of type " + connector.getClass().getName());
} }
} }
} }

23
spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/SpringData1RedisServiceConnectorCreatorTest.java
View File

@@ -2,6 +2,7 @@ package org.springframework.cloud.service.redis;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import org.junit.Before; import org.junit.Before;
@@ -11,7 +12,8 @@ import org.mockito.MockitoAnnotations;
import org.springframework.cloud.service.common.RedisServiceInfo; import org.springframework.cloud.service.common.RedisServiceInfo;
import org.springframework.cloud.service.keyval.SpringData1RedisConnectionFactoryCreator; import org.springframework.cloud.service.keyval.SpringData1RedisConnectionFactoryCreator;
import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
/** /**
* *
@@ -53,8 +55,21 @@ public class SpringData1RedisServiceConnectorCreatorTest {
private void assertConnectorProperties(RedisServiceInfo serviceInfo, RedisConnectionFactory connector) { private void assertConnectorProperties(RedisServiceInfo serviceInfo, RedisConnectionFactory connector) {
assertNotNull(connector); assertNotNull(connector);
assertEquals(serviceInfo.getHost(), ReflectionTestUtils.getField(connector, "hostName")); if (connector instanceof JedisConnectionFactory) {
assertEquals(serviceInfo.getPort(), ReflectionTestUtils.getField(connector, "port")); JedisConnectionFactory connectionFactory = (JedisConnectionFactory) connector;
assertEquals(serviceInfo.getPassword(), ReflectionTestUtils.getField(connector, "password")); assertEquals(serviceInfo.getHost(), connectionFactory.getHostName());
assertEquals(serviceInfo.getPort(), connectionFactory.getPort());
assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword());
} else if (connector instanceof LettuceConnectionFactory) {
LettuceConnectionFactory connectionFactory = (LettuceConnectionFactory) connector;
assertEquals(serviceInfo.getHost(), connectionFactory.getHostName());
assertEquals(serviceInfo.getPort(), connectionFactory.getPort());
assertEquals(serviceInfo.getPassword(), connectionFactory.getPassword());
} else {
fail("Expected RedisConnectionFactory of type " +
JedisConnectionFactory.class.getName() + " or " + LettuceConnectionFactory.class.getName() +
" but was of type " + connector.getClass().getName());
}
} }
} }