[Springframework-cvs] spring/test/org/springframework/jdbc/support NativeJdbcExtractorTests.java,1.4,1.4.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/jdbc/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/jdbc/support

Modified Files:
      Tag: mbranch-1-2
	NativeJdbcExtractorTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: NativeJdbcExtractorTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/jdbc/support/NativeJdbcExtractorTests.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** NativeJdbcExtractorTests.java	25 Mar 2005 09:28:27 -0000	1.4
--- NativeJdbcExtractorTests.java	21 Apr 2006 00:13:51 -0000	1.4.4.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 33,36 ****
--- 33,37 ----
  /**
   * @author Andre Biryukov
+  * @author Juergen Hoeller
   */
  public class NativeJdbcExtractorTests extends TestCase {
***************
*** 107,112 ****
  		MockControl stmtControl = MockControl.createControl(Statement.class);
  		Statement stmt = (Statement) stmtControl.getMock();
  		stmt.getConnection();
! 		stmtControl.setReturnValue(con);
  		conControl.replay();
  		stmtControl.replay();
--- 108,115 ----
  		MockControl stmtControl = MockControl.createControl(Statement.class);
  		Statement stmt = (Statement) stmtControl.getMock();
+ 		con.getMetaData();
+ 		conControl.setReturnValue(null, 2);
  		stmt.getConnection();
! 		stmtControl.setReturnValue(con, 1);
  		conControl.replay();
  		stmtControl.replay();