From 70ae17c0063f6885418a8575e99625023815e6f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= <szujobs@hotmail.com>
Date: Tue, 20 Mar 2012 07:03:29 +0800
Subject: [PATCH] fixed test

---
 .../alibaba/druid/filter/stat/StatFilter.java  | 18 +++++-------------
 .../bvt/pool/TestPoolPreparedStatement.java    |  2 +-
 .../bvt/pool/TestPoolPreparedStatement2.java   |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
index 2a7c0bdd44..ab67d4a2ef 100644
--- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
+++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
@@ -261,7 +261,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
         final String sql = statement.getBatchSql();
 
         final int batchSize = statement.getBatchSqlList().size();
-        JdbcSqlStat sqlStat = getSqlStat(statement);
+        JdbcSqlStat sqlStat = statement.getSqlStat();
         if (sqlStat == null) {
             sqlStat = createSqlStat(statement, sql);
             statement.setSqlStat(sqlStat);
@@ -300,7 +300,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
 
         // //////////SQL
 
-        JdbcSqlStat sqlStat = getSqlStat(statement);
+        JdbcSqlStat sqlStat = statement.getSqlStat();
         if (sqlStat == null) {
             sqlStat = createSqlStat(statement, sql);
             statement.setSqlStat(sqlStat);
@@ -337,7 +337,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
         if (attr == null) {
             statement.getAttributes().put(ATTR_UPDATE_COUNT, updateCount);
 
-            final JdbcSqlStat sqlStat = getSqlStat(statement);
+            final JdbcSqlStat sqlStat = statement.getSqlStat();
             if (sqlStat != null) {
                 sqlStat.addUpdateCount(updateCount);
             }
@@ -357,7 +357,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
         dataSourceStat.getStatementStat().afterExecute(nanoSpan);
 
         // // SQL
-        final JdbcSqlStat sqlStat = getSqlStat(statement);
+        final JdbcSqlStat sqlStat = statement.getSqlStat();
 
         if (sqlStat != null) {
             sqlStat.incrementExecuteSuccessCount();
@@ -456,7 +456,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
         connectionCounter.error(error);
 
         // SQL
-        JdbcSqlStat sqlStat = getSqlStat(statement);
+        JdbcSqlStat sqlStat = statement.getSqlStat();
 
         if (sqlStat != null) {
             sqlStat.error(error);
@@ -647,14 +647,6 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
         return dataSourceStat.createSqlStat(sql);
     }
 
-    public static JdbcSqlStat getSqlStat(StatementProxy statement) {
-        if (statement == null) {
-            return null;
-        }
-
-        return statement.getSqlStat();
-    }
-
     public JdbcSqlStat getSqlCounter(String sql) {
         return getSqlStat(sql);
     }
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java
index d8b0a7e026..f92cc88523 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java
@@ -36,7 +36,7 @@ public class TestPoolPreparedStatement extends TestCase {
         dataSource.setValidationQuery("SELECT 1");
         dataSource.setFilters("stat");
         dataSource.setPoolPreparedStatements(true);
-        ((StatFilter) dataSource.getProxyFilters().get(0)).setMaxSqlStatCount(100);
+//        ((StatFilter) dataSource.getProxyFilters().get(0)).setMaxSqlStatCount(100);
     }
 
     protected void tearDown() throws Exception {
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java
index 1c33090f77..bbbc220ad0 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java
@@ -38,7 +38,7 @@ public class TestPoolPreparedStatement2 extends TestCase {
         dataSource.setPoolPreparedStatements(false);
         dataSource.setMaxPoolPreparedStatementPerConnectionSize(20);
         
-        ((StatFilter) dataSource.getProxyFilters().get(0)).setMaxSqlStatCount(100);
+//        ((StatFilter) dataSource.getProxyFilters().get(0)).setMaxSqlStatCount(100);
     }
 
     protected void tearDown() throws Exception {