From 29ce11616c13b0d1c6436fdadb0b05e5c2d00e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 19 Mar 2012 21:15:29 +0800 Subject: [PATCH] refactor test --- .../alibaba/druid/benckmark/{ => proxy}/BenchmarkCase.java | 2 +- .../druid/benckmark/{ => proxy}/BenchmarkExecutor.java | 2 +- .../druid/benckmark/{ => proxy}/DirectSQLExecutor.java | 2 +- .../druid/benckmark/{ => proxy}/DruidBenchmarkTest.java | 3 ++- .../alibaba/druid/benckmark/{ => proxy}/SQLExecutor.java | 2 +- .../druid/benckmark/{ => proxy}/TestAtomicPerformance.java | 2 +- .../druid/benckmark/{ => proxy}/sqlcase/Select1.java | 6 +++--- .../benckmark/{ => proxy}/sqlcase/SelectEmptyTable.java | 6 +++--- .../druid/benckmark/{ => proxy}/sqlcase/SelectNow.java | 6 +++--- .../{sqlcase/dragoon => proxy/sqlcase}/SelectSysUser.java | 6 +++--- 10 files changed, 19 insertions(+), 18 deletions(-) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/BenchmarkCase.java (92%) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/BenchmarkExecutor.java (96%) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/DirectSQLExecutor.java (95%) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/DruidBenchmarkTest.java (93%) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/SQLExecutor.java (92%) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/TestAtomicPerformance.java (93%) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/sqlcase/Select1.java (87%) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/sqlcase/SelectEmptyTable.java (90%) rename src/test/java/com/alibaba/druid/benckmark/{ => proxy}/sqlcase/SelectNow.java (87%) rename src/test/java/com/alibaba/druid/benckmark/{sqlcase/dragoon => proxy/sqlcase}/SelectSysUser.java (88%) diff --git a/src/test/java/com/alibaba/druid/benckmark/BenchmarkCase.java b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java similarity index 92% rename from src/test/java/com/alibaba/druid/benckmark/BenchmarkCase.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java index 2cec92b6dd..413a4087b7 100644 --- a/src/test/java/com/alibaba/druid/benckmark/BenchmarkCase.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark; +package com.alibaba.druid.benckmark.proxy; public abstract class BenchmarkCase { diff --git a/src/test/java/com/alibaba/druid/benckmark/BenchmarkExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java similarity index 96% rename from src/test/java/com/alibaba/druid/benckmark/BenchmarkExecutor.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java index f1b6d3b194..ff9c85700a 100644 --- a/src/test/java/com/alibaba/druid/benckmark/BenchmarkExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark; +package com.alibaba.druid.benckmark.proxy; import java.lang.management.ManagementFactory; import java.text.NumberFormat; diff --git a/src/test/java/com/alibaba/druid/benckmark/DirectSQLExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java similarity index 95% rename from src/test/java/com/alibaba/druid/benckmark/DirectSQLExecutor.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java index 64b95334c7..387bb459fb 100644 --- a/src/test/java/com/alibaba/druid/benckmark/DirectSQLExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark; +package com.alibaba.druid.benckmark.proxy; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/test/java/com/alibaba/druid/benckmark/DruidBenchmarkTest.java b/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java similarity index 93% rename from src/test/java/com/alibaba/druid/benckmark/DruidBenchmarkTest.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java index a73cbfec85..0602b52dc0 100644 --- a/src/test/java/com/alibaba/druid/benckmark/DruidBenchmarkTest.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark; +package com.alibaba.druid.benckmark.proxy; import junit.framework.TestCase; +import com.alibaba.druid.benckmark.proxy.sqlcase.SelectNow; import com.alibaba.druid.benckmark.sqlcase.*; import com.alibaba.druid.benckmark.sqlcase.dragoon.*; diff --git a/src/test/java/com/alibaba/druid/benckmark/SQLExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java similarity index 92% rename from src/test/java/com/alibaba/druid/benckmark/SQLExecutor.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java index 9fd8d4965c..a20fbdf5d8 100644 --- a/src/test/java/com/alibaba/druid/benckmark/SQLExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark; +package com.alibaba.druid.benckmark.proxy; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/test/java/com/alibaba/druid/benckmark/TestAtomicPerformance.java b/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java similarity index 93% rename from src/test/java/com/alibaba/druid/benckmark/TestAtomicPerformance.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java index 09998aab92..83b9c2359c 100644 --- a/src/test/java/com/alibaba/druid/benckmark/TestAtomicPerformance.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.benckmark; +package com.alibaba.druid.benckmark.proxy; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/test/java/com/alibaba/druid/benckmark/sqlcase/Select1.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java similarity index 87% rename from src/test/java/com/alibaba/druid/benckmark/sqlcase/Select1.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java index 448af98b6c..0855416c9e 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sqlcase/Select1.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark.sqlcase; +package com.alibaba.druid.benckmark.proxy.sqlcase; import java.sql.Connection; import java.sql.ResultSet; @@ -21,8 +21,8 @@ import java.sql.Statement; import junit.framework.Assert; -import com.alibaba.druid.benckmark.BenchmarkCase; -import com.alibaba.druid.benckmark.SQLExecutor; +import com.alibaba.druid.benckmark.proxy.BenchmarkCase; +import com.alibaba.druid.benckmark.proxy.SQLExecutor; public class Select1 extends BenchmarkCase { diff --git a/src/test/java/com/alibaba/druid/benckmark/sqlcase/SelectEmptyTable.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java similarity index 90% rename from src/test/java/com/alibaba/druid/benckmark/sqlcase/SelectEmptyTable.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java index f423f91b41..81fe100b80 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sqlcase/SelectEmptyTable.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark.sqlcase; +package com.alibaba.druid.benckmark.proxy.sqlcase; import java.sql.Connection; import java.sql.ResultSet; @@ -21,8 +21,8 @@ import java.sql.Statement; import junit.framework.Assert; -import com.alibaba.druid.benckmark.BenchmarkCase; -import com.alibaba.druid.benckmark.SQLExecutor; +import com.alibaba.druid.benckmark.proxy.BenchmarkCase; +import com.alibaba.druid.benckmark.proxy.SQLExecutor; import com.alibaba.druid.util.JdbcUtils; public class SelectEmptyTable extends BenchmarkCase { diff --git a/src/test/java/com/alibaba/druid/benckmark/sqlcase/SelectNow.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java similarity index 87% rename from src/test/java/com/alibaba/druid/benckmark/sqlcase/SelectNow.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java index bb59715366..a4ebdbe836 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sqlcase/SelectNow.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark.sqlcase; +package com.alibaba.druid.benckmark.proxy.sqlcase; import java.sql.Connection; import java.sql.ResultSet; @@ -22,8 +22,8 @@ import java.util.Date; import junit.framework.Assert; -import com.alibaba.druid.benckmark.BenchmarkCase; -import com.alibaba.druid.benckmark.SQLExecutor; +import com.alibaba.druid.benckmark.proxy.BenchmarkCase; +import com.alibaba.druid.benckmark.proxy.SQLExecutor; public class SelectNow extends BenchmarkCase { diff --git a/src/test/java/com/alibaba/druid/benckmark/sqlcase/dragoon/SelectSysUser.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java similarity index 88% rename from src/test/java/com/alibaba/druid/benckmark/sqlcase/dragoon/SelectSysUser.java rename to src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java index 0f2767e525..1d4a7565f2 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sqlcase/dragoon/SelectSysUser.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.benckmark.sqlcase.dragoon; +package com.alibaba.druid.benckmark.proxy.sqlcase; import java.sql.Connection; import java.sql.ResultSet; @@ -21,8 +21,8 @@ import java.sql.Statement; import junit.framework.Assert; -import com.alibaba.druid.benckmark.BenchmarkCase; -import com.alibaba.druid.benckmark.SQLExecutor; +import com.alibaba.druid.benckmark.proxy.BenchmarkCase; +import com.alibaba.druid.benckmark.proxy.SQLExecutor; public class SelectSysUser extends BenchmarkCase {