diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2011-05-27 15:15:17 +0200 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2011-05-27 15:15:17 +0200 |
| commit | 78f121539257fda264f929a4d596e3919eaafdcc (patch) | |
| tree | 7434523cec2a7a9298e209d2e7284d13e871e4f1 /sonar-batch/src/test | |
| parent | 5bfa0ea11539a3a175532a2eb97fea60c05d5dae (diff) | |
| download | sonarqube-78f121539257fda264f929a4d596e3919eaafdcc.tar.gz sonarqube-78f121539257fda264f929a4d596e3919eaafdcc.zip | |
Rename org.sonar.batch.ExtensionDownloader to ArtifactDownloader
Diffstat (limited to 'sonar-batch/src/test')
| -rw-r--r-- | sonar-batch/src/test/java/org/sonar/batch/bootstrap/ArtifactDownloaderTest.java (renamed from sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionDownloaderTest.java) | 6 | ||||
| -rw-r--r-- | sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionDownloaderTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ArtifactDownloaderTest.java index ab9a0aad137..e318ca69249 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionDownloaderTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ArtifactDownloaderTest.java @@ -33,7 +33,7 @@ import java.net.URISyntaxException; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.*; -public class ExtensionDownloaderTest { +public class ArtifactDownloaderTest { @Test public void shouldDownloadJdbcDriver() throws IOException, URISyntaxException { @@ -43,7 +43,7 @@ public class ExtensionDownloaderTest { HttpDownloader httpDownloader = mock(HttpDownloader.class); TempDirectories workingDirectories = new TempDirectories(); - ExtensionDownloader downloader = new ExtensionDownloader(httpDownloader, workingDirectories, server); + ArtifactDownloader downloader = new ArtifactDownloader(httpDownloader, workingDirectories, server); File jdbcDriver = downloader.downloadJdbcDriver(); assertNotNull(jdbcDriver); @@ -58,7 +58,7 @@ public class ExtensionDownloaderTest { HttpDownloader httpDownloader = mock(HttpDownloader.class); TempDirectories workingDirectories = new TempDirectories(); - ExtensionDownloader downloader = new ExtensionDownloader(httpDownloader, workingDirectories, server); + ArtifactDownloader downloader = new ArtifactDownloader(httpDownloader, workingDirectories, server); JpaPluginFile extension = new JpaPluginFile(new JpaPlugin("findbugs"), "bcel.jar"); File bcel = downloader.downloadExtension(extension); 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 6e848f4278d..0c617bf4271 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java @@ -43,7 +43,7 @@ public class BatchPluginRepositoryTest { @Test public void shouldLoadPlugin() { - ExtensionDownloader extensionDownloader = mock(ExtensionDownloader.class); + ArtifactDownloader extensionDownloader = mock(ArtifactDownloader.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); @@ -64,7 +64,7 @@ public class BatchPluginRepositoryTest { */ @Test public void shouldPluginExtensionInTheSameClassloader() { - ExtensionDownloader extensionDownloader = mock(ExtensionDownloader.class); + ArtifactDownloader extensionDownloader = mock(ArtifactDownloader.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); @@ -85,7 +85,7 @@ public class BatchPluginRepositoryTest { assertThat(entryPointBase.getClass().getClassLoader(), is(entryPointExtension.getClass().getClassLoader())); } - private void prepareDownloader(ExtensionDownloader extensionDownloader, final String pluginKey, final String filename) { + private void prepareDownloader(ArtifactDownloader 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); |