Author: markt
Date: Mon Nov 13 09:52:55 2017
New Revision: 1815066
URL: http://svn.apache.org/viewvc?rev=1815066&view=rev
Log:
Switch to non-static imports
- avoids checkstyle error
- broadly the same code volume (or less)
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java?rev=1815066&r1=1815065&r2=1815066&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java
Mon Nov 13 09:52:55 2017
@@ -20,8 +20,7 @@ import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collection;
-import static org.junit.Assert.assertNull;
-
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -60,6 +59,6 @@ public class Bug54225 {
poolProperties.setInitSQL(initSQL);
final DataSource ds = new DataSource(poolProperties);
ds.getConnection().close();
- assertNull(poolProperties.getInitSQL());
+ Assert.assertNull(poolProperties.getInitSQL());
}
}
\ No newline at end of file
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java?rev=1815066&r1=1815065&r2=1815066&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java
Mon Nov 13 09:52:55 2017
@@ -21,9 +21,7 @@ import java.sql.SQLException;
import javax.sql.PooledConnection;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.jdbc.pool.DataSource;
@@ -56,12 +54,12 @@ public class Bug54227 {
con.close();
con = ds.getConnection();
actual2 = ((PooledConnection)con).getConnection();
- assertSame(actual1, actual2);
+ Assert.assertSame(actual1, actual2);
con.close();
Thread.sleep(150);
con = ds.getConnection();
actual2 = ((PooledConnection)con).getConnection();
- assertNotSame(actual1, actual2);
+ Assert.assertNotSame(actual1, actual2);
con.close();
}
}
\ No newline at end of file
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java?rev=1815066&r1=1815065&r2=1815066&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java
Mon Nov 13 09:52:55 2017
@@ -18,8 +18,7 @@ package org.apache.tomcat.jdbc.bugs;
import java.sql.SQLException;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.jdbc.pool.DataSource;
@@ -43,7 +42,7 @@ public class Bug54978 {
final DataSource ds = new DataSource(poolProperties);
try {
ds.getConnection().close();
- fail("Validation should have failed.");
+ Assert.fail("Validation should have failed.");
}catch (SQLException x) {
}
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java?rev=1815066&r1=1815065&r2=1815066&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
Mon Nov 13 09:52:55 2017
@@ -26,8 +26,6 @@ import java.sql.Statement;
import java.util.Properties;
import java.util.logging.Logger;
-import static org.junit.Assert.fail;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -165,7 +163,7 @@ public class TestValidationQueryTimeout
} catch (SQLTimeoutException ex) {
} catch (SQLException x) {
- fail("We should have got a timeout exception.");
+ Assert.fail("We should have got a timeout exception.");
} finally {
end = System.currentTimeMillis();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
