dgraham 2004/10/31 19:08:12
Modified: dbutils project.xml
dbutils/src/test/org/apache/commons/dbutils
MockResultSet.java MockResultSetMetaData.java
Log:
Implemented hashCode, toString, and equals for proxies. PR: 31786
Revision Changes Path
1.17 +9 -4 jakarta-commons/dbutils/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 10 Apr 2004 19:49:12 -0000 1.16
+++ project.xml 1 Nov 2004 03:08:11 -0000 1.17
@@ -144,21 +144,26 @@
<role>Java Developer</role>
</roles>
</contributor>
+ <contributor>
+ <name>Michael Schuerig</name>
+ <id></id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
</contributors>
<dependencies>
-
<dependency>
<id>junit</id>
<version>3.8.1</version>
<url>http://www.junit.org/</url>
</dependency>
-
</dependencies>
-
<build>
-
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
1.5 +12 -7
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/MockResultSet.java
Index: MockResultSet.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/MockResultSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockResultSet.java 28 Feb 2004 00:12:22 -0000 1.4
+++ MockResultSet.java 1 Nov 2004 03:08:12 -0000 1.5
@@ -37,12 +37,9 @@
*
* @param metaData
* @param rows A null value indicates an empty <code>ResultSet</code>.
- * @return
*/
- public static ResultSet create(
- ResultSetMetaData metaData,
- Object[][] rows) {
-
+ public static ResultSet create(ResultSetMetaData metaData,
+ Object[][] rows) {
return ProxyFactory.instance().createResultSet(
new MockResultSet(metaData, rows));
}
@@ -63,8 +60,7 @@
public MockResultSet(ResultSetMetaData metaData, Object[][] rows) {
super();
this.metaData = metaData;
- this.iter =
- (rows == null)
+ this.iter = (rows == null)
? Collections.EMPTY_LIST.iterator()
: Arrays.asList(rows).iterator();
}
@@ -308,6 +304,15 @@
} else if (methodName.equals("isLast")) {
return this.isLast();
+
+ } else if (methodName.equals("hashCode")) {
+ return new Integer(System.identityHashCode(proxy));
+
+ } else if (methodName.equals("toString")) {
+ return "MockResultSet " + System.identityHashCode(proxy);
+
+ } else if (methodName.equals("equals")) {
+ return Boolean.valueOf(proxy == args[0]);
}
return null;
1.4 +9 -0
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java
Index: MockResultSetMetaData.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockResultSetMetaData.java 28 Feb 2004 00:12:22 -0000 1.3
+++ MockResultSetMetaData.java 1 Nov 2004 03:08:12 -0000 1.4
@@ -63,6 +63,15 @@
int col = ((Integer) args[0]).intValue() - 1;
return this.columnNames[col];
+ } else if (methodName.equals("hashCode")) {
+ return new Integer(System.identityHashCode(proxy));
+
+ } else if (methodName.equals("toString")) {
+ return "MockResultSetMetaData " + System.identityHashCode(proxy);
+
+ } else if (methodName.equals("equals")) {
+ return Boolean.valueOf(proxy == args[0]);
+
// stub out other methods for now
} else {
Class returnType = method.getReturnType();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
