Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Commit [4c67b6] Maximize Restore History

Relocated uitests profile to root so that it can be used by the plugin projects as well. Moved the surefire-plugin configuration out of the plugin parent pom so that the common configuration in the root can be inherited. Relocated the derby plugin preferences UI test to the derby project.

Robert Manning Robert Manning 2011-03-19

1 2 > >> (Page 1 of 2)
added app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/gui
removed test/jfctests/net/sourceforge/squirrel_sql/plugins/derby
removed test/jfctests/net/sourceforge/squirrel_sql/plugins/derby/prefs
changed app
changed app/pom.xml
changed app/src
changed app/src/test
changed app/src/test/java
changed app/src/test/java/net
changed app/src/test/java/net/sourceforge
changed app/src/test/java/net/sourceforge/squirrel_sql
changed app/src/test/java/net/sourceforge/squirrel_sql/client
changed app/src/test/java/net/sourceforge/squirrel_sql/client/plugin
changed plugins
changed plugins/derby
changed plugins/derby/pom.xml
changed plugins/derby/src
changed plugins/derby/src/test
changed plugins/derby/src/test/java
changed plugins/derby/src/test/java/net
changed plugins/derby/src/test/java/net/sourceforge
changed plugins/derby/src/test/java/net/sourceforge/squirrel_sql
changed plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins
changed plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby
changed plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/prefs
changed plugins/squirrelsql-plugins-parent-pom
changed plugins/squirrelsql-plugins-parent-pom/pom.xml
changed pom.xml
changed test
changed test/jfctests
changed test/jfctests/net
changed test/jfctests/net/sourceforge
changed test/jfctests/net/sourceforge/squirrel_sql
changed test/jfctests/net/sourceforge/squirrel_sql/client
changed test/jfctests/net/sourceforge/squirrel_sql/client/plugin
changed test/jfctests/net/sourceforge/squirrel_sql/client/plugin/gui
changed test/jfctests/net/sourceforge/squirrel_sql/plugins
copied test/jfctests/net/sourceforge/squirrel_sql/plugins/derby/prefs/DerbyPluginPreferencesPanelUITest.java -> plugins/derby/src/test/java/net/sourceforge/squirrel_sql/plugins/derby/prefs/DerbyPluginPreferencesPanelUITest.java
copied test/jfctests/net/sourceforge/squirrel_sql/client/plugin/gui/AbstractPluginPreferencesUITest.java -> app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/gui/AbstractPluginPreferencesUITest.java
app
Directory.
app/pom.xml Diff Switch to side-by-side view
Loading...
app/src
Directory.
app/src/test
Directory.
app/src/test/java
Directory.
plugins
Directory.
plugins/derby
Directory.
plugins/derby/pom.xml Diff Switch to side-by-side view
Loading...
plugins/derby/src
Directory.
plugins/squirrelsql-plugins-parent-pom/pom.xml Diff Switch to side-by-side view
Loading...
pom.xml Diff Switch to side-by-side view
Loading...
test
Directory.
test/jfctests
Directory.
test/jfctests/net
Directory.
test/jfctests/net/sourceforge/squirrel_sql/client/plugin/gui/AbstractPluginPreferencesUITest.java to app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/gui/AbstractPluginPreferencesUITest.java
--- a/test/jfctests/net/sourceforge/squirrel_sql/client/plugin/gui/AbstractPluginPreferencesUITest.java
+++ b/app/src/test/java/net/sourceforge/squirrel_sql/client/plugin/gui/AbstractPluginPreferencesUITest.java
@@ -29,6 +29,7 @@
 import javax.swing.JScrollPane;
 
 import net.sourceforge.squirrel_sql.BaseSQuirreLJUnit4TestCase;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
 import net.sourceforge.squirrel_sql.client.plugin.PluginException;
 import net.sourceforge.squirrel_sql.client.plugin.PluginQueryTokenizerPreferencesManager;
 import net.sourceforge.squirrel_sql.fw.preferences.IQueryTokenizerPreferenceBean;
@@ -40,6 +41,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 /**
  * Test base class for UI tests on database-specific plugin preferences panels. 
@@ -54,6 +56,8 @@
 	protected PluginQueryTokenizerPreferencesManager prefsManager =
 		new PluginQueryTokenizerPreferencesManager();
 	protected JCheckBoxFixture useCustomQTCheckBox = null;
+	
+	protected IPlugin mockPlugin = Mockito.mock(IPlugin.class); 
 
 	@Before
    public void setUp() throws Exception
@@ -103,7 +107,7 @@
    	f.getContentPane().setLayout(new BorderLayout());
    	File prefsFile = new File("prefs.xml");
    	prefsFile.delete();
-   	prefsManager.initialize(new DummyPlugin(), getPreferenceBean());
+   	prefsManager.initialize(mockPlugin, getPreferenceBean());
    	classUnderTest = getPrefsPanelToTest();
    	JScrollPane sp = new JScrollPane(classUnderTest);
    	f.getContentPane().add(sp, BorderLayout.CENTER);
1 2 > >> (Page 1 of 2)