[MO-java-dev] CVS: mockobjects-java/src/jdk/common/com/mockobjects/sql MockResultSet.java,1.4,1.5

[Jeff M. <cus...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv18775/src/jdk/common/com/mockobjects/sql

Modified Files:
	MockResultSet.java 
Log Message:
Change getMetaData to use ReturnValue


Index: MockResultSet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/sql/MockResultSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockResultSet.java	9 Dec 2002 18:20:09 -0000	1.4
+++ MockResultSet.java	31 Dec 2002 14:44:26 -0000	1.5
@@ -1,65 +1,8 @@
-/*
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact ap...@ap....
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
 package com.mockobjects.sql;
 
 import com.mockobjects.ExpectationCounter;
 import com.mockobjects.MockObject;
+import com.mockobjects.ReturnValue;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -78,22 +21,21 @@
  * To force throwing a SQLException on a getter,
  * set the corresponding value to be of type SQLException.
  */
-abstract public class MockResultSet extends MockObject implements ResultSet {
+abstract class MockResultSet extends MockObject implements ResultSet {
 
     private final ExpectationCounter myCloseCalls;
     protected final ExpectationCounter myNextCalls;
 
-    private ResultSetMetaData myMetaData;
-
-    private Statement myStatement;
+    private final ReturnValue myMetaData = new ReturnValue("meta data");
+    private final ReturnValue myStatement = new ReturnValue("statement");
 
     public MockResultSet() {
         this(MockResultSet.class.getName());
     }
 
     public MockResultSet(String name) {
-        myCloseCalls =new ExpectationCounter(name+".close");
-        myNextCalls =new ExpectationCounter(name+".next");
+        myCloseCalls = new ExpectationCounter(name + ".close");
+        myNextCalls = new ExpectationCounter(name + ".next");
     }
 
     public void setExpectedCloseCalls(int calls) {
@@ -107,11 +49,11 @@
 // --------------------------------------------------------------------- setup
 
     public void setupMetaData(ResultSetMetaData metaData) {
-        myMetaData = metaData;
+        myMetaData.setValue(metaData);
     }
 
     public void setupStatement(Statement statement) {
-        myStatement = statement;
+        myStatement.setValue(statement);
     }
 
 // ------------------------------------------------------------------ abstract
@@ -277,7 +219,7 @@
     }
 
     public ResultSetMetaData getMetaData() throws SQLException {
-        return myMetaData;
+        return (ResultSetMetaData) myMetaData.getValue();
     }
 
     public Ref getRef(int i) throws SQLException {
@@ -297,7 +239,7 @@
     }
 
     public Statement getStatement() throws SQLException {
-        return myStatement;
+        return (Statement) myStatement.getValue();
     }
 
     public String getString(int columnIndex) throws SQLException {
@@ -484,7 +426,7 @@
     /**
      * Calls notImplemented. Returns false.
      */
-     public boolean last() throws SQLException {
+    public boolean last() throws SQLException {
         notImplemented();
         return false;
     }