diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java index c993ff978f..3df1509985 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java @@ -1,15 +1,15 @@ package com.alibaba.druid.bvt.filter.config; -import com.alibaba.druid.filter.config.ConfigFileGenerator; -import com.alibaba.druid.filter.config.ConfigFilter; -import com.alibaba.druid.filter.config.loader.impl.FileConfigLoader; -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; +import java.sql.SQLException; + import org.junit.Assert; import org.junit.Test; -import java.sql.SQLException; +import com.alibaba.druid.filter.config.ConfigFileGenerator; +import com.alibaba.druid.filter.config.ConfigFilter; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; /** * @author Jonas Yang @@ -22,7 +22,7 @@ public class ConfigFilterTest extends ConfigFileGenerator { public void testInitRemoteConfigFile() throws SQLException { DruidDataSource dataSource = new DruidDataSource(); dataSource.setFilters("config"); - dataSource.setConnectionProperties("config.file=" + FileConfigLoader.PROTOCOL_PREFIX + this.filePath); + dataSource.setConnectionProperties("config.file=file://" + this.filePath); try { dataSource.init(); @@ -37,7 +37,7 @@ public class ConfigFilterTest extends ConfigFileGenerator { DruidDataSource dataSource = new DruidDataSource(); dataSource.setFilters("config"); - System.setProperty(ConfigFilter.SYS_PROP_CONFIG_FILE, FileConfigLoader.PROTOCOL_PREFIX + this.filePath); + System.setProperty(ConfigFilter.SYS_PROP_CONFIG_FILE, "file://" + this.filePath); try { dataSource.init(); @@ -109,8 +109,7 @@ public class ConfigFilterTest extends ConfigFileGenerator { public void testInitRemoteConfigAndDecrypt() throws SQLException { DruidDataSource dataSource = new DruidDataSource(); dataSource.setFilters("config"); - dataSource.setConnectionProperties("config.decrypt=RSA;config.file=" + FileConfigLoader.PROTOCOL_PREFIX - + this.filePath); + dataSource.setConnectionProperties("config.decrypt=RSA;config.file=" + "file://" + this.filePath); try { dataSource.init(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest.java deleted file mode 100644 index 0c9edfba6a..0000000000 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.alibaba.druid.bvt.filter.config; - -import org.junit.Assert; -import org.junit.Test; - -import com.alibaba.druid.filter.config.loader.impl.FileConfigLoader; - -/** - * @author Jonas Yang - */ -public class FileConfigLoaderTest { - - @Test - public void testIsSupported() { - FileConfigLoader configLoader = new FileConfigLoader(); - boolean isSupported = configLoader.isSupported(FileConfigLoader.PROTOCOL_PREFIX + "/opt/mytest"); - Assert.assertTrue("The value is " + isSupported + ", not true", isSupported); - - isSupported = configLoader.isSupported("jdbc:/opt/mytest"); - Assert.assertFalse("The value is " + isSupported + ", not false", isSupported); - } - - @Test - public void testGetFilePath() { - FileConfigLoader configLoader = new FileConfigLoader(); - String filePath = configLoader.getFilePath(FileConfigLoader.PROTOCOL_PREFIX + "/opt/test/test.properties"); - Assert.assertEquals("The path is " + filePath, filePath, "/opt/test/test.properties"); - } -} diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest1.java deleted file mode 100644 index e71d15d465..0000000000 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest1.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.alibaba.druid.bvt.filter.config; - -import com.alibaba.druid.filter.config.ConfigFileGenerator; -import com.alibaba.druid.filter.config.loader.impl.FileConfigLoader; - -import junit.framework.Assert; -import org.junit.Test; - -import java.util.Properties; - -/** - * @author Jonas Yang - */ -public class FileConfigLoaderTest1 extends ConfigFileGenerator { - - @Test - public void testLoadConfigByFile() { - FileConfigLoader configLoader = new FileConfigLoader(); - Properties p = configLoader.loadConfig(FileConfigLoader.PROTOCOL_PREFIX + this.filePath); - - Assert.assertNotNull("The properties is null", p); - Assert.assertEquals("The value is " + p.getProperty("username") + ", not test1", "test1", p.getProperty("username")); - } - - @Test - public void testLoadConfigByNotExistFile() { - FileConfigLoader configLoader = new FileConfigLoader(); - Properties p = configLoader.loadConfig(FileConfigLoader.PROTOCOL_PREFIX + "/test/test/test"); - - Assert.assertNull("The properties is not null", p); - } - -} diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/HttpConfigLoaderTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/HttpConfigLoaderTest.java deleted file mode 100644 index f1188f5032..0000000000 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/HttpConfigLoaderTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.alibaba.druid.bvt.filter.config; - -import org.junit.Assert; -import org.junit.Test; - -import com.alibaba.druid.filter.config.loader.impl.HttpConfigLoader; - -import java.net.MalformedURLException; -import java.net.URL; - -/** - * @author Jonas Yang - */ -public class HttpConfigLoaderTest { - - @Test - public void testIsSupported() { - HttpConfigLoader configLoader = new HttpConfigLoader(); - boolean isSupported = configLoader.isSupported(HttpConfigLoader.PROTOCOL_PREFIX + "www.5-nb.com"); - Assert.assertTrue("The value is " + isSupported + ", not true", isSupported); - - isSupported = configLoader.isSupported("jdbc:/opt/mytest"); - Assert.assertFalse("The value is " + isSupported + ", not false", isSupported); - } - - @Test - public void testGetUrl() throws MalformedURLException { - String protocol = HttpConfigLoader.PROTOCOL_PREFIX + "www.5-nb.com"; - HttpConfigLoader configLoader = new HttpConfigLoader(); - URL url = configLoader.getUrl(protocol); - Assert.assertEquals("The url is " + url, "http://www.5-nb.com", url.toString()); - } -}