commit 532cb5efc9e2736addd3aeaf37b57a8d1acd7303
author David Pursehouse <dpursehouse@collab.net> Sun May 27 15:00:56 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Mon Jun 04 19:31:14 2018 +0900
tree 968534ba2ec20877973c740ee0ec5715e4914726
parent 8cb55dbc6ed68cc9fedcba84d5d9a8cbe3e5a2f0

ElasticReindexIT: Add tests against Elasticsearch version 5

Bug: Issue 6094
Change-Id: I324d099ee4cc484fcdfea8679e38cc2d3d2b5905

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
index f4ffc3c..683ec91 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.acceptance.pgm;
 
 import com.google.gerrit.acceptance.NoHttpd;
+import com.google.gerrit.elasticsearch.ElasticVersion;
 import com.google.gerrit.elasticsearch.testing.ElasticContainer;
 import com.google.gerrit.elasticsearch.testing.ElasticTestUtils;
 import com.google.gerrit.elasticsearch.testing.ElasticTestUtils.ElasticNodeInfo;
@@ -28,11 +29,10 @@
 public class ElasticReindexIT extends AbstractReindexTests {
   private static ElasticContainer<?> container;
 
-  @ConfigSuite.Default
-  public static Config elasticsearch() {
+  private static Config getConfig(ElasticVersion version) {
     ElasticNodeInfo elasticNodeInfo;
     try {
-      container = ElasticContainer.createAndStart();
+      container = ElasticContainer.createAndStart(version);
       elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
     } catch (Throwable t) {
       return null;
@@ -43,6 +43,16 @@
     return cfg;
   }
 
+  @ConfigSuite.Default
+  public static Config elasticsearchV2() {
+    return getConfig(ElasticVersion.V2_4);
+  }
+
+  @ConfigSuite.Config
+  public static Config elasticsearchV5() {
+    return getConfig(ElasticVersion.V5_6);
+  }
+
   @Override
   public void configureIndex(Injector injector) throws Exception {
     ElasticTestUtils.createAllIndexes(injector);