[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6017] trunk/sql12/plugins/oracle/src/test/java/ net/sourceforge/squirrel_sql/plugins/oracle/expander

[<man...@us...>]

Revision: 6017
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6017&view=rev
Author:   manningr
Date:     2010-12-17 23:15:57 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
Added stub expectation for getDatabaseObjectType.

Modified Paths:
--------------
    trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableParentExpanderTest.java
    trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpanderTest.java

Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableParentExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableParentExpanderTest.java	2010-12-17 22:34:41 UTC (rev 6016)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableParentExpanderTest.java	2010-12-17 23:15:57 UTC (rev 6017)
@@ -25,6 +25,7 @@
 import static org.easymock.EasyMock.isA;
 import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.AbstractINodeExpanderTest;
 import net.sourceforge.squirrel_sql.client.session.schemainfo.ObjFilterMatcher;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
 import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
 import net.sourceforge.squirrel_sql.plugins.oracle.prefs.OraclePreferenceBean;
 
@@ -36,12 +37,14 @@
 	@Before
 	public void setUp() throws Exception
 	{
-		OraclePreferenceBean prefs = mockHelper.createMock(OraclePreferenceBean.class);
-		classUnderTest = new OracleTableParentExpander(prefs);
+		OraclePreferenceBean mockOraclePreferenceBean =
+			mockHelper.createMock("mockOraclePreferenceBean", OraclePreferenceBean.class);
+		classUnderTest = new OracleTableParentExpander(mockOraclePreferenceBean);
 
-		expect(prefs.isExcludeRecycleBinTables()).andStubReturn(true);
-		ITableInfo mockTableInfo = mockHelper.createMock(ITableInfo.class);
+		expect(mockOraclePreferenceBean.isExcludeRecycleBinTables()).andStubReturn(true);
+		ITableInfo mockTableInfo = mockHelper.createMock("mockTableInfo", ITableInfo.class);
 		expect(mockTableInfo.getSimpleName()).andReturn(TEST_SIMPLE_NAME);
+		expect(mockTableInfo.getDatabaseObjectType()).andStubReturn(DatabaseObjectType.TABLE);
 		String[] tableTypes = new String[] { TEST_SIMPLE_NAME };
 		ITableInfo[] tables = new ITableInfo[] { mockTableInfo };
 		expect(

Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpanderTest.java	2010-12-17 22:34:41 UTC (rev 6016)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpanderTest.java	2010-12-17 23:15:57 UTC (rev 6017)
@@ -27,6 +27,7 @@
 
 import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.AbstractINodeExpanderTest;
 import net.sourceforge.squirrel_sql.client.session.schemainfo.ObjFilterMatcher;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
 import net.sourceforge.squirrel_sql.fw.sql.IProcedureInfo;
 
 import org.junit.Before;
@@ -38,8 +39,9 @@
 	public void setUp() throws Exception
 	{
 
-		IProcedureInfo mockProcedureInfo = mockHelper.createMock(IProcedureInfo.class);
+		IProcedureInfo mockProcedureInfo = mockHelper.createMock("mockProcedureInfo", IProcedureInfo.class);
 		expect(mockProcedureInfo.getProcedureType()).andStubReturn(DatabaseMetaData.procedureNoResult);
+		expect(mockProcedureInfo.getDatabaseObjectType()).andStubReturn(DatabaseObjectType.PROCEDURE);
 		IProcedureInfo[] procedures = new IProcedureInfo[] { mockProcedureInfo };
 		expect(
 			mockSchemaInfo.getStoredProceduresInfos((String)isNull(), eq(TEST_SCHEMA_NAME), isA(ObjFilterMatcher.class)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.