Enable Checkstyle for tests
Fix import order
diff --git a/pom.xml b/pom.xml
index e0c9dd1..f4d8392 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,7 @@
<configLocation>${checkstyle.config.file}</configLocation>
<enableRulesSummary>false</enableRulesSummary>
<headerLocation>${checkstyle.header.file}</headerLocation>
- <includeTestSourceDirectory>false</includeTestSourceDirectory> <!-- TODO -->
+ <includeTestSourceDirectory>true</includeTestSourceDirectory> <!-- TODO -->
<suppressionsLocation>${basedir}/src/conf/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<suppressionsFileExpression>${basedir}/src/conf/checkstyle/checkstyle-suppressions.xml</suppressionsFileExpression>
</configuration>
diff --git a/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java
index 2f4d88e..e2d45a7 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.dbutils.handlers;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
diff --git a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
index b5e0b26..803b0e4 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
@@ -18,7 +18,6 @@
import static org.mockito.Mockito.mock;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
import java.util.Map.Entry;
diff --git a/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
index 9a50041..8803106 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
@@ -19,12 +19,12 @@
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import java.sql.ResultSet;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.ResultSet;
-
@RunWith(MockitoJUnitRunner.class)
public class BooleanColumnHandlerTest extends AbstractTestColumnHandler<Boolean> {
diff --git a/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
index efe1b15..155ad68 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
@@ -19,12 +19,12 @@
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import java.sql.ResultSet;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.ResultSet;
-
@RunWith(MockitoJUnitRunner.class)
public class ByteColumnHandlerTest extends AbstractTestColumnHandler<Byte> {
diff --git a/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
index 92eed1f..aa61e93 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
@@ -19,12 +19,12 @@
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import java.sql.ResultSet;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.ResultSet;
-
@RunWith(MockitoJUnitRunner.class)
public class DoubleColumnHandlerTest extends AbstractTestColumnHandler<Double> {
diff --git a/src/test/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandlerTest.java
index 61c35d1..3ebddc2 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandlerTest.java
@@ -19,12 +19,12 @@
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import java.sql.ResultSet;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.ResultSet;
-
@RunWith(MockitoJUnitRunner.class)
public class FloatColumnHandlerTest extends AbstractTestColumnHandler<Float> {