diff --git a/redisson/src/test/java/org/redisson/config/ConfigSupportTest.java b/redisson/src/test/java/org/redisson/config/ConfigSupportTest.java index 1a2aa8ac9..d00203d72 100644 --- a/redisson/src/test/java/org/redisson/config/ConfigSupportTest.java +++ b/redisson/src/test/java/org/redisson/config/ConfigSupportTest.java @@ -1,12 +1,10 @@ package org.redisson.config; -import com.fasterxml.jackson.databind.exc.InvalidFormatException; import mockit.Mock; import mockit.MockUp; import org.junit.Test; import java.io.IOException; -import java.net.URI; import static org.junit.Assert.*; @@ -17,7 +15,7 @@ public class ConfigSupportTest { mockHostEnv("1.1.1.1"); SingleServerConfig config = mkConfig("127.0.0.1"); - assertEquals(URI.create("redis://127.0.0.1"), config.getAddress()); + assertEquals("redis://127.0.0.1", config.getAddress()); } @Test @@ -25,13 +23,15 @@ public class ConfigSupportTest { mockHostEnv("1.1.1.1"); SingleServerConfig config = mkConfig("${REDIS_URI}"); - assertEquals(URI.create("redis://1.1.1.1"), config.getAddress()); + assertEquals("redis://1.1.1.1", config.getAddress()); } - @Test(expected = InvalidFormatException.class) + @Test public void testParsingEnv_envMissing() throws IOException { mockHostEnv(null); - mkConfig("${REDIS_URI}"); + final SingleServerConfig config = mkConfig("${REDIS_URI}"); + + assertEquals("redis://${REDIS_URI}", config.getAddress()); } @Test @@ -39,7 +39,7 @@ public class ConfigSupportTest { mockHostEnv("11.0.0.1"); SingleServerConfig config = mkConfig("${REDIS_URI:-10.0.0.1}"); - assertEquals(URI.create("redis://11.0.0.1"), config.getAddress()); + assertEquals("redis://11.0.0.1", config.getAddress()); } @Test @@ -47,7 +47,7 @@ public class ConfigSupportTest { mockHostEnv(null); SingleServerConfig config = mkConfig("${REDIS_URI:-10.0.0.1}"); - assertEquals(URI.create("redis://10.0.0.1"), config.getAddress()); + assertEquals("redis://10.0.0.1", config.getAddress()); } private SingleServerConfig mkConfig(String authorityValue) throws IOException {