From b2e42115dfb8fc4a5dd4c7a339e0355934882bf2 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 31 Aug 2012 21:49:41 +0800 Subject: [PATCH] refactor testcase --- .../config/loader/impl/FileConfigLoader.java | 2 +- .../config/loader/impl/HttpConfigLoader.java | 2 +- .../security/decrypter/RsaDecrypter.java | 25 ++++++++++--------- .../filter/config/ConfigFilterTest.java | 4 ++- .../config}/ConfigLoaderFactoryTest.java | 2 +- .../bvt/filter/config/ConfigTestSuite.java | 25 ------------------- .../filter/config}/DecrypterFactoryTest.java | 6 ++++- .../bvt/filter/config/DecrypterTestSuite.java | 17 ------------- .../filter/config}/FileConfigLoaderTest.java | 4 ++- .../filter/config}/FileConfigLoaderTest1.java | 4 ++- .../filter/config}/HttpConfigLoaderTest.java | 4 ++- .../filter/config}/RsaDecrypterTest.java | 5 +++- 12 files changed, 37 insertions(+), 63 deletions(-) rename src/test/java/com/alibaba/druid/{ => bvt}/filter/config/ConfigFilterTest.java (96%) rename src/test/java/com/alibaba/druid/{filter/config/loader => bvt/filter/config}/ConfigLoaderFactoryTest.java (97%) delete mode 100644 src/test/java/com/alibaba/druid/bvt/filter/config/ConfigTestSuite.java rename src/test/java/com/alibaba/druid/{filter/config/security/decrypter => bvt/filter/config}/DecrypterFactoryTest.java (62%) delete mode 100644 src/test/java/com/alibaba/druid/bvt/filter/config/DecrypterTestSuite.java rename src/test/java/com/alibaba/druid/{filter/config/loader/impl => bvt/filter/config}/FileConfigLoaderTest.java (88%) rename src/test/java/com/alibaba/druid/{filter/config/loader/impl => bvt/filter/config}/FileConfigLoaderTest1.java (89%) rename src/test/java/com/alibaba/druid/{filter/config/loader/impl => bvt/filter/config}/HttpConfigLoaderTest.java (89%) rename src/test/java/com/alibaba/druid/{filter/config/security/decrypter => bvt/filter/config}/RsaDecrypterTest.java (94%) diff --git a/src/main/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoader.java b/src/main/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoader.java index c60ecf867f..89fcf0f2cf 100644 --- a/src/main/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoader.java +++ b/src/main/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoader.java @@ -91,7 +91,7 @@ public class FileConfigLoader implements ConfigLoader { } } - String getFilePath(String protocol) { + public String getFilePath(String protocol) { String filePath = null; filePath = protocol.substring(PROTOCOL_PREFIX.length()); diff --git a/src/main/java/com/alibaba/druid/filter/config/loader/impl/HttpConfigLoader.java b/src/main/java/com/alibaba/druid/filter/config/loader/impl/HttpConfigLoader.java index 19ae01f14c..60af7dcddc 100644 --- a/src/main/java/com/alibaba/druid/filter/config/loader/impl/HttpConfigLoader.java +++ b/src/main/java/com/alibaba/druid/filter/config/loader/impl/HttpConfigLoader.java @@ -83,7 +83,7 @@ public class HttpConfigLoader implements ConfigLoader { } } - URL getUrl(String protocol) throws MalformedURLException { + public URL getUrl(String protocol) throws MalformedURLException { return new URL(protocol.substring(PROTOCOL_PREFIX.length() - 7)); } diff --git a/src/main/java/com/alibaba/druid/filter/config/security/decrypter/RsaDecrypter.java b/src/main/java/com/alibaba/druid/filter/config/security/decrypter/RsaDecrypter.java index 114ec7c19a..e6fd0fc2a1 100644 --- a/src/main/java/com/alibaba/druid/filter/config/security/decrypter/RsaDecrypter.java +++ b/src/main/java/com/alibaba/druid/filter/config/security/decrypter/RsaDecrypter.java @@ -32,17 +32,16 @@ import java.util.Properties; /** * RSA 解密器， 支持证书 - * */ public class RsaDecrypter extends AbstractDecrypter { - private static Log log = LogFactory.getLog(RsaDecrypter.class); + private static Log log = LogFactory.getLog(RsaDecrypter.class); - public static final String KEY = "config.decrypt.key"; - public static final String KEY_FILE = "config.decrypt.keyFile"; - public static final String X509_FILE = "config.decrypt.x509File"; + public static final String KEY = "config.decrypt.key"; + public static final String KEY_FILE = "config.decrypt.keyFile"; + public static final String X509_FILE = "config.decrypt.x509File"; - protected static final String DEFAULT_PUBLIC_KEY_STRING = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKHGwq7q2RmwuRgKxBypQHw0mYu4BQZ3eMsTrdK8E6igRcxsobUC7uT0SoxIjl1WveWniCASejoQtn/BY6hVKWsCAwEAAQ=="; + public static final String DEFAULT_PUBLIC_KEY_STRING = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKHGwq7q2RmwuRgKxBypQHw0mYu4BQZ3eMsTrdK8E6igRcxsobUC7uT0SoxIjl1WveWniCASejoQtn/BY6hVKWsCAwEAAQ=="; public String getId() { return "RSA"; @@ -54,9 +53,10 @@ public class RsaDecrypter extends AbstractDecrypter { * 如果是密钥字符串, key 是 config.decrypt.key * 如果是密钥文件, key 是 config.decrypt.keyFile * 如果是证书文件, key 是 config.decrypt.x509File - * + * * 如果不指定密钥, 将使用默认密钥 * + * * @param parameters 密文参数 * @param info * @return @@ -83,10 +83,11 @@ public class RsaDecrypter extends AbstractDecrypter { /** * 通过指定 + * * @param info * @return */ - PublicKey getPublicKey(Properties info) { + public PublicKey getPublicKey(Properties info) { String key = null; String publicKeyFile = null; String x509File = null; @@ -118,7 +119,7 @@ public class RsaDecrypter extends AbstractDecrypter { return getPublicKeyByString(key); } - PublicKey getPublicKeyByString(String publicKeyString) { + public PublicKey getPublicKeyByString(String publicKeyString) { if (publicKeyString == null || publicKeyString.length() == 0) { if (log.isDebugEnabled()) { log.debug("Decrypt by default key"); @@ -137,7 +138,7 @@ public class RsaDecrypter extends AbstractDecrypter { } } - PublicKey getPublicKeyByPublicKeyFile(String publicKeyFile) { + public PublicKey getPublicKeyByPublicKeyFile(String publicKeyFile) { if (publicKeyFile == null || publicKeyFile.length() == 0) { return getPublicKeyByString(null); } @@ -147,7 +148,7 @@ public class RsaDecrypter extends AbstractDecrypter { in = new FileInputStream(publicKeyFile); ByteArrayOutputStream out = new ByteArrayOutputStream(); int len = 0; - byte[] b = new byte[512/8]; + byte[] b = new byte[512 / 8]; while ((len = in.read(b)) != -1) { out.write(b, 0, len); } @@ -163,7 +164,7 @@ public class RsaDecrypter extends AbstractDecrypter { } } - PublicKey getPublicKeyByX509(String x509File) { + public PublicKey getPublicKeyByX509(String x509File) { if (x509File == null || x509File.length() == 0) { return getPublicKeyByString(null); } diff --git a/src/test/java/com/alibaba/druid/filter/config/ConfigFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java similarity index 96% rename from src/test/java/com/alibaba/druid/filter/config/ConfigFilterTest.java rename to src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java index 960490d943..0b11207059 100644 --- a/src/test/java/com/alibaba/druid/filter/config/ConfigFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java @@ -1,5 +1,7 @@ -package com.alibaba.druid.filter.config; +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; diff --git a/src/test/java/com/alibaba/druid/filter/config/loader/ConfigLoaderFactoryTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigLoaderFactoryTest.java similarity index 97% rename from src/test/java/com/alibaba/druid/filter/config/loader/ConfigLoaderFactoryTest.java rename to src/test/java/com/alibaba/druid/bvt/filter/config/ConfigLoaderFactoryTest.java index 93708a3598..17a8d45bf9 100644 --- a/src/test/java/com/alibaba/druid/filter/config/loader/ConfigLoaderFactoryTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigLoaderFactoryTest.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.config.loader; +package com.alibaba.druid.bvt.filter.config; import com.alibaba.druid.filter.config.loader.ConfigLoader; import com.alibaba.druid.filter.config.loader.ConfigLoaderFactory; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigTestSuite.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigTestSuite.java deleted file mode 100644 index 7eab8922d8..0000000000 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigTestSuite.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.alibaba.druid.bvt.filter.config; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -import com.alibaba.druid.filter.config.ConfigFilterTest; -import com.alibaba.druid.filter.config.loader.ConfigLoaderFactoryTest; -import com.alibaba.druid.filter.config.loader.impl.FileConfigLoaderTest; -import com.alibaba.druid.filter.config.loader.impl.FileConfigLoaderTest1; -import com.alibaba.druid.filter.config.loader.impl.HttpConfigLoaderTest; - -/** - * @author Jonas Yang - */ - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - ConfigLoaderFactoryTest.class, - FileConfigLoaderTest.class, - FileConfigLoaderTest1.class, - HttpConfigLoaderTest.class, - ConfigFilterTest.class -}) -public class ConfigTestSuite { -} diff --git a/src/test/java/com/alibaba/druid/filter/config/security/decrypter/DecrypterFactoryTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/DecrypterFactoryTest.java similarity index 62% rename from src/test/java/com/alibaba/druid/filter/config/security/decrypter/DecrypterFactoryTest.java rename to src/test/java/com/alibaba/druid/bvt/filter/config/DecrypterFactoryTest.java index ff852ae3eb..1e6da0fc2f 100644 --- a/src/test/java/com/alibaba/druid/filter/config/security/decrypter/DecrypterFactoryTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/DecrypterFactoryTest.java @@ -1,8 +1,12 @@ -package com.alibaba.druid.filter.config.security.decrypter; +package com.alibaba.druid.bvt.filter.config; import junit.framework.Assert; import org.junit.Test; +import com.alibaba.druid.filter.config.security.decrypter.DecryptException; +import com.alibaba.druid.filter.config.security.decrypter.DecrypterFactory; +import com.alibaba.druid.filter.config.security.decrypter.RsaDecrypter; + /** * @author Jonas Yang */ diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/DecrypterTestSuite.java b/src/test/java/com/alibaba/druid/bvt/filter/config/DecrypterTestSuite.java deleted file mode 100644 index d0013c5db4..0000000000 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/DecrypterTestSuite.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.alibaba.druid.bvt.filter.config; - -import com.alibaba.druid.filter.config.security.decrypter.DecrypterFactoryTest; -import com.alibaba.druid.filter.config.security.decrypter.RsaDecrypterTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * @author Jonas Yang - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ - RsaDecrypterTest.class, - DecrypterFactoryTest.class -}) -public class DecrypterTestSuite { -} diff --git a/src/test/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoaderTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest.java similarity index 88% rename from src/test/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoaderTest.java rename to src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest.java index fc1e4889b5..0c9edfba6a 100644 --- a/src/test/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoaderTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest.java @@ -1,8 +1,10 @@ -package com.alibaba.druid.filter.config.loader.impl; +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 */ diff --git a/src/test/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoaderTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest1.java similarity index 89% rename from src/test/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoaderTest1.java rename to src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest1.java index 9044c83792..e71d15d465 100644 --- a/src/test/java/com/alibaba/druid/filter/config/loader/impl/FileConfigLoaderTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/FileConfigLoaderTest1.java @@ -1,6 +1,8 @@ -package com.alibaba.druid.filter.config.loader.impl; +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; diff --git a/src/test/java/com/alibaba/druid/filter/config/loader/impl/HttpConfigLoaderTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/HttpConfigLoaderTest.java similarity index 89% rename from src/test/java/com/alibaba/druid/filter/config/loader/impl/HttpConfigLoaderTest.java rename to src/test/java/com/alibaba/druid/bvt/filter/config/HttpConfigLoaderTest.java index 9d4776095d..f1188f5032 100644 --- a/src/test/java/com/alibaba/druid/filter/config/loader/impl/HttpConfigLoaderTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/HttpConfigLoaderTest.java @@ -1,8 +1,10 @@ -package com.alibaba.druid.filter.config.loader.impl; +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; diff --git a/src/test/java/com/alibaba/druid/filter/config/security/decrypter/RsaDecrypterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/RsaDecrypterTest.java similarity index 94% rename from src/test/java/com/alibaba/druid/filter/config/security/decrypter/RsaDecrypterTest.java rename to src/test/java/com/alibaba/druid/bvt/filter/config/RsaDecrypterTest.java index b882a47692..3f0c261e96 100644 --- a/src/test/java/com/alibaba/druid/filter/config/security/decrypter/RsaDecrypterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/RsaDecrypterTest.java @@ -1,5 +1,8 @@ -package com.alibaba.druid.filter.config.security.decrypter; +package com.alibaba.druid.bvt.filter.config; +import com.alibaba.druid.filter.config.security.decrypter.DecryptException; +import com.alibaba.druid.filter.config.security.decrypter.RsaDecrypter; +import com.alibaba.druid.filter.config.security.decrypter.SensitiveParameters; import com.alibaba.druid.util.Base64; import junit.framework.Assert; import org.junit.After;