[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objectt
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2008-12-07 12:44:35
|
Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27849/test/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs Modified Files: AbstractSourceTabTest.java Log Message: Support for tests. Index: AbstractSourceTabTest.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractSourceTabTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AbstractSourceTabTest.java 30 Nov 2008 22:22:27 -0000 1.3 --- AbstractSourceTabTest.java 7 Dec 2008 12:44:31 -0000 1.4 *************** *** 27,30 **** --- 27,31 ---- import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; + import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData; import org.easymock.EasyMock; *************** *** 44,47 **** --- 45,50 ---- protected ResultSet mockResultSet = mockHelper.createMock(ResultSet.class); + protected ISQLDatabaseMetaData mockMetaData = mockHelper.createMock(ISQLDatabaseMetaData.class); + public AbstractSourceTabTest() { *************** *** 66,76 **** expect(mockSession.getApplication()).andStubReturn(mockApplication); expect(mockSession.getIdentifier()).andStubReturn(mockSessionId); expect(mockApplication.getSessionManager()).andStubReturn(mockSessionManager); expect(mockSessionManager.getSession(mockSessionId)).andStubReturn(mockSession); ! expect(mockDatabaseObjectInfo.getSchemaName()).andStubReturn(TEST_SCHEMA_NAME); ! expect(mockDatabaseObjectInfo.getCatalogName()).andStubReturn(TEST_CATALOG_NAME); ! expect(mockDatabaseObjectInfo.getSimpleName()).andStubReturn(TEST_SIMPLE_NAME); ! expect(mockDatabaseObjectInfo.getQualifiedName()).andStubReturn(TEST_QUALIFIED_NAME); ! expect(mockSession.getSQLConnection()).andStubReturn(mockSQLConnection); expect(mockSQLConnection.prepareStatement(isA(String.class))).andStubReturn(mockPreparedStatement); mockPreparedStatement.setString(EasyMock.anyInt(), isA(String.class)); --- 69,80 ---- expect(mockSession.getApplication()).andStubReturn(mockApplication); expect(mockSession.getIdentifier()).andStubReturn(mockSessionId); + expect(mockSession.getMetaData()).andStubReturn(mockMetaData); + expect(mockSession.getSQLConnection()).andStubReturn(mockSQLConnection); + + setupMockDatabaseObjectInfo(); + expect(mockApplication.getSessionManager()).andStubReturn(mockSessionManager); expect(mockSessionManager.getSession(mockSessionId)).andStubReturn(mockSession); ! expect(mockSQLConnection.prepareStatement(isA(String.class))).andStubReturn(mockPreparedStatement); mockPreparedStatement.setString(EasyMock.anyInt(), isA(String.class)); *************** *** 89,91 **** --- 93,101 ---- } + protected void setupMockDatabaseObjectInfo() { + expect(mockDatabaseObjectInfo.getSchemaName()).andStubReturn(TEST_SCHEMA_NAME); + expect(mockDatabaseObjectInfo.getCatalogName()).andStubReturn(TEST_CATALOG_NAME); + expect(mockDatabaseObjectInfo.getSimpleName()).andStubReturn(TEST_SIMPLE_NAME); + expect(mockDatabaseObjectInfo.getQualifiedName()).andStubReturn(TEST_QUALIFIED_NAME); + } } \ No newline at end of file |