From 7e065fc845911ae2a8d54b4bf7121d50e0ef0d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugo.ares@ericsson.com>
Date: Wed, 13 Dec 2017 20:44:07 -0500
Subject: [PATCH] Fix plugin IT test for plugins using @PluginData annotation

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

Change-Id: I0124aa97debf2ff2258cb6313c2279512b3743e3
---
 .../gerrit/acceptance/LightweightPluginDaemonTest.java      | 3 ++-
 .../com/google/gerrit/server/plugins/TestServerPlugin.java  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java
index 58a9238f7c..6dab911ac2 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java
@@ -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);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/TestServerPlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/TestServerPlugin.java
index 6897b9a647..dbdc57694d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/TestServerPlugin.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/TestServerPlugin.java
@@ -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;