Author: dlanglais Date: 2010-03-06 13:47:28 +0100 (Sat, 06 Mar 2010) New Revision: 192 Log: Suppression de la classe de test TestServiceLoader. Cr?\195?\169ation d'une classe de test pour PluginLoader (quasi vide pour le moment). Added: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java Removed: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Modified: trunk/msm/pom.xml trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Modified: trunk/msm/pom.xml =================================================================== --- trunk/msm/pom.xml 2010-03-06 05:34:16 UTC (rev 191) +++ trunk/msm/pom.xml 2010-03-06 12:47:28 UTC (rev 192) @@ -126,7 +126,7 @@ <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> <properties> - <maven.test.skip>true</maven.test.skip> + <maven.test.skip>false</maven.test.skip> <!--MSM Main Class in JAR --> <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-06 05:34:16 UTC (rev 191) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-06 12:47:28 UTC (rev 192) @@ -151,8 +151,6 @@ pluginsWanted.add(plugin); } } - } else { - pluginsWanted = plugins.values(); } return pluginsWanted; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-06 05:34:16 UTC (rev 191) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-06 12:47:28 UTC (rev 192) @@ -44,11 +44,11 @@ /** * Importer. */ - private Importer importer; +// private Importer importer; /** * Exporter. */ - private Exporter exporter; +// private Exporter exporter; /** * classe instance (singleton pattern). */ @@ -408,7 +408,7 @@ Item selectedItem = ui.getImporter().getSelectedJaxxItem(); String importerName = selectedItem.getValue().toString(); - importer = (Importer) pluginLoader.getPlugin(importerName); + Importer importer = (Importer) pluginLoader.getPlugin(importerName); /** Create FileChooser and set FileFilter. */ JFileChooser jfc = new JFileChooser(lastPath); @@ -441,7 +441,7 @@ Item selectedItem = ui.getExporter().getSelectedJaxxItem(); String exporterName = selectedItem.getValue().toString(); - exporter = (Exporter) pluginLoader.getPlugin(exporterName); + Exporter exporter = (Exporter) pluginLoader.getPlugin(exporterName); /** Create FileChooser and set FileFilter. */ JFileChooser jfc = new JFileChooser(lastPath); Added: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java (rev 0) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java 2010-03-06 12:47:28 UTC (rev 192) @@ -0,0 +1,141 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.core; + +import java.io.File; +import java.lang.reflect.Field; +import java.net.MalformedURLException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import javax.swing.filechooser.FileFilter; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Exporter; +import org.nuiton.mapstoragemanager.plugins.Importer; +import org.nuiton.mapstoragemanager.plugins.Plugin; + +/** + * + * @author Dorian Langlais + */ +public class PluginLoaderTest extends TestCase { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(PluginLoaderTest.class); + + /** + * pluginsMapActual. + */ + Map<String, Plugin> pluginsMapActual; + /** + * pluginLoader. + */ + PluginLoader pl; + + /** + * initialisation to prepare test. + */ + @Override + public void setUp() { + /** + * Initialisation. + */ + try { + pl = new PluginLoader(new File("").getAbsolutePath(), + this.getClass().getClassLoader()); + Field fPlugins = pl.getClass().getDeclaredField("plugins"); + fPlugins.setAccessible(true); + pluginsMapActual = (Map<String, Plugin>) fPlugins.get(pl); + + /** Remise à zéro de la Map */ + pluginsMapActual.clear(); + } catch (IllegalArgumentException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (IllegalAccessException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (NoSuchFieldException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (SecurityException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (MalformedURLException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } + } + + public void testGetAllPluginNames() { + this.setUp(); + + Set<String> pluginsNamesExpected = new HashSet<String>(); + Set<String> pluginsNamesActual = pl.getAllPluginNames(); + + assertEquals(pluginsNamesExpected, pluginsNamesActual); + + pluginsNamesExpected.add("Test"); + pluginsMapActual.put("Test", null); + pluginsNamesActual = pl.getAllPluginNames(); + + assertEquals(pluginsNamesExpected, pluginsNamesActual); + + } + + public void testGetAllPlugin() { + this.setUp(); + + Collection<Plugin> pluginsExpected = new HashSet<Plugin>(); + Collection<Plugin> pluginsActual = pl.getAllPlugin(null); + + assertEquals(pluginsExpected, pluginsActual); + + Plugin test = new Importer() { + + @Override + public void importFrom(BigTable bigTable, File file) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public FileFilter getFileFilter() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public String getPluginName() { + throw new UnsupportedOperationException("Not supported yet."); + } + + }; + + pluginsExpected.add(test); + pluginsMapActual.put("Test", test); + pluginsActual = pl.getAllPlugin(Importer.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsActual = pl.getAllPlugin(Exporter.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsActual = pl.getAllPlugin(BigTable.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsActual = pl.getAllPlugin(null); + assertEquals(pluginsExpected, pluginsActual); + + } +} Deleted: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-06 05:34:16 UTC (rev 191) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-06 12:47:28 UTC (rev 192) @@ -1,35 +0,0 @@ -package org.nuiton.mapstoragemanager.core; - -import java.net.MalformedURLException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * @author fdesbois - * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderText instead - */ -@Deprecated -public final class TestServiceLoader { - - /** - * Logger. - */ - private static final Log LOG = LogFactory.getLog(TestServiceLoader.class); - - private TestServiceLoader() { - try { - PluginLoader p = - new PluginLoader("plugins", this.getClass().getClassLoader()); - LOG.info(p.getPluginsToString()); - } catch (MalformedURLException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - LOG.error(e.toString(),e); - } - } - - public static void main(final String[] args) { - - new TestServiceLoader(); - } -} \ No newline at end of file