Menu
▾
▴
mockobjects-java-dev
|
From: Jeff M. <cus...@us...> - 2002-12-09 18:20:23
|
Update of /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv27540/src/jdk/common/com/mockobjects/sql
Modified Files:
MockResultSet.java CommonMockStatement.java
CommonMockSingleRowResultSet.java
CommonMockResultSetMetaData.java
CommonMockPreparedStatement.java
CommonMockMultiRowResultSet.java CommonMockConnection2.java
CommonMockConnection.java
Log Message:
Changes around MockConnection2
Index: MockResultSet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/MockResultSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockResultSet.java 9 Sep 2002 12:13:53 -0000 1.3
+++ MockResultSet.java 9 Dec 2002 18:20:09 -0000 1.4
@@ -56,13 +56,10 @@
*
*/
-// ------------------------------------------------------------------------ 78
-
package com.mockobjects.sql;
import com.mockobjects.ExpectationCounter;
import com.mockobjects.MockObject;
-import junit.framework.AssertionFailedError;
import java.io.InputStream;
import java.io.Reader;
@@ -83,20 +80,21 @@
*/
abstract public class MockResultSet extends MockObject implements ResultSet {
-
-// -------------------------------------------------------------------- fields
-
- private ExpectationCounter myCloseCalls =
- new ExpectationCounter("MockResultSet.close");
-
- protected ExpectationCounter myNextCalls =
- new ExpectationCounter("MockResultSet.next");
+ private final ExpectationCounter myCloseCalls;
+ protected final ExpectationCounter myNextCalls;
private ResultSetMetaData myMetaData;
private Statement myStatement;
-// -------------------------------------------------------------- setExpected*
+ public MockResultSet() {
+ this(MockResultSet.class.getName());
+ }
+
+ public MockResultSet(String name) {
+ myCloseCalls =new ExpectationCounter(name+".close");
+ myNextCalls =new ExpectationCounter(name+".next");
+ }
public void setExpectedCloseCalls(int calls) {
myCloseCalls.setExpected(calls);
Index: CommonMockStatement.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockStatement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonMockStatement.java 8 Jul 2002 18:30:37 -0000 1.2
+++ CommonMockStatement.java 9 Dec 2002 18:20:10 -0000 1.3
@@ -7,11 +7,14 @@
import java.sql.*;
-public abstract class CommonMockStatement extends MockObject implements Statement {
- protected ExpectationCounter myCloseCalls = new ExpectationCounter("CommonMockStatement.closeCalls");
- protected ExpectationCounter myExecuteCalls = new ExpectationCounter("CommonMockStatement.executeCalls");
- protected ExpectationValue myQueryString = new ExpectationValue("CommonMockStatement.queryString");
- protected ReturnObjectList myResultSets = new ReturnObjectList("result set");
+/**
+ * @version $Revision$
+ */
+abstract class CommonMockStatement extends MockObject implements Statement {
+ protected final ExpectationCounter myCloseCalls = new ExpectationCounter("CommonMockStatement.closeCalls");
+ protected final ExpectationCounter myExecuteCalls = new ExpectationCounter("CommonMockStatement.executeCalls");
+ protected final ExpectationValue myQueryString = new ExpectationValue("CommonMockStatement.queryString");
+ protected final ReturnObjectList myResultSets = new ReturnObjectList("result set");
private int myUpdateCount = 0;
private SQLException myExecuteException = null;
Index: CommonMockSingleRowResultSet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockSingleRowResultSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonMockSingleRowResultSet.java 9 Sep 2002 12:13:53 -0000 1.2
+++ CommonMockSingleRowResultSet.java 9 Dec 2002 18:20:11 -0000 1.3
@@ -78,8 +78,9 @@
* set the corresponding value to be of type SQLException.
* @author Jeff Martin
* @author Ted Husted
+ * @version $Revision$
*/
-public abstract class CommonMockSingleRowResultSet extends MockResultSet {
+abstract class CommonMockSingleRowResultSet extends MockResultSet {
// -------------------------------------------------------------------- fields
Index: CommonMockResultSetMetaData.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockResultSetMetaData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommonMockResultSetMetaData.java 30 Aug 2002 14:49:58 -0000 1.1
+++ CommonMockResultSetMetaData.java 9 Dec 2002 18:20:11 -0000 1.2
@@ -8,9 +8,9 @@
import java.sql.SQLException;
/**
- * $Revision$
+ * @version $Revision$
*/
-public abstract class CommonMockResultSetMetaData extends MockObject implements ResultSetMetaData {
+class CommonMockResultSetMetaData extends MockObject implements ResultSetMetaData {
private final ReturnObjectList myNames =
new ReturnObjectList("MockResultSetMetaData.columnNames");
private final ReturnObjectList myTypes =
Index: CommonMockPreparedStatement.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockPreparedStatement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonMockPreparedStatement.java 9 Sep 2002 12:13:53 -0000 1.2
+++ CommonMockPreparedStatement.java 9 Dec 2002 18:20:12 -0000 1.3
@@ -75,7 +75,7 @@
* @author Ted Husted
* @version $Revision$ $Date$
*/
-public abstract class CommonMockPreparedStatement
+abstract class CommonMockPreparedStatement
extends CommonMockStatement implements PreparedStatement {
// -------------------------------------------------------------------- fields
Index: CommonMockMultiRowResultSet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockMultiRowResultSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonMockMultiRowResultSet.java 4 Dec 2002 12:39:23 -0000 1.2
+++ CommonMockMultiRowResultSet.java 9 Dec 2002 18:20:12 -0000 1.3
@@ -1,21 +1,13 @@
package com.mockobjects.sql;
-import java.sql.*;
-import java.sql.Date;
-import java.util.*;
-import java.math.BigDecimal;
-import java.io.InputStream;
-import java.io.Reader;
-
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-import com.mockobjects.*;
+import java.sql.SQLException;
/**
* This is a simple implementation of a MockResultSet.
* It returns values for multiple rows.
+ * @version $Revision$
*/
-public abstract class CommonMockMultiRowResultSet extends MockResultSet {
+abstract class CommonMockMultiRowResultSet extends MockResultSet {
private Object[][] myRows = new Object[0][0];
private String[] myColumnNames;
private int myRowOffset = -1;
Index: CommonMockConnection2.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockConnection2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommonMockConnection2.java 4 Dec 2002 12:39:23 -0000 1.1
+++ CommonMockConnection2.java 9 Dec 2002 18:20:13 -0000 1.2
@@ -84,7 +84,7 @@
import java.sql.PreparedStatement;
import java.sql.SQLException;
-public abstract class CommonMockConnection2 extends CommonMockConnection implements Connection {
+abstract class CommonMockConnection2 extends CommonMockConnection implements Connection {
private final ReturnObjectBag myPreparedStatements;
Index: CommonMockConnection.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockConnection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CommonMockConnection.java 4 Dec 2002 12:39:23 -0000 1.5
+++ CommonMockConnection.java 9 Dec 2002 18:20:14 -0000 1.6
@@ -83,7 +83,7 @@
import java.sql.*;
import java.util.Map;
-public abstract class CommonMockConnection extends MockObject implements Connection {
+abstract class CommonMockConnection extends MockObject implements Connection {
// -------------------------------------------------------------------- fields
|
|
From: Jeff M. <je...@mk...> - 2002-12-09 18:32:46
|
Not sure quite what happened there. But there was a whole bunch of
changes didn't get included last time I checked stuff in.
Good thing we have the Gump nags to remind us ;-)
On Mon, 2002-12-09 at 18:20, Jeff Martin wrote:
> Update of /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql
> In directory sc8-pr-cvs1:/tmp/cvs-serv27540/src/jdk/common/com/mockobjects/sql
>
> Modified Files:
> MockResultSet.java CommonMockStatement.java
> CommonMockSingleRowResultSet.java
> CommonMockResultSetMetaData.java
> CommonMockPreparedStatement.java
> CommonMockMultiRowResultSet.java CommonMockConnection2.java
> CommonMockConnection.java
> Log Message:
> Changes around MockConnection2
>
>
> Index: MockResultSet.java
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/MockResultSet.java,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- MockResultSet.java 9 Sep 2002 12:13:53 -0000 1.3
> +++ MockResultSet.java 9 Dec 2002 18:20:09 -0000 1.4
> @@ -56,13 +56,10 @@
> *
> */
>
> -// ------------------------------------------------------------------------ 78
> -
> package com.mockobjects.sql;
>
> import com.mockobjects.ExpectationCounter;
> import com.mockobjects.MockObject;
> -import junit.framework.AssertionFailedError;
>
> import java.io.InputStream;
> import java.io.Reader;
> @@ -83,20 +80,21 @@
> */
> abstract public class MockResultSet extends MockObject implements ResultSet {
>
> -
> -// -------------------------------------------------------------------- fields
> -
> - private ExpectationCounter myCloseCalls =
> - new ExpectationCounter("MockResultSet.close");
> -
> - protected ExpectationCounter myNextCalls =
> - new ExpectationCounter("MockResultSet.next");
> + private final ExpectationCounter myCloseCalls;
> + protected final ExpectationCounter myNextCalls;
>
> private ResultSetMetaData myMetaData;
>
> private Statement myStatement;
>
> -// -------------------------------------------------------------- setExpected*
> + public MockResultSet() {
> + this(MockResultSet.class.getName());
> + }
> +
> + public MockResultSet(String name) {
> + myCloseCalls =new ExpectationCounter(name+".close");
> + myNextCalls =new ExpectationCounter(name+".next");
> + }
>
> public void setExpectedCloseCalls(int calls) {
> myCloseCalls.setExpected(calls);
>
> Index: CommonMockStatement.java
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockStatement.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- CommonMockStatement.java 8 Jul 2002 18:30:37 -0000 1.2
> +++ CommonMockStatement.java 9 Dec 2002 18:20:10 -0000 1.3
> @@ -7,11 +7,14 @@
>
> import java.sql.*;
>
> -public abstract class CommonMockStatement extends MockObject implements Statement {
> - protected ExpectationCounter myCloseCalls = new ExpectationCounter("CommonMockStatement.closeCalls");
> - protected ExpectationCounter myExecuteCalls = new ExpectationCounter("CommonMockStatement.executeCalls");
> - protected ExpectationValue myQueryString = new ExpectationValue("CommonMockStatement.queryString");
> - protected ReturnObjectList myResultSets = new ReturnObjectList("result set");
> +/**
> + * @version $Revision$
> + */
> +abstract class CommonMockStatement extends MockObject implements Statement {
> + protected final ExpectationCounter myCloseCalls = new ExpectationCounter("CommonMockStatement.closeCalls");
> + protected final ExpectationCounter myExecuteCalls = new ExpectationCounter("CommonMockStatement.executeCalls");
> + protected final ExpectationValue myQueryString = new ExpectationValue("CommonMockStatement.queryString");
> + protected final ReturnObjectList myResultSets = new ReturnObjectList("result set");
>
> private int myUpdateCount = 0;
> private SQLException myExecuteException = null;
>
> Index: CommonMockSingleRowResultSet.java
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockSingleRowResultSet.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- CommonMockSingleRowResultSet.java 9 Sep 2002 12:13:53 -0000 1.2
> +++ CommonMockSingleRowResultSet.java 9 Dec 2002 18:20:11 -0000 1.3
> @@ -78,8 +78,9 @@
> * set the corresponding value to be of type SQLException.
> * @author Jeff Martin
> * @author Ted Husted
> + * @version $Revision$
> */
> -public abstract class CommonMockSingleRowResultSet extends MockResultSet {
> +abstract class CommonMockSingleRowResultSet extends MockResultSet {
>
> // -------------------------------------------------------------------- fields
>
>
> Index: CommonMockResultSetMetaData.java
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockResultSetMetaData.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- CommonMockResultSetMetaData.java 30 Aug 2002 14:49:58 -0000 1.1
> +++ CommonMockResultSetMetaData.java 9 Dec 2002 18:20:11 -0000 1.2
> @@ -8,9 +8,9 @@
> import java.sql.SQLException;
>
> /**
> - * $Revision$
> + * @version $Revision$
> */
> -public abstract class CommonMockResultSetMetaData extends MockObject implements ResultSetMetaData {
> +class CommonMockResultSetMetaData extends MockObject implements ResultSetMetaData {
> private final ReturnObjectList myNames =
> new ReturnObjectList("MockResultSetMetaData.columnNames");
> private final ReturnObjectList myTypes =
>
> Index: CommonMockPreparedStatement.java
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockPreparedStatement.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- CommonMockPreparedStatement.java 9 Sep 2002 12:13:53 -0000 1.2
> +++ CommonMockPreparedStatement.java 9 Dec 2002 18:20:12 -0000 1.3
> @@ -75,7 +75,7 @@
> * @author Ted Husted
> * @version $Revision$ $Date$
> */
> -public abstract class CommonMockPreparedStatement
> +abstract class CommonMockPreparedStatement
> extends CommonMockStatement implements PreparedStatement {
>
> // -------------------------------------------------------------------- fields
>
> Index: CommonMockMultiRowResultSet.java
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockMultiRowResultSet.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- CommonMockMultiRowResultSet.java 4 Dec 2002 12:39:23 -0000 1.2
> +++ CommonMockMultiRowResultSet.java 9 Dec 2002 18:20:12 -0000 1.3
> @@ -1,21 +1,13 @@
> package com.mockobjects.sql;
>
> -import java.sql.*;
> -import java.sql.Date;
> -import java.util.*;
> -import java.math.BigDecimal;
> -import java.io.InputStream;
> -import java.io.Reader;
> -
> -import junit.framework.Assert;
> -import junit.framework.AssertionFailedError;
> -import com.mockobjects.*;
> +import java.sql.SQLException;
>
> /**
> * This is a simple implementation of a MockResultSet.
> * It returns values for multiple rows.
> + * @version $Revision$
> */
> -public abstract class CommonMockMultiRowResultSet extends MockResultSet {
> +abstract class CommonMockMultiRowResultSet extends MockResultSet {
> private Object[][] myRows = new Object[0][0];
> private String[] myColumnNames;
> private int myRowOffset = -1;
>
> Index: CommonMockConnection2.java
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockConnection2.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- CommonMockConnection2.java 4 Dec 2002 12:39:23 -0000 1.1
> +++ CommonMockConnection2.java 9 Dec 2002 18:20:13 -0000 1.2
> @@ -84,7 +84,7 @@
> import java.sql.PreparedStatement;
> import java.sql.SQLException;
>
> -public abstract class CommonMockConnection2 extends CommonMockConnection implements Connection {
> +abstract class CommonMockConnection2 extends CommonMockConnection implements Connection {
>
> private final ReturnObjectBag myPreparedStatements;
>
>
> Index: CommonMockConnection.java
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/CommonMockConnection.java,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- CommonMockConnection.java 4 Dec 2002 12:39:23 -0000 1.5
> +++ CommonMockConnection.java 9 Dec 2002 18:20:14 -0000 1.6
> @@ -83,7 +83,7 @@
> import java.sql.*;
> import java.util.Map;
>
> -public abstract class CommonMockConnection extends MockObject implements Connection {
> +abstract class CommonMockConnection extends MockObject implements Connection {
>
> // -------------------------------------------------------------------- fields
>
>
>
>
> -------------------------------------------------------
> This sf.net email is sponsored by:ThinkGeek
> Welcome to geek heaven.
> http://thinkgeek.com/sf
> _______________________________________________
> Mockobjects-java-dev mailing list
> Moc...@li...
> https://lists.sourceforge.net/lists/listinfo/mockobjects-java-dev
--
Jeff Martin <je...@mk...>
mkodo
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X