← Back to branch summary

~ubuntu-branches/ubuntu/precise/tomcat7/precise-proposed

« back to all changes in this revision

Viewing changes to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java

  • Committer: Bazaar Package Importer
  • Author(s): tony mancill
  • Date: 2011-07-25 22:58:33 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110725225833-1t773ak3y3g9utm2
Tags: 7.0.19-1
http://bugs.debian.org/634992
* Team upload.
* New upstream release.
  - Includes fix for CVE-2011-2526 (Closes: #634992)
* Remove patch for CVE-2011-2204 (included upstream).

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java
 
1
/*
 
2
 *  Licensed to the Apache Software Foundation (ASF) under one or more
 
3
 *  contributor license agreements.  See the NOTICE file distributed with
 
4
 *  this work for additional information regarding copyright ownership.
 
5
 *  The ASF licenses this file to You under the Apache License, Version 2.0
 
6
 *  (the "License"); you may not use this file except in compliance with
 
7
 *  the License.  You may obtain a copy of the License at
 
8
 *
 
9
 *      http://www.apache.org/licenses/LICENSE-2.0
 
10
 *
 
11
 *  Unless required by applicable law or agreed to in writing, software
 
12
 *  distributed under the License is distributed on an "AS IS" BASIS,
 
13
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
14
 *  See the License for the specific language governing permissions and
 
15
 *  limitations under the License.
 
16
 */
 
17
 
 
18
package org.apache.tomcat.jdbc.test;
 
19
 
 
20
import java.sql.Connection;
 
21
 
 
22
import org.apache.tomcat.jdbc.pool.interceptor.TestInterceptor;
 
23
 
 
24
public class TestInterceptorShortName extends DefaultTestCase {
 
25
 
 
26
    public TestInterceptorShortName(String name) {
 
27
        super(name);
 
28
    }
 
29
    
 
30
    public void testShortInterceptor() throws Exception {
 
31
        this.datasource = this.createDefaultDataSource();
 
32
        this.datasource.setJdbcInterceptors("TestInterceptor");
 
33
        this.datasource.setMaxActive(1);
 
34
        Connection con = this.datasource.getConnection();
 
35
        assertTrue("Pool should have been started.",TestInterceptor.poolstarted);
 
36
        assertEquals("Only one interceptor should have been called setProperties",1,TestInterceptor.instancecount.get());
 
37
        con.close();
 
38
        this.datasource.close();
 
39
        assertTrue("Pool should have been closed.",TestInterceptor.poolclosed);
 
40
    }
 
41
 
 
42
 
 
43
}