[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6107] trunk/sql12/plugins

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

Revision: 6107
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6107&view=rev
Author:   manningr
Date:     2011-01-02 22:23:33 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
Modifed tests to support new plugin tests.

Modified Paths:
--------------
    trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPluginTest.java
    trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPlugin.java
    trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataAction.java
    trunk/sql12/plugins/dataimport/src/test/java/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPluginTest.java
    trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/DB2PluginTest.java

Modified: trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPluginTest.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPluginTest.java	2011-01-02 22:22:24 UTC (rev 6106)
+++ trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPluginTest.java	2011-01-02 22:23:33 UTC (rev 6107)
@@ -18,25 +18,18 @@
  */
 package net.sourceforge.squirrel_sql.plugins.codecompletion;
 
-import net.sourceforge.squirrel_sql.client.plugin.AbstractPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
 import net.sourceforge.squirrel_sql.client.plugin.DatabaseProductVersionData;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
 
-import org.junit.After;
-import org.junit.Before;
 
+public class CodeCompletionPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
+{
 
-public class CodeCompletionPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
-{	
-	@Before
-	public void setUp() throws Exception
+	@Override
+	protected IPlugin getPluginToTest() throws Exception
 	{
-		classUnderTest = new CodeCompletionPlugin();
-	}
+		return new CodeCompletionPlugin();
+	}	
 
-	@After
-	public void tearDown() throws Exception
-	{
-		classUnderTest = null;
-	}		
-
 }

Modified: trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPlugin.java
===================================================================
--- trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPlugin.java	2011-01-02 22:22:24 UTC (rev 6106)
+++ trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPlugin.java	2011-01-02 22:23:33 UTC (rev 6107)
@@ -20,13 +20,16 @@
 import net.sourceforge.squirrel_sql.client.IApplication;
 import net.sourceforge.squirrel_sql.client.action.ActionCollection;
 import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin;
+import net.sourceforge.squirrel_sql.client.plugin.IPluginResourcesFactory;
 import net.sourceforge.squirrel_sql.client.plugin.PluginException;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResourcesFactory;
 import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
 import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallbackAdaptor;
 import net.sourceforge.squirrel_sql.client.preferences.IGlobalPreferencesPanel;
 import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
 import net.sourceforge.squirrel_sql.client.session.ISession;
 import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
 import net.sourceforge.squirrel_sql.plugins.dataimport.action.ImportTableDataAction;
 import net.sourceforge.squirrel_sql.plugins.dataimport.prefs.PreferencesManager;
 
@@ -36,9 +39,20 @@
  * @author Thorsten Mürell
  */
 public class DataImportPlugin extends DefaultSessionPlugin {
-	private Resources resources = null;
+	
+	private IResources _resources;
 
+	private IPluginResourcesFactory _resourcesFactory = new PluginResourcesFactory();
 	/**
+	 * @param resourcesFactory the resourcesFactory to set
+	 */
+	public void setResourcesFactory(IPluginResourcesFactory resourcesFactory)
+	{
+		_resourcesFactory = resourcesFactory;
+	}
+
+
+	/**
 	 * Return the internal name of this plugin.
 	 *
 	 * @return  the internal name of this plugin.
@@ -113,7 +127,7 @@
 	@Override
 	public void load(IApplication app) throws PluginException {
 		super.load(app);
-		resources = new Resources(getClass().getName(), this);
+		_resources = this._resourcesFactory.createResource(getClass().getName(), this);
 	}
 
 	/**
@@ -128,7 +142,7 @@
 		IApplication app = getApplication();
 		ActionCollection coll = app.getActionCollection();
 
-		coll.add(new ImportTableDataAction(app, resources));
+		coll.add(new ImportTableDataAction(app, _resources));
 	}
 
 	/**
@@ -173,6 +187,7 @@
 		// Not yet ready
         // DataImportGlobalPreferencesTab tab = new DataImportGlobalPreferencesTab();
         // return new IGlobalPreferencesPanel[] { tab };
-        return new IGlobalPreferencesPanel[] { };
+        return null;
+		
 	}
 }
\ No newline at end of file

Modified: trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataAction.java
===================================================================
--- trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataAction.java	2011-01-02 22:22:24 UTC (rev 6106)
+++ trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataAction.java	2011-01-02 22:23:33 UTC (rev 6107)
@@ -25,7 +25,7 @@
 import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
 import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
 import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
 
 /**
  * An action to import table data from a file.
@@ -42,7 +42,7 @@
 	 * @param app The application
 	 * @param resources The resources to work with
 	 */
-	public ImportTableDataAction(IApplication app, Resources resources) {
+	public ImportTableDataAction(IApplication app, IResources resources) {
 		super(app, resources);
 	}
 

Modified: trunk/sql12/plugins/dataimport/src/test/java/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPluginTest.java
===================================================================
--- trunk/sql12/plugins/dataimport/src/test/java/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPluginTest.java	2011-01-02 22:22:24 UTC (rev 6106)
+++ trunk/sql12/plugins/dataimport/src/test/java/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPluginTest.java	2011-01-02 22:23:33 UTC (rev 6107)
@@ -18,25 +18,20 @@
  */
 package net.sourceforge.squirrel_sql.plugins.dataimport;
 
-import net.sourceforge.squirrel_sql.client.plugin.AbstractPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
 import net.sourceforge.squirrel_sql.client.plugin.DatabaseProductVersionData;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
 
-import org.junit.After;
-import org.junit.Before;
 
+public class DataImportPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
+{
 
-public class DataImportPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
-{	
-	@Before
-	public void setUp() throws Exception
+	@Override
+	protected IPlugin getPluginToTest() throws Exception
 	{
-		classUnderTest = new DataImportPlugin();
-	}
+		DataImportPlugin result = new DataImportPlugin();
+		result.setResourcesFactory(mockIPluginResourcesFactory);
+		return result;
+	}	
 
-	@After
-	public void tearDown() throws Exception
-	{
-		classUnderTest = null;
-	}		
-
 }

Modified: trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/DB2PluginTest.java
===================================================================
--- trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/DB2PluginTest.java	2011-01-02 22:22:24 UTC (rev 6106)
+++ trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/DB2PluginTest.java	2011-01-02 22:23:33 UTC (rev 6107)
@@ -20,24 +20,15 @@
 
 import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
 import net.sourceforge.squirrel_sql.client.plugin.DatabaseProductVersionData;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
 
-import org.junit.After;
-import org.junit.Before;
-
-
 public class DB2PluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
-{	
-	@Before
-	public void setUp() throws Exception
-	{
-		super.setUp();
-		classUnderTest = new DB2Plugin();
-	}
+{
 
-	@After
-	public void tearDown() throws Exception
+	@Override
+	protected IPlugin getPluginToTest() throws Exception
 	{
-		classUnderTest = null;
+		return new DB2Plugin();
 	}
 
 	@Override
@@ -50,6 +41,6 @@
 	protected String getDatabaseProductVersion()
 	{
 		return null;
-	}		
+	}
 
 }


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