diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-01-14 09:43:14 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-01-14 09:43:14 +0100 |
| commit | 9094c00d7003b1c4996faa6e851fad7aaaf1b8ed (patch) | |
| tree | 9306da2429c54520cfcfbd9b81999fe08a4e26d0 /sonar-server | |
| parent | 428ce8cbd0095153de70e215a6f8ad6b5e6da90b (diff) | |
| download | sonarqube-9094c00d7003b1c4996faa6e851fad7aaaf1b8ed.tar.gz sonarqube-9094c00d7003b1c4996faa6e851fad7aaaf1b8ed.zip | |
SONAR-4067 fix unit test
Diffstat (limited to 'sonar-server')
4 files changed, 0 insertions, 21 deletions
diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java index d134a23ce07..f2ce1d5db7c 100644 --- a/sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java +++ b/sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java @@ -81,22 +81,6 @@ public class PluginDeployerTest { assertThat(deployedJar.isFile()).isTrue(); } - @Test - public void deployDeprecatedPlugin() { - deployer.start(); - - // check that the plugin is registered - assertThat(deployer.getMetadata()).hasSize(1); // no more checkstyle - - PluginMetadata plugin = deployer.getMetadata("buildbreaker"); - assertThat(plugin.isCore()).isFalse(); - assertThat(plugin.isUseChildFirstClassLoader()).isFalse(); - - // check that the file is deployed - File deployedJar = new File(deployDir, "plugins/buildbreaker/sonar-build-breaker-plugin-0.1.jar"); - assertThat(deployedJar.exists()).isTrue(); - assertThat(deployedJar.isFile()).isTrue(); - } @Test public void deployPluginExtensions() { @@ -137,9 +121,4 @@ public class PluginDeployerTest { public void failIfTwoPluginsWithSameKey() { deployer.start(); } - - @Test(expected = ServerStartException.class) - public void failIfTwoDeprecatedPluginsWithSameKey() { - deployer.start(); - } } diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/deployDeprecatedPlugin/extensions/plugins/sonar-build-breaker-plugin-0.1.jar b/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/deployDeprecatedPlugin/extensions/plugins/sonar-build-breaker-plugin-0.1.jar Binary files differdeleted file mode 100644 index 862614d26c7..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/deployDeprecatedPlugin/extensions/plugins/sonar-build-breaker-plugin-0.1.jar +++ /dev/null diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/failIfTwoDeprecatedPluginsWithSameKey/extensions/plugins/sonar-build-breaker-plugin-0.1.jar b/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/failIfTwoDeprecatedPluginsWithSameKey/extensions/plugins/sonar-build-breaker-plugin-0.1.jar Binary files differdeleted file mode 100644 index 862614d26c7..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/failIfTwoDeprecatedPluginsWithSameKey/extensions/plugins/sonar-build-breaker-plugin-0.1.jar +++ /dev/null diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/failIfTwoDeprecatedPluginsWithSameKey/extensions/plugins/sonar-build-breaker-plugin-0.2.jar b/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/failIfTwoDeprecatedPluginsWithSameKey/extensions/plugins/sonar-build-breaker-plugin-0.2.jar Binary files differdeleted file mode 100644 index 862614d26c7..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginDeployerTest/failIfTwoDeprecatedPluginsWithSameKey/extensions/plugins/sonar-build-breaker-plugin-0.2.jar +++ /dev/null |