[Proxool-cvs] proxool/src/java-test/org/logicalcobwebs/proxool/admin SnapshotTest.java,1.12,1.13

[<bil...@us...>]

Update of /cvsroot/proxool/proxool/src/java-test/org/logicalcobwebs/proxool/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13940/src/java-test/org/logicalcobwebs/proxool/admin

Modified Files:
	SnapshotTest.java 
Log Message:
Test new sqlCalls property of snapshot

Index: SnapshotTest.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java-test/org/logicalcobwebs/proxool/admin/SnapshotTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SnapshotTest.java	10 Mar 2003 23:46:43 -0000	1.12
--- SnapshotTest.java	7 Oct 2005 08:13:46 -0000	1.13
***************
*** 17,20 ****
--- 17,21 ----
  import java.sql.Connection;
  import java.sql.DriverManager;
+ import java.sql.Statement;
  import java.util.Properties;
  
***************
*** 53,56 ****
--- 54,58 ----
          info.setProperty(ProxoolConstants.STATISTICS_PROPERTY, "10s,15s");
          info.setProperty(ProxoolConstants.MINIMUM_CONNECTION_COUNT_PROPERTY, "1");
+         info.setProperty(ProxoolConstants.TRACE_PROPERTY, "true");
  
          // We don't test whether anything is logged, but this line should make something appear
***************
*** 61,65 ****
  
          {
!             DriverManager.getConnection(url).close();
  
              SnapshotIF snapshot = ProxoolFacade.getSnapshot(alias, true);
--- 63,69 ----
  
          {
!             Connection connection = DriverManager.getConnection(url);
!             connection.createStatement().execute(TestConstants.HYPERSONIC_TEST_SQL);
!             connection.close();
  
              SnapshotIF snapshot = ProxoolFacade.getSnapshot(alias, true);
***************
*** 72,79 ****
              assertTrue("connectionInfos.length != 0",  connectionInfos.length != 0);
              assertEquals("connectionInfos activeCount", 0, getCount(connectionInfos, ConnectionInfoIF.STATUS_ACTIVE));
          }
  
          {
!             Connection c = DriverManager.getConnection(url);
  
              SnapshotIF snapshot = ProxoolFacade.getSnapshot(alias, true);
--- 76,87 ----
              assertTrue("connectionInfos.length != 0",  connectionInfos.length != 0);
              assertEquals("connectionInfos activeCount", 0, getCount(connectionInfos, ConnectionInfoIF.STATUS_ACTIVE));
+             assertEquals("connectionInfos sql count", 1, connectionInfos[0].getSqlCalls().length);
+             assertEquals("connectionInfos lastSql", TestConstants.HYPERSONIC_TEST_SQL, connectionInfos[0].getSqlCalls()[0].replace(';', ' ').trim());
          }
  
          {
!             Connection connection = DriverManager.getConnection(url);
!             connection.createStatement().execute(TestConstants.HYPERSONIC_TEST_SQL);
!             connection.createStatement().execute(TestConstants.HYPERSONIC_TEST_SQL_2);
  
              SnapshotIF snapshot = ProxoolFacade.getSnapshot(alias, true);
***************
*** 86,91 ****
              assertTrue("connectionInfos.length != 0",  connectionInfos.length != 0);
              assertEquals("connectionInfos activeCount", 1, getCount(connectionInfos, ConnectionInfoIF.STATUS_ACTIVE));
  
!             c.close();
          }
  
--- 94,102 ----
              assertTrue("connectionInfos.length != 0",  connectionInfos.length != 0);
              assertEquals("connectionInfos activeCount", 1, getCount(connectionInfos, ConnectionInfoIF.STATUS_ACTIVE));
+             assertEquals("connectionInfos sql count", 2, connectionInfos[0].getSqlCalls().length);
+             assertEquals("connectionInfos lastSql", TestConstants.HYPERSONIC_TEST_SQL, connectionInfos[0].getSqlCalls()[0].replace(';', ' ').trim());
+             assertEquals("connectionInfos lastSql", TestConstants.HYPERSONIC_TEST_SQL_2, connectionInfos[0].getSqlCalls()[1].replace(';', ' ').trim());
  
!             connection.close();
          }
  
***************
*** 107,110 ****
--- 118,124 ----
   Revision history:
   $Log$
+  Revision 1.13  2005/10/07 08:13:46  billhorsman
+  Test new sqlCalls property of snapshot
+ 
   Revision 1.12  2003/03/10 23:46:43  billhorsman
   checkstyle