opendev/gerrit
Code Issues Proposed changes

Fix plugin IT test for plugins using @PluginData annotation

Browse Source 
Null was passed as PluginData directory causing a NullPointerException
when loading the plugin.

Change-Id: I0124aa97debf2ff2258cb6313c2279512b3743e3
This commit is contained in:
Hugo Arès 2017-12-13 20:44:07 -05:00
parent ef1a749f9f
commit 7e065fc845
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java
View File

@ -40,7 +40,8 @@ public class LightweightPluginDaemonTest extends AbstractDaemonTest {
getClass().getClassLoader(),
testPlugin.sysModule(),
testPlugin.httpModule(),
testPlugin.sshModule());
testPlugin.sshModule(),
tempSiteDir.newFolder().toPath());
plugin.start(env);
env.onStartPlugin(plugin);

6
gerrit-server/src/main/java/com/google/gerrit/server/plugins/TestServerPlugin.java
View File

@ -15,6 +15,7 @@
package com.google.gerrit.server.plugins;
import com.google.gerrit.server.PluginUser;
import java.nio.file.Path;
public class TestServerPlugin extends ServerPlugin {
private final ClassLoader classLoader;
@ -29,9 +30,10 @@ public class TestServerPlugin extends ServerPlugin {
ClassLoader classloader,
String sysName,
String httpName,
String sshName)
String sshName,
Path dataDir)
throws InvalidPluginException {
super(name, pluginCanonicalWebUrl, user, null, null, null, null, classloader);
super(name, pluginCanonicalWebUrl, user, null, null, null, dataDir, classloader);
this.classLoader = classloader;
this.sysName = sysName;
this.httpName = httpName;