Revision: 5745
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5745&view=rev
Author: manningr
Date: 2010-07-20 22:44:58 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
Added alternate constructor to CreateDataScriptCommand which allows calling methods to provide an implementation of IAbortController rather than choose the one that creates automatically. This is primarily for running DialectExternalTest in a head-less environment.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/fw/dialects/DialectExternalTest.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/fw/dialects/DialectExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/fw/dialects/DialectExternalTest.java 2010-07-20 22:42:11 UTC (rev 5744)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/fw/dialects/DialectExternalTest.java 2010-07-20 22:44:58 UTC (rev 5745)
@@ -77,11 +77,13 @@
import net.sourceforge.squirrel_sql.plugins.refactoring.gui.IMergeTableDialogFactory;
import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
import net.sourceforge.squirrel_sql.plugins.sqlscript.table_script.CreateDataScriptCommand;
+import net.sourceforge.squirrel_sql.plugins.sqlscript.table_script.IAbortController;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
import utils.EasyMockHelper;
@@ -299,6 +301,8 @@
private static int testsRun = 0;
+ private final IAbortController mockAbortController = Mockito.mock(IAbortController.class);
+
@Before
public void setup() throws Exception
{
@@ -2422,7 +2426,7 @@
final String timestampTypeName = dialect.getTypeName(Types.TIMESTAMP, 5, 5, 5);
- final CreateDataScriptHelper command = new CreateDataScriptHelper(session, null, false);
+ final CreateDataScriptHelper command = new CreateDataScriptHelper(session, mockAbortController, null, false);
dropTable(session, testTimestampTable);
runSQL(session, "create table " + testTimestampTable + " ( mytime " + timestampTypeName + " )");
@@ -2946,9 +2950,9 @@
private class CreateDataScriptHelper extends CreateDataScriptCommand
{
- public CreateDataScriptHelper(ISession session, SQLScriptPlugin plugin, boolean templateScriptOnly)
+ public CreateDataScriptHelper(ISession session, IAbortController abortController, SQLScriptPlugin plugin, boolean templateScriptOnly)
{
- super(session, plugin, templateScriptOnly);
+ super(session, abortController, plugin, templateScriptOnly);
}
public StringBuffer getSQL(String tableName) throws SQLException
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
