Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6064/test/src/net/sourceforge/squirrel_sql/client
Modified Files:
AppTestUtil.java
Log Message:
Return mock alias color properties bean from SQLAlias.
Index: AppTestUtil.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/AppTestUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AppTestUtil.java 25 Jul 2009 00:52:32 -0000 1.3
--- AppTestUtil.java 16 Dec 2009 02:07:33 -0000 1.4
***************
*** 38,41 ****
--- 38,42 ----
import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
+ import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasColorProperties;
import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel;
***************
*** 136,140 ****
expect(session.getSQLPanelAPIOfActiveSessionWindow()).andReturn(api).anyTimes();
// expect(session.getMessageHandler()).andReturn(messageHandler).anyTimes();
! expect(session.getAlias()).andReturn(AppTestUtil.getEasyMockSqlAliasExt());
expect(session.getIdentifier()).andReturn(FwTestUtil.getEasyMockIdentifier()).anyTimes();
expect(session.getSQLConnection()).andReturn(con).anyTimes();
--- 137,141 ----
expect(session.getSQLPanelAPIOfActiveSessionWindow()).andReturn(api).anyTimes();
// expect(session.getMessageHandler()).andReturn(messageHandler).anyTimes();
! expect(session.getAlias()).andStubReturn(AppTestUtil.getEasyMockSqlAliasExt());
expect(session.getIdentifier()).andReturn(FwTestUtil.getEasyMockIdentifier()).anyTimes();
expect(session.getSQLConnection()).andReturn(con).anyTimes();
***************
*** 279,285 ****
--- 280,288 ----
public static ISQLAliasExt getEasyMockSqlAliasExt() {
ISQLAliasExt result = createMock(ISQLAliasExt.class);
+ SQLAliasColorProperties props = createMock(SQLAliasColorProperties.class);
expect(result.getName()).andReturn("TestAlias").anyTimes();
IIdentifier id = FwTestUtil.getEasyMockIdentifier();
expect(result.getDriverIdentifier()).andReturn(id).anyTimes();
+ expect(result.getColorProperties()).andStubReturn(props);
replay(result);
return result;
|