aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorGodin <mandrikov@gmail.com>2010-11-03 09:20:24 +0000
committerGodin <mandrikov@gmail.com>2010-11-03 09:20:24 +0000
commit3d4601ba4a45f709275d3c7cb8cc1cbaa210c087 (patch)
tree7db1cac6065105f42f69999d5634577c6e8e77e3 /sonar-server
parentcacf463535b7d680af91d21d3e687956901f94c1 (diff)
downloadsonarqube-3d4601ba4a45f709275d3c7cb8cc1cbaa210c087.tar.gz
sonarqube-3d4601ba4a45f709275d3c7cb8cc1cbaa210c087.zip
Use the same rules everywhere to transform plugin key
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java20
1 files changed, 10 insertions, 10 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 57ec82a5136..02f5041d4b8 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
@@ -23,6 +23,12 @@ import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.Rule;
@@ -38,12 +44,6 @@ import org.sonar.server.platform.ServerImpl;
import org.sonar.server.platform.ServerStartException;
import org.sonar.test.TestUtils;
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
public class PluginDeployerTest extends AbstractDbUnitTestCase {
private Server server;
@@ -104,21 +104,21 @@ public class PluginDeployerTest extends AbstractDbUnitTestCase {
List<JpaPlugin> plugins = dao.getPlugins();
assertThat(plugins.size(), is(1)); // no more checkstyle
JpaPlugin plugin = plugins.get(0);
- assertThat(plugin.getKey(), is("build-breaker"));
+ assertThat(plugin.getKey(), is("buildbreaker"));
assertThat(plugin.getFiles().size(), is(1));
assertThat(plugin.isCore(), is(false));
assertThat(plugin.isUseChildFirstClassLoader(), is(false));
JpaPluginFile pluginFile = plugin.getFiles().get(0);
assertThat(pluginFile.getFilename(), is("sonar-build-breaker-plugin-0.1.jar"));
- assertThat(pluginFile.getPath(), is("build-breaker/sonar-build-breaker-plugin-0.1.jar"));
+ assertThat(pluginFile.getPath(), is("buildbreaker/sonar-build-breaker-plugin-0.1.jar"));
// check that the file is deployed
- File deployedJar = new File(deployDir, "plugins/build-breaker/sonar-build-breaker-plugin-0.1.jar");
+ File deployedJar = new File(deployDir, "plugins/buildbreaker/sonar-build-breaker-plugin-0.1.jar");
assertThat(deployedJar.exists(), is(true));
assertThat(deployedJar.isFile(), is(true));
// check that the plugin has its own classloader
- ClassLoader classloader = classloaders.getClassLoader("build-breaker");
+ ClassLoader classloader = classloaders.getClassLoader("buildbreaker");
assertNotNull(classloader);
assertNotNull(classloader.loadClass("org.sonar.plugins.buildbreaker.BuildBreakerPlugin"));
}