Sort members
diff --git a/src/test/java/org/apache/commons/dbutils/BaseTestCase.java b/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
index e1ce7ed..8de88bc 100644
--- a/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
+++ b/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
@@ -79,6 +79,18 @@
return MockResultSet.create(metaData, rows);
}
+ public ResultSet getEmptyResultSet() {
+ return this.emptyResultSet;
+ }
+
+ public ResultSet getResultSet() {
+ return this.rs;
+ }
+
+ public void setResultSet(ResultSet resultSet) {
+ this.rs = resultSet;
+ }
+
/**
* This is called before each test method so ResultSet will be fresh each time.
*
@@ -92,18 +104,6 @@
emptyResultSet = MockResultSet.create(metaData, null);
}
- public ResultSet getResultSet() {
- return this.rs;
- }
-
- public ResultSet getEmptyResultSet() {
- return this.emptyResultSet;
- }
-
- public void setResultSet(ResultSet resultSet) {
- this.rs = resultSet;
- }
-
// Test which allows Eclipse to be run on full project (avoids no tests found)
// check that the rows are valid for the column definition
public void testCheckDataSizes() {
diff --git a/src/test/java/org/apache/commons/dbutils/MockResultSet.java b/src/test/java/org/apache/commons/dbutils/MockResultSet.java
index f919c16..a59b689 100644
--- a/src/test/java/org/apache/commons/dbutils/MockResultSet.java
+++ b/src/test/java/org/apache/commons/dbutils/MockResultSet.java
@@ -32,6 +32,8 @@
*/
public class MockResultSet implements InvocationHandler {
+ private static final Set<String> METHOD_NAMES = Set.of("isLast", "hashCode", "toString", "equals");
+
/**
* Create a {@code MockResultSet} proxy object. This is equivalent to:
*
@@ -54,8 +56,6 @@
private Boolean wasNull = Boolean.FALSE;
- private static final Set<String> METHOD_NAMES = Set.of("isLast", "hashCode", "toString", "equals");
-
/**
* MockResultSet constructor.
*
@@ -267,33 +267,6 @@
return obj == null ? null : obj.toString();
}
- @Override
- public Object invoke(final Object proxy, final Method method, final Object[] args)
- throws Throwable {
-
- final String methodName = method.getName();
- if (methodName.equals("getMetaData")) {
- return this.getMetaData();
- }
- if (methodName.equals("next")) {
- return this.next();
- }
- if (methodName.equals("previous")) {
- // Handle previous method
- } else if (methodName.equals("close")) {
- // Handle close method
- } else if (isColumnMethod(methodName)) {
- return handleColumnMethod(methodName, args);
- } else if (METHOD_NAMES.contains(methodName)) {
- return handleNonColumnMethod(methodName, proxy, args);
- }
- throw new UnsupportedOperationException("Unsupported method: " + methodName);
- }
-
- private boolean isColumnMethod(String methodName) {
- return methodName.startsWith("get") || methodName.equals("wasNull");
- }
-
private Object handleColumnMethod(String methodName, final Object[] args) throws SQLException {
switch (methodName) {
case "getBoolean":
@@ -336,6 +309,33 @@
}
}
+ @Override
+ public Object invoke(final Object proxy, final Method method, final Object[] args)
+ throws Throwable {
+
+ final String methodName = method.getName();
+ if (methodName.equals("getMetaData")) {
+ return this.getMetaData();
+ }
+ if (methodName.equals("next")) {
+ return this.next();
+ }
+ if (methodName.equals("previous")) {
+ // Handle previous method
+ } else if (methodName.equals("close")) {
+ // Handle close method
+ } else if (isColumnMethod(methodName)) {
+ return handleColumnMethod(methodName, args);
+ } else if (METHOD_NAMES.contains(methodName)) {
+ return handleNonColumnMethod(methodName, proxy, args);
+ }
+ throw new UnsupportedOperationException("Unsupported method: " + methodName);
+ }
+
+ private boolean isColumnMethod(String methodName) {
+ return methodName.startsWith("get") || methodName.equals("wasNull");
+ }
+
/**
* @throws SQLException
*/
diff --git a/src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java b/src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java
index caf16f5..8a266ea 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java
@@ -37,10 +37,6 @@
this.matchingType = matchingType;
}
- public ResultSet getResultSet() {
- return this.rs;
- }
-
public ColumnHandler<T> getColumnHandler() {
return this.handler;
}
@@ -49,6 +45,10 @@
return this.matchingType;
}
+ public ResultSet getResultSet() {
+ return this.rs;
+ }
+
@Test
public abstract void testApplyType() throws Exception;
diff --git a/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java b/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java
index b4c6dcc..9ac6e51 100644
--- a/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java
+++ b/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java
@@ -214,6 +214,8 @@
*/
public class SqlNullCheckedResultSetTest extends BaseTestCase {
+ private static ResultSet rs;
+
private static void assertArrayEquals(final byte[] expected, final byte[] actual) {
if (expected == actual) {
return;
@@ -227,9 +229,7 @@
assertEquals("Array not equal at index " + i, expectedItem, actualItem);
}
}
-
private SqlNullCheckedResultSet rs2;
- private static ResultSet rs;
/**
* Sets up instance variables required by this test case.
