SONAR-2469 add unit tests

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
index c9dce2513c80ded3a8c17aa5872116b927507dc6..b647df8bc7a02e582d976cca46f67b51ac168721 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
@@ -57,23 +57,38 @@ public class BatchPluginRepository implements PluginRepository {
   }
 
   public void start() {
-    List<JpaPlugin> pluginsMetadata = Lists.newArrayList();
+    doStart(dao.getPlugins());
+  }
+
+  public void doStart(List<JpaPlugin> basePlugins) {
     pluginsByKey = Maps.newHashMap();
     ClassLoadersCollection classLoaders = new ClassLoadersCollection(Thread.currentThread().getContextClassLoader());
 
-    List<JpaPlugin> jpaPlugins = dao.getPlugins();
+    List<JpaPlugin> pluginsMetadata = Lists.newArrayList(basePlugins);
+    createClassloaders(classLoaders, basePlugins);
+    pluginsMetadata.addAll(extendClassloaders(classLoaders, pluginsMetadata));
+    instantiatePluginEntryPoints(classLoaders, pluginsMetadata);
 
-    for (JpaPlugin pluginMetadata : jpaPlugins) {
-      if (StringUtils.isEmpty(pluginMetadata.getBasePlugin())) {
-        String key = pluginMetadata.getKey();
-        List<URL> urls = download(pluginMetadata);
-        classLoaders.createClassLoader(key, urls, pluginMetadata.isUseChildFirstClassLoader() == Boolean.TRUE);
-        pluginsMetadata.add(pluginMetadata);
+    classLoaders.done();
+  }
+
+  private void instantiatePluginEntryPoints(ClassLoadersCollection classLoaders, List<JpaPlugin> pluginsMetadata) {
+    for (JpaPlugin pluginMetadata : pluginsMetadata) {
+      try {
+        Class claz = classLoaders.get(pluginMetadata.getKey()).loadClass(pluginMetadata.getPluginClass());
+        Plugin plugin = (Plugin) claz.newInstance();
+        pluginsByKey.put(pluginMetadata.getKey(), plugin);
+
+      } catch (Exception e) {
+        throw new SonarException("Fail to load plugin " + pluginMetadata.getKey(), e);
       }
     }
+  }
 
+  private List<JpaPlugin> extendClassloaders(ClassLoadersCollection classLoaders, List<JpaPlugin> pluginsMetadata) {
+    List<JpaPlugin> extensions = Lists.newArrayList();
     // Extend plugins by other plugins
-    for (JpaPlugin pluginMetadata : jpaPlugins) {
+    for (JpaPlugin pluginMetadata : pluginsMetadata) {
       String pluginKey = pluginMetadata.getKey();
       String basePluginKey = pluginMetadata.getBasePlugin();
       if (StringUtils.isNotEmpty(basePluginKey)) {
@@ -81,7 +96,7 @@ public class BatchPluginRepository implements PluginRepository {
           LOG.debug("Plugin {} extends {}", pluginKey, basePluginKey);
           List<URL> urls = download(pluginMetadata);
           classLoaders.extend(basePluginKey, pluginKey, urls);
-          pluginsMetadata.add(pluginMetadata);
+          extensions.add(pluginMetadata);
 
         } else {
           // Ignored, because base plugin doesn't exists
@@ -89,19 +104,17 @@ public class BatchPluginRepository implements PluginRepository {
         }
       }
     }
+    return extensions;
+  }
 
-    for (JpaPlugin pluginMetadata : jpaPlugins) {
-      try {
-        Class claz = classLoaders.get(pluginMetadata.getKey()).loadClass(pluginMetadata.getPluginClass());
-        Plugin plugin = (Plugin) claz.newInstance();
-        pluginsByKey.put(pluginMetadata.getKey(), plugin);
-
-      } catch (Exception e) {
-        throw new SonarException("Fail to load plugin " + pluginMetadata.getKey(), e);
+  private void createClassloaders(ClassLoadersCollection classLoaders, List<JpaPlugin> basePlugins) {
+    for (JpaPlugin pluginMetadata : basePlugins) {
+      if (StringUtils.isEmpty(pluginMetadata.getBasePlugin())) {
+        String key = pluginMetadata.getKey();
+        List<URL> urls = download(pluginMetadata);
+        classLoaders.createClassLoader(key, urls, pluginMetadata.isUseChildFirstClassLoader() == Boolean.TRUE);
       }
     }
-
-    classLoaders.done();
   }
 
   private List<URL> download(JpaPlugin pluginMetadata) {

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionDownloader.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionDownloader.java
index 49ec936b24d08039173786999f75320874d7d851..397838986f77d2adc76473c9440e0fa9cb3b04a7 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionDownloader.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionDownloader.java
@@ -32,7 +32,7 @@ import java.net.URISyntaxException;
 /**
  * TODO this class should be renamed ArtifactDownloader, because it does not relate only to plugin extensions.
  */
-public final class ExtensionDownloader implements BatchComponent {
+public class ExtensionDownloader implements BatchComponent {
 
   private HttpDownloader httpDownloader;
   private TempDirectories workingDirectories;

diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
index 18a6281e6b81a09039e5edb6ddda55c470c44aa6..00c914319cc474958d1408e825cab6f1c890cf3b 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
@@ -19,25 +19,84 @@
  */
 package org.sonar.batch.bootstrap;
 
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.util.FileUtils;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.junit.Test;
+import org.sonar.api.Plugin;
+import org.sonar.core.plugin.JpaPlugin;
+import org.sonar.core.plugin.JpaPluginFile;
+
+import java.util.Arrays;
+
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.nullValue;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.picocontainer.MutablePicoContainer;
-import org.sonar.api.BatchExtension;
-import org.sonar.api.ServerExtension;
-import org.sonar.api.batch.AbstractCoverageExtension;
-import org.sonar.api.resources.Java;
-import org.sonar.api.resources.Project;
-import org.sonar.api.resources.Project.AnalysisType;
-import org.sonar.api.utils.IocContainer;
-
-@Ignore
 public class BatchPluginRepositoryTest {
 
+  @Test
+  public void shouldLoadPlugin() {
+    ExtensionDownloader extensionDownloader = mock(ExtensionDownloader.class);
+    when(extensionDownloader.downloadExtension(any(JpaPluginFile.class))).thenReturn(
+        FileUtils.toFile(getClass().getResource("/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar")));
+    BatchPluginRepository repository = new BatchPluginRepository(null, extensionDownloader);
+
+    JpaPlugin plugin = new JpaPlugin("artifactsize");
+    plugin.setPluginClass("org.sonar.plugins.artifactsize.ArtifactSizePlugin");
+    plugin.createFile("sonar-artifact-size-plugin-0.2.jar");
+    repository.doStart(Arrays.asList(plugin));
+
+    Plugin entryPoint = repository.getPlugin("artifactsize");
+    assertThat(entryPoint, not(nullValue()));
+    ClassRealm classloader = (ClassRealm) entryPoint.getClass().getClassLoader();
+    assertThat(classloader.getId(), is("artifactsize"));
+  }
+
+  /**
+   * Of course clirr does not extend artifact-size plugin in real life !
+   */
+  @Test
+  public void shouldPluginExtensionInTheSameClassloader() {
+    ExtensionDownloader extensionDownloader = mock(ExtensionDownloader.class);
+    prepareDownloader(extensionDownloader, "artifactsize", "/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar");
+    prepareDownloader(extensionDownloader, "clirr", "/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-clirr-plugin-1.1.jar");
+    BatchPluginRepository repository = new BatchPluginRepository(null, extensionDownloader);
+
+    JpaPlugin pluginBase = new JpaPlugin("artifactsize");
+    pluginBase.setPluginClass("org.sonar.plugins.artifactsize.ArtifactSizePlugin");
+    pluginBase.createFile("sonar-artifact-size-plugin-0.2.jar");
+
+    JpaPlugin pluginExtension = new JpaPlugin("clirr");
+    pluginExtension.setBasePlugin("artifactsize");
+    pluginExtension.setPluginClass("org.sonar.plugins.clirr.ClirrPlugin");
+    pluginExtension.createFile("sonar-clirr-plugin-1.1.jar");
+
+    repository.doStart(Arrays.asList(pluginBase, pluginExtension));
+
+    Plugin entryPointBase = repository.getPlugin("artifactsize");
+    Plugin entryPointExtension = repository.getPlugin("clirr");
+    assertThat(entryPointBase.getClass().getClassLoader(), is(entryPointExtension.getClass().getClassLoader()));
+  }
+
+  private void prepareDownloader(ExtensionDownloader extensionDownloader, final String pluginKey, final String filename) {
+    when(extensionDownloader.downloadExtension(argThat(new BaseMatcher<JpaPluginFile>() {
+      public boolean matches(Object o) {
+        return o!=null && ((JpaPluginFile) o).getPluginKey().equals(pluginKey);
+      }
+
+      public void describeTo(Description description) {
+
+      }
+    }))).thenReturn(FileUtils.toFile(getClass().getResource(filename)));
+  }
+
 //  @Test
 //  public void shouldRegisterBatchExtension() {
 //    MutablePicoContainer pico = IocContainer.buildPicoContainer();

diff --git a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar
new file mode 100644 (file)
index 0000000..917d986
Binary files /dev/null and b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar differ

diff --git a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-clirr-plugin-1.1.jar b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-clirr-plugin-1.1.jar
new file mode 100644 (file)
index 0000000..ef2ee8c
Binary files /dev/null and b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginRepositoryTest/sonar-clirr-plugin-1.1.jar differ