Thread: [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...> - 2007-09-24 09:33:45
|
Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15996/test/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree Modified Files: ObjectTreeTest.java Log Message: Replaced the use of MockSession with EasyMock. Index: ObjectTreeTest.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ObjectTreeTest.java 31 Jul 2007 01:06:20 -0000 1.9 --- ObjectTreeTest.java 24 Sep 2007 09:33:41 -0000 1.10 *************** *** 24,37 **** import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase; import net.sourceforge.squirrel_sql.client.ApplicationManager; ! import net.sourceforge.squirrel_sql.client.session.MockSession; ! import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; ! import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; public class ObjectTreeTest extends BaseSQuirreLTestCase { ObjectTree tree = null; ! MockSession session = null; public static void main(String[] args) { --- 24,36 ---- import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase; import net.sourceforge.squirrel_sql.client.ApplicationManager; ! import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; ! import net.sourceforge.squirrel_sql.test.TestUtil; public class ObjectTreeTest extends BaseSQuirreLTestCase { ObjectTree tree = null; ! ISession session = null; public static void main(String[] args) { *************** *** 43,47 **** super.setUp(); ApplicationManager.initApplication(); ! session = new MockSession(); tree = new ObjectTree(session); } --- 42,47 ---- super.setUp(); ApplicationManager.initApplication(); ! //session = new MockSession(); ! session = TestUtil.getEasyMockSession("Oracle"); tree = new ObjectTree(session); } *************** *** 60,85 **** String tableKey = "table(100)"; map.put(tableKey, null); ! SQLDatabaseMetaData md = session.getSQLConnection().getSQLMetaData(); ! IDatabaseObjectInfo dbInfo = ! new DatabaseObjectInfo("catalog", ! "schema", ! "table", ! DatabaseObjectType.TABLE, ! md); ObjectTreeNode node = new ObjectTreeNode(session, dbInfo); - session.getProperties().setShowRowCount(true); - // Test to see that table(100) matches table(0). It should since only // the row count is different. assertEquals(true, tree.matchKeyPrefix(map, node, "table(0)")); - - session.getProperties().setShowRowCount(false); - - // Test to see that table(100) matches table(0). It should since only - // the row count is different. - assertEquals(true, tree.matchKeyPrefix(map, node, "table(0)")); - - session.getProperties().setShowRowCount(true); // Test to see if we can fool matchKeyPrefix into assuming that there --- 60,75 ---- String tableKey = "table(100)"; map.put(tableKey, null); ! ! IDatabaseObjectInfo dbInfo = ! TestUtil.getEasyMockDatabaseObjectInfo("catalog", ! "schema", ! "table", ! "schema.table", ! DatabaseObjectType.TABLE); ObjectTreeNode node = new ObjectTreeNode(session, dbInfo); // Test to see that table(100) matches table(0). It should since only // the row count is different. assertEquals(true, tree.matchKeyPrefix(map, node, "table(0)")); // Test to see if we can fool matchKeyPrefix into assuming that there *************** *** 88,97 **** assertEquals(true, tree.matchKeyPrefix(map, node, "table")); - session.getProperties().setShowRowCount(false); - - // Test to see if we can fool matchKeyPrefix into assuming that there - // will be '(' on the end of the path since row count is enabled. Yet - // we'll send in a string that doesn't have this characteristic. - assertEquals(true, tree.matchKeyPrefix(map, node, "table")); } --- 78,81 ---- |