|
From: <man...@us...> - 2011-01-02 22:29:40
|
Revision: 6117
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6117&view=rev
Author: manningr
Date: 2011-01-02 22:29:34 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Modifed test to support new plugin tests.
Modified Paths:
--------------
trunk/sql12/plugins/i18n/src/test/java/net/sourceforge/squirrel_sql/plugins/i18n/I18nPluginTest.java
trunk/sql12/plugins/informix/src/test/java/net/sourceforge/squirrel_sql/plugins/informix/InformixPluginTest.java
trunk/sql12/plugins/laf/src/test/java/net/sourceforge/squirrel_sql/plugins/laf/LAFPluginTest.java
trunk/sql12/plugins/macosx/src/test/java/net/sourceforge/squirrel_sql/plugins/macosx/MacOSPluginTest.java
Modified: trunk/sql12/plugins/i18n/src/test/java/net/sourceforge/squirrel_sql/plugins/i18n/I18nPluginTest.java
===================================================================
--- trunk/sql12/plugins/i18n/src/test/java/net/sourceforge/squirrel_sql/plugins/i18n/I18nPluginTest.java 2011-01-02 22:29:00 UTC (rev 6116)
+++ trunk/sql12/plugins/i18n/src/test/java/net/sourceforge/squirrel_sql/plugins/i18n/I18nPluginTest.java 2011-01-02 22:29:34 UTC (rev 6117)
@@ -18,25 +18,18 @@
*/
package net.sourceforge.squirrel_sql.plugins.i18n;
-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 I18nPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
+{
-public class I18nPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
-{
- @Before
- public void setUp() throws Exception
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = new I18nPlugin();
- }
+ return new I18nPlugin();
+ }
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
- }
-
}
Modified: trunk/sql12/plugins/informix/src/test/java/net/sourceforge/squirrel_sql/plugins/informix/InformixPluginTest.java
===================================================================
--- trunk/sql12/plugins/informix/src/test/java/net/sourceforge/squirrel_sql/plugins/informix/InformixPluginTest.java 2011-01-02 22:29:00 UTC (rev 6116)
+++ trunk/sql12/plugins/informix/src/test/java/net/sourceforge/squirrel_sql/plugins/informix/InformixPluginTest.java 2011-01-02 22:29:34 UTC (rev 6117)
@@ -19,26 +19,11 @@
package net.sourceforge.squirrel_sql.plugins.informix;
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 InformixPluginTest extends AbstractSessionPluginTest
{
- @Before
- public void setUp() throws Exception
- {
- super.setUp();
- classUnderTest = new InformixPlugin();
- }
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
- }
-
@Override
protected String getDatabaseProductName()
{
@@ -49,6 +34,12 @@
protected String getDatabaseProductVersion()
{
return null;
+ }
+
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
+ {
+ return new InformixPlugin();
}
}
Modified: trunk/sql12/plugins/laf/src/test/java/net/sourceforge/squirrel_sql/plugins/laf/LAFPluginTest.java
===================================================================
--- trunk/sql12/plugins/laf/src/test/java/net/sourceforge/squirrel_sql/plugins/laf/LAFPluginTest.java 2011-01-02 22:29:00 UTC (rev 6116)
+++ trunk/sql12/plugins/laf/src/test/java/net/sourceforge/squirrel_sql/plugins/laf/LAFPluginTest.java 2011-01-02 22:29:34 UTC (rev 6117)
@@ -20,23 +20,15 @@
import net.sourceforge.squirrel_sql.client.plugin.AbstractPluginTest;
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 LAFPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
{
- @Before
- public void setUp() throws Exception
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = new LAFPlugin();
- }
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
+ return new LAFPlugin();
}
}
Modified: trunk/sql12/plugins/macosx/src/test/java/net/sourceforge/squirrel_sql/plugins/macosx/MacOSPluginTest.java
===================================================================
--- trunk/sql12/plugins/macosx/src/test/java/net/sourceforge/squirrel_sql/plugins/macosx/MacOSPluginTest.java 2011-01-02 22:29:00 UTC (rev 6116)
+++ trunk/sql12/plugins/macosx/src/test/java/net/sourceforge/squirrel_sql/plugins/macosx/MacOSPluginTest.java 2011-01-02 22:29:34 UTC (rev 6117)
@@ -20,23 +20,16 @@
import net.sourceforge.squirrel_sql.client.plugin.AbstractPluginTest;
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 MacOSPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
-{
- @Before
- public void setUp() throws Exception
- {
- classUnderTest = new MacOSPlugin();
- }
+{
- @After
- public void tearDown() throws Exception
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = null;
- }
+ return new MacOSPlugin();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
