Author: dlanglais Date: 2010-03-07 01:40:33 +0100 (Sun, 07 Mar 2010) New Revision: 193 Log: Ajout d'un test sur getPlugin(String id). /!\ Nous aurons un soucis si deux plugins ont le m?\195?\170me nom... (getPluginName()). Il n'y a pas non plus de gestion de version des plugins... Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java 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 12:47:28 UTC (rev 192) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-07 00:40:33 UTC (rev 193) @@ -151,6 +151,10 @@ pluginsWanted.add(plugin); } } + } else { + for (Plugin plugin : plugins.values()) { + pluginsWanted.add(plugin); + } } return pluginsWanted; Modified: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java 2010-03-06 12:47:28 UTC (rev 192) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java 2010-03-07 00:40:33 UTC (rev 193) @@ -115,13 +115,14 @@ @Override public String getPluginName() { - throw new UnsupportedOperationException("Not supported yet."); + return "test"; } }; + pluginsExpected.clear(); pluginsExpected.add(test); - pluginsMapActual.put("Test", test); + pluginsMapActual.put(test.getPluginName(), test); pluginsActual = pl.getAllPlugin(Importer.class); assertEquals(pluginsExpected, pluginsActual); @@ -134,8 +135,55 @@ assertEquals(pluginsExpected, pluginsActual); pluginsExpected.clear(); + pluginsExpected.add(test); pluginsActual = pl.getAllPlugin(null); assertEquals(pluginsExpected, pluginsActual); } + + public void testGetPlugin() { + this.setUp(); + + Collection<Plugin> pluginsActual = pl.getAllPlugin(null); + + assertNull(pl.getPlugin(null)); + + Plugin testImporter = 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() { + return "testImporter"; + } + }; + Plugin testExporter = new Exporter() { + + @Override + public void exportTo(BigTable bigTable, File file) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public FileFilter getFileFilter() { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public String getPluginName() { + return "testExporter"; + } + }; + + pluginsMapActual.put(testImporter.getPluginName(), testImporter); + pluginsMapActual.put(testExporter.getPluginName(), testExporter); + + assertNull(pl.getPlugin("")); + assertEquals(testImporter, pl.getPlugin(testImporter.getPluginName())); + assertEquals(testExporter, pl.getPlugin(testExporter.getPluginName())); + } }