Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

refactor ConfigFilter, remove ConfigLoader

Browse Source
This commit is contained in:
wenshao
2012-08-31 22:14:40 +08:00
parent f9279bac88
commit f7be377c79
4 changed files with 10 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java
+10 -11
View File
@@ -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();
src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest.java
-29
View File
@@ -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");
}
}
src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest1.java
-33
View File
@@ -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);
}
}
src/test/java/com/alibaba/druid/bvt/filter/config/HttpConfigLoaderTest.java
-33
View File
@@ -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());
}
}