|
From: <man...@us...> - 2011-01-02 22:27:55
|
Revision: 6112
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6112&view=rev
Author: manningr
Date: 2011-01-02 22:27:49 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Allow PluginResources implementation to be injected. Modifed test to support new plugin tests.
Modified Paths:
--------------
trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/FirebirdPlugin.java
trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/act/ActivateIndexAction.java
trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/act/DeactivateIndexAction.java
trunk/sql12/plugins/firebird/src/test/java/net/sourceforge/squirrel_sql/plugins/firebird/FirebirdPluginTest.java
trunk/sql12/plugins/firebirdmanager/src/test/java/net/sourceforge/squirrel_sql/plugins/firebirdmanager/FirebirdManagerPluginTest.java
Modified: trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/FirebirdPlugin.java
===================================================================
--- trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/FirebirdPlugin.java 2011-01-02 22:26:54 UTC (rev 6111)
+++ trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/FirebirdPlugin.java 2011-01-02 22:27:49 UTC (rev 6112)
@@ -7,8 +7,9 @@
import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame;
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.PluginResources;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResourcesFactory;
import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
@@ -17,15 +18,16 @@
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import org.firebirdsql.squirrel.act.ActivateIndexAction;
import org.firebirdsql.squirrel.act.DeactivateIndexAction;
+import org.firebirdsql.squirrel.exp.AllIndexesParentExpander;
import org.firebirdsql.squirrel.exp.DatabaseExpander;
import org.firebirdsql.squirrel.exp.FirebirdTableIndexExtractorImpl;
import org.firebirdsql.squirrel.exp.FirebirdTableTriggerExtractorImpl;
-import org.firebirdsql.squirrel.exp.AllIndexesParentExpander;
import org.firebirdsql.squirrel.tab.DomainDetailsTab;
import org.firebirdsql.squirrel.tab.GeneratorDetailsTab;
import org.firebirdsql.squirrel.tab.IndexInfoTab;
@@ -42,9 +44,24 @@
/** API for the Obejct Tree. */
private IObjectTreeAPI _treeAPI;
- /** Plugin resources. */
- private PluginResources _resources;
+ private IResources _resources;
+ private IPluginResourcesFactory _resourcesFactory = new PluginResourcesFactory();
+ /**
+ * @param resourcesFactory the resourcesFactory to set
+ */
+ public void setResourcesFactory(IPluginResourcesFactory resourcesFactory)
+ {
+ _resourcesFactory = resourcesFactory;
+ }
+
+ public interface IMenuResourceKeys
+ {
+// String CHECK_TABLE = "checktable";
+ String FIREBIRD = "firebird";
+ }
+
+
/** Firebird menu. */
private JMenu _firebirdMenu;
@@ -120,7 +137,7 @@
public synchronized void load(IApplication app) throws PluginException
{
super.load(app);
- _resources = new FirebirdResources(getClass().getName(), this);
+ _resources = _resourcesFactory.createResource(getClass().getName(), this);
}
/**
@@ -242,7 +259,7 @@
final IApplication app = getApplication();
final ActionCollection coll = app.getActionCollection();
- final JMenu firebirdMenu = _resources.createMenu(FirebirdResources.IMenuResourceKeys.FIREBIRD);
+ final JMenu firebirdMenu = _resources.createMenu(IMenuResourceKeys.FIREBIRD);
_resources.addToMenu(coll.get(ActivateIndexAction.class), firebirdMenu);
_resources.addToMenu(coll.get(DeactivateIndexAction.class), firebirdMenu);
Modified: trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/act/ActivateIndexAction.java
===================================================================
--- trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/act/ActivateIndexAction.java 2011-01-02 22:26:54 UTC (rev 6111)
+++ trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/act/ActivateIndexAction.java 2011-01-02 22:27:49 UTC (rev 6112)
@@ -1,14 +1,12 @@
package org.firebirdsql.squirrel.act;
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
/**
* This <TT>Action</TT> will run a "EXPLAIN TABLE" over the
* currently selected tables.
@@ -34,7 +32,7 @@
* Thrown if a<TT>null</TT> <TT>IApplication</TT>,
* <TT>Resources</TT> or <TT>IPlugin</TT> passed.
*/
- public ActivateIndexAction(IApplication app, Resources rsrc,
+ public ActivateIndexAction(IApplication app, IResources rsrc,
IPlugin plugin)
{
super(app, rsrc);
Modified: trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/act/DeactivateIndexAction.java
===================================================================
--- trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/act/DeactivateIndexAction.java 2011-01-02 22:26:54 UTC (rev 6111)
+++ trunk/sql12/plugins/firebird/src/main/java/org/firebirdsql/squirrel/act/DeactivateIndexAction.java 2011-01-02 22:27:49 UTC (rev 6112)
@@ -1,14 +1,12 @@
package org.firebirdsql.squirrel.act;
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
/**
* This <TT>Action</TT> will run a "EXPLAIN TABLE" over the
* currently selected tables.
@@ -34,7 +32,7 @@
* Thrown if a<TT>null</TT> <TT>IApplication</TT>,
* <TT>Resources</TT> or <TT>IPlugin</TT> passed.
*/
- public DeactivateIndexAction(IApplication app, Resources rsrc,
+ public DeactivateIndexAction(IApplication app, IResources rsrc,
IPlugin plugin)
{
super(app, rsrc);
Modified: trunk/sql12/plugins/firebird/src/test/java/net/sourceforge/squirrel_sql/plugins/firebird/FirebirdPluginTest.java
===================================================================
--- trunk/sql12/plugins/firebird/src/test/java/net/sourceforge/squirrel_sql/plugins/firebird/FirebirdPluginTest.java 2011-01-02 22:26:54 UTC (rev 6111)
+++ trunk/sql12/plugins/firebird/src/test/java/net/sourceforge/squirrel_sql/plugins/firebird/FirebirdPluginTest.java 2011-01-02 22:27:49 UTC (rev 6112)
@@ -19,27 +19,16 @@
package net.sourceforge.squirrel_sql.plugins.firebird;
import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
import org.firebirdsql.squirrel.FirebirdPlugin;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
-
+@RunWith(MockitoJUnitRunner.class)
public class FirebirdPluginTest extends AbstractSessionPluginTest
{
- @Before
- public void setUp() throws Exception
- {
- super.setUp();
- classUnderTest = new FirebirdPlugin();
- }
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
- }
-
@Override
protected String getDatabaseProductName()
{
@@ -50,6 +39,14 @@
protected String getDatabaseProductVersion()
{
return null;
+ }
+
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
+ {
+ FirebirdPlugin result = new FirebirdPlugin();
+ result.setResourcesFactory(mockIPluginResourcesFactory);
+ return result;
}
}
Modified: trunk/sql12/plugins/firebirdmanager/src/test/java/net/sourceforge/squirrel_sql/plugins/firebirdmanager/FirebirdManagerPluginTest.java
===================================================================
--- trunk/sql12/plugins/firebirdmanager/src/test/java/net/sourceforge/squirrel_sql/plugins/firebirdmanager/FirebirdManagerPluginTest.java 2011-01-02 22:26:54 UTC (rev 6111)
+++ trunk/sql12/plugins/firebirdmanager/src/test/java/net/sourceforge/squirrel_sql/plugins/firebirdmanager/FirebirdManagerPluginTest.java 2011-01-02 22:27:49 UTC (rev 6112)
@@ -20,25 +20,11 @@
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 FirebirdManagerPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
{
- @Before
- public void setUp() throws Exception
- {
- classUnderTest = new FirebirdManagerPlugin();
- }
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
- }
-
@Override
protected String getDatabaseProductName()
{
@@ -49,6 +35,12 @@
protected String getDatabaseProductVersion()
{
return null;
+ }
+
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
+ {
+ return new FirebirdManagerPlugin();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
