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

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

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

Log Message:
-----------
Modified test to support new plugin tests.

Modified Paths:
--------------
    trunk/sql12/plugins/sqlparam/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamPluginTest.java
    trunk/sql12/plugins/sqlreplace/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlreplace/SQLReplacePluginTest.java

Modified: trunk/sql12/plugins/sqlparam/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamPluginTest.java
===================================================================
--- trunk/sql12/plugins/sqlparam/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamPluginTest.java	2011-01-02 22:33:59 UTC (rev 6125)
+++ trunk/sql12/plugins/sqlparam/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamPluginTest.java	2011-01-02 22:34:35 UTC (rev 6126)
@@ -20,28 +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 net.sourceforge.squirrel_sql.client.plugin.ISessionPlugin;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 
 public class SQLParamPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
 {	
-	@Before
-	public void setUp() throws Exception
-	{
-		super.setUp();
-		classUnderTest = new SQLParamPlugin();
-	}
 
-	@After
-	public void tearDown() throws Exception
-	{
-		classUnderTest = null;
-	}		
-
 	// Bug 2746982: Error occured in IPlugin.sessionEnded() for SQL Parametrisat
 	// My theory here is that the session ending method was called twice (possibly user clicked the close 
 	// session tab 'X' and close application window 'X' in rapid succession.  In any case, the plugin 
@@ -79,5 +66,11 @@
 		// plugin needs to be notified when they are started.
 		return null;
 	}
+
+	@Override
+	protected IPlugin getPluginToTest() throws Exception
+	{
+		return new SQLParamPlugin();
+	}
 	
 }

Modified: trunk/sql12/plugins/sqlreplace/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlreplace/SQLReplacePluginTest.java
===================================================================
--- trunk/sql12/plugins/sqlreplace/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlreplace/SQLReplacePluginTest.java	2011-01-02 22:33:59 UTC (rev 6125)
+++ trunk/sql12/plugins/sqlreplace/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlreplace/SQLReplacePluginTest.java	2011-01-02 22:34:35 UTC (rev 6126)
@@ -18,25 +18,30 @@
  */
 package net.sourceforge.squirrel_sql.plugins.sqlreplace;
 
-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 SQLReplacePluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
+{
 
-public class SQLReplacePluginTest extends AbstractPluginTest implements DatabaseProductVersionData
-{	
-	@Before
-	public void setUp() throws Exception
+	@Override
+	protected IPlugin getPluginToTest() throws Exception
 	{
-		classUnderTest = new SQLReplacePlugin();
+		return new SQLReplacePlugin();
 	}
 
-	@After
-	public void tearDown() throws Exception
+	@Override
+	protected String getDatabaseProductName()
 	{
-		classUnderTest = null;
-	}		
+		return "Any Database";
+	}
 
+	@Override
+	protected String getDatabaseProductVersion()
+	{
+		return "Any Database Version";
+	}	
+
 }


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