commit 5db1abcb110810f8c782ec616b54f3e80de6979a
author Hugo Arès <hugo.ares@ericsson.com> Tue Apr 18 20:57:58 2017 -0400
committer Hugo Arès <hugo.ares@ericsson.com> Tue Apr 18 21:01:13 2017 -0400
tree 4bcdc02eadc3effb73813804e968457d7bdbb6dc
parent d9d4c2011720766ab08d841a7e242c9b3d050f9b

Make use of LightweightPluginDaemonTest

PluginDaemonTest no longer exists.

Change-Id: I01bd206c3751bdd08d17b9461b4dcf3b60f2b3e0

BUCK

diff --git a/BUCK b/BUCK
index dfd8810..84af6a0 100644
--- a/BUCK
+++ b/BUCK
@@ -1,11 +1,18 @@
 include_defs('//bucklets/gerrit_plugin.bucklet')
 include_defs('//bucklets/java_sources.bucklet')
+include_defs('//bucklets/maven_jar.bucklet')
 
 SOURCES = glob(['src/main/java/**/*.java'])
 RESOURCES = glob(['src/main/resources/**/*'])
 
 TEST_DEPS = GERRIT_TESTS + GERRIT_PLUGIN_API + [
   ':project-group-structure__plugin',
+  # bazlets include those 3 bouncycastle jars in plugin API so this is temporary
+  # until this plugin is built with bazel.
+  # see https://gerrit-review.googlesource.com/#/c/102670/ for more info.
+  ':bouncycastle_bcprov',
+  ':bouncycastle_bcpg',
+  ':bouncycastle_bcpkix',
 ]
 
 gerrit_plugin(
@@ -40,3 +47,22 @@
   deps = TEST_DEPS,
 )
 
+BC_VERS = '1.56'
+
+maven_jar(
+  name = 'bouncycastle_bcprov',
+  id = 'org.bouncycastle:bcprov-jdk15on:' + BC_VERS,
+  sha1 = 'a153c6f9744a3e9dd6feab5e210e1c9861362ec7',
+)
+
+maven_jar(
+  name = 'bouncycastle_bcpg',
+  id = 'org.bouncycastle:bcpg-jdk15on:' + BC_VERS,
+  sha1 = '9c3f2e7072c8cc1152079b5c25291a9f462631f1',
+)
+
+maven_jar(
+  name = 'bouncycastle_bcpkix',
+  id = 'org.bouncycastle:bcpkix-jdk15on:' + BC_VERS,
+  sha1 = '4648af70268b6fdb24674fb1fd7c1fcc73db1231',
+)

src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorIT.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorTest.java b/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorIT.java
similarity index 95%
rename from src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorTest.java
rename to src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorIT.java
index 0f12e39..f62d8ce 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorIT.java
@@ -20,8 +20,9 @@
 import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 import com.google.common.hash.Hashing;
-import com.google.gerrit.acceptance.PluginDaemonTest;
+import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.RestResponse;
+import com.google.gerrit.acceptance.TestPlugin;
 import com.google.gerrit.common.data.GlobalCapability;
 import com.google.gerrit.extensions.api.groups.GroupApi;
 import com.google.gerrit.extensions.api.projects.ProjectInput;
@@ -33,10 +34,15 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class ProjectCreationValidatorTest extends PluginDaemonTest {
+@TestPlugin(
+    name = "project-group-structure",
+    sysModule = "com.ericsson.gerrit.plugins.projectgroupstructure.Module"
+)
+public class ProjectCreationValidatorIT extends LightweightPluginDaemonTest {
 
   @Before
   public void setUp() throws Exception {
+    super.setUp();
     // These access rights are mandatory configuration for this plugin as
     // documented in config.md
     allowGlobalCapabilities(REGISTERED_USERS, GlobalCapability.CREATE_GROUP);