|
From: <man...@us...> - 2011-01-02 22:24:24
|
Revision: 6108
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6108&view=rev
Author: manningr
Date: 2011-01-02 22:24:18 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Modifed tests to support new plugin tests.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPluginTest.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPlugin.java
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginTest.java
trunk/sql12/plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/DerbyPluginTest.java
trunk/sql12/plugins/editextras/src/test/java/net/sourceforge/squirrel_sql/plugins/editextras/EditExtrasPluginTest.java
trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePluginTest.java
Modified: trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPluginTest.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPluginTest.java 2011-01-02 22:23:33 UTC (rev 6107)
+++ trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPluginTest.java 2011-01-02 22:24:18 UTC (rev 6108)
@@ -19,22 +19,19 @@
package net.sourceforge.squirrel_sql.plugins.dbcopy;
-import net.sourceforge.squirrel_sql.client.plugin.AbstractPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
-public class DBCopyPluginTest extends AbstractPluginTest
+@RunWith(MockitoJUnitRunner.class)
+public class DBCopyPluginTest extends AbstractSessionPluginTest
{
- @Before
- public void setUp() throws Exception
+
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = new DBCopyPlugin();
+ return new DBCopyPlugin();
}
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
- }
}
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPlugin.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPlugin.java 2011-01-02 22:23:33 UTC (rev 6107)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPlugin.java 2011-01-02 22:24:18 UTC (rev 6108)
@@ -29,7 +29,6 @@
import net.sourceforge.squirrel_sql.client.plugin.PluginException;
import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
-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;
@@ -189,20 +188,6 @@
}
/**
- * Create panel for the Global Properties dialog.
- *
- * @return properties panel.
- */
- public IGlobalPreferencesPanel[] getGlobalPreferencePanels()
- {
- /*
- DBCopyGlobalPreferencesTab tab = new DBCopyGlobalPreferencesTab();
- return new IGlobalPreferencesPanel[] { tab };
- */
- return new IGlobalPreferencesPanel[0];
- }
-
- /**
* @param coll
* @param api
*/
Modified: trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginTest.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginTest.java 2011-01-02 22:23:33 UTC (rev 6107)
+++ trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginTest.java 2011-01-02 22:24:18 UTC (rev 6108)
@@ -18,25 +18,20 @@
*/
package net.sourceforge.squirrel_sql.plugins.dbdiff;
-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;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
-
-public class DBDiffPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
+@RunWith(MockitoJUnitRunner.class)
+public class DBDiffPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
{
- @Before
- public void setUp() throws Exception
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = new DBDiffPlugin();
- }
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
+ return new DBDiffPlugin();
}
}
Modified: trunk/sql12/plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/DerbyPluginTest.java
===================================================================
--- trunk/sql12/plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/DerbyPluginTest.java 2011-01-02 22:23:33 UTC (rev 6107)
+++ trunk/sql12/plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/DerbyPluginTest.java 2011-01-02 22:24:18 UTC (rev 6108)
@@ -20,25 +20,10 @@
import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
-import org.junit.After;
-import org.junit.Before;
-
public class DerbyPluginTest extends AbstractSessionPluginTest
{
- @Before
- public void setUp() throws Exception
- {
- super.setUp();
- classUnderTest = new DerbyPlugin();
- }
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
- }
-
@Override
protected String getDatabaseProductName()
{
@@ -50,4 +35,10 @@
{
return null;
}
+
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
+ {
+ return new DerbyPlugin();
+ }
}
Modified: trunk/sql12/plugins/editextras/src/test/java/net/sourceforge/squirrel_sql/plugins/editextras/EditExtrasPluginTest.java
===================================================================
--- trunk/sql12/plugins/editextras/src/test/java/net/sourceforge/squirrel_sql/plugins/editextras/EditExtrasPluginTest.java 2011-01-02 22:23:33 UTC (rev 6107)
+++ trunk/sql12/plugins/editextras/src/test/java/net/sourceforge/squirrel_sql/plugins/editextras/EditExtrasPluginTest.java 2011-01-02 22:24:18 UTC (rev 6108)
@@ -18,25 +18,20 @@
*/
package net.sourceforge.squirrel_sql.plugins.editextras;
-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;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
-
-public class EditExtrasPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
+@RunWith(MockitoJUnitRunner.class)
+public class EditExtrasPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
{
- @Before
- public void setUp() throws Exception
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = new EditExtrasPlugin();
- }
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
+ return new EditExtrasPlugin();
}
}
Modified: trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePluginTest.java
===================================================================
--- trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePluginTest.java 2011-01-02 22:23:33 UTC (rev 6107)
+++ trunk/sql12/plugins/example/src/test/java/net/sourceforge/squirrel_sql/plugins/example/ExamplePluginTest.java 2011-01-02 22:24:18 UTC (rev 6108)
@@ -4,8 +4,8 @@
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
-import org.junit.Before;
import org.junit.Test;
/*
@@ -34,6 +34,11 @@
*/
public class ExamplePluginTest extends AbstractSessionPluginTest
{
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
+ {
+ return new ExamplePlugin();
+ }
/**
* getDatabaseProductName returns "DB2" because that is the product name for sessions that the example
@@ -61,13 +66,6 @@
return null;
}
- @Before
- public void setUp() throws Exception
- {
- super.setUp();
- classUnderTest = new ExamplePlugin();
- }
-
@Test
public void testSessionStarted() throws Exception
{
@@ -90,9 +88,10 @@
// This is expected.
}
}
-
+
@Test
- public void testGetGlobalPreferencePanels() {
+ public void testGetGlobalPreferencePanels()
+ {
assertNotNull(classUnderTest.getGlobalPreferencePanels());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
