summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2018-07-04 14:04:21 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2018-07-04 14:04:21 +0900
commit0ff5ad674595cbf1ce2f09365aca370c16b7dda8 (patch)
tree41170bd62b693c574fa55a5739cd394d126221de
parent37afaa4b6dd0bc72597e7b4c5b5ae87534df17dc (diff)
ElasticConfigurationTest: Add tests for elasticsearch.maxRetryTimeout
-rw-r--r--gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticConfigurationTest.java22
1 files changed, 22 insertions, 0 deletions
diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticConfigurationTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticConfigurationTest.java
index ff7b5ca874..559b8c7341 100644
--- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticConfigurationTest.java
+++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticConfigurationTest.java
@@ -15,17 +15,21 @@
package com.google.gerrit.elasticsearch;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.elasticsearch.ElasticConfiguration.DEFAULT_MAX_RETRY_TIMEOUT_MS;
import static com.google.gerrit.elasticsearch.ElasticConfiguration.DEFAULT_USERNAME;
+import static com.google.gerrit.elasticsearch.ElasticConfiguration.KEY_MAX_RETRY_TIMEOUT;
import static com.google.gerrit.elasticsearch.ElasticConfiguration.KEY_PASSWORD;
import static com.google.gerrit.elasticsearch.ElasticConfiguration.KEY_PREFIX;
import static com.google.gerrit.elasticsearch.ElasticConfiguration.KEY_SERVER;
import static com.google.gerrit.elasticsearch.ElasticConfiguration.KEY_USERNAME;
+import static com.google.gerrit.elasticsearch.ElasticConfiguration.MAX_RETRY_TIMEOUT_UNIT;
import static com.google.gerrit.elasticsearch.ElasticConfiguration.SECTION_ELASTICSEARCH;
import static java.util.stream.Collectors.toList;
import com.google.common.collect.ImmutableList;
import com.google.inject.ProvisionException;
import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
import org.eclipse.jgit.lib.Config;
import org.junit.Rule;
import org.junit.Test;
@@ -42,6 +46,7 @@ public class ElasticConfigurationTest {
assertThat(esCfg.username).isNull();
assertThat(esCfg.password).isNull();
assertThat(esCfg.prefix).isEmpty();
+ assertThat(esCfg.maxRetryTimeout).isEqualTo(DEFAULT_MAX_RETRY_TIMEOUT_MS);
}
@Test
@@ -61,6 +66,23 @@ public class ElasticConfigurationTest {
}
@Test
+ public void maxRetryTimeoutInDefaultUnit() {
+ Config cfg = newConfig();
+ cfg.setString(SECTION_ELASTICSEARCH, null, KEY_MAX_RETRY_TIMEOUT, "45000");
+ ElasticConfiguration esCfg = new ElasticConfiguration(cfg);
+ assertThat(esCfg.maxRetryTimeout).isEqualTo(45000);
+ }
+
+ @Test
+ public void maxRetryTimeoutInOtherUnit() {
+ Config cfg = newConfig();
+ cfg.setString(SECTION_ELASTICSEARCH, null, KEY_MAX_RETRY_TIMEOUT, "45 s");
+ ElasticConfiguration esCfg = new ElasticConfiguration(cfg);
+ assertThat(esCfg.maxRetryTimeout)
+ .isEqualTo(MAX_RETRY_TIMEOUT_UNIT.convert(45, TimeUnit.SECONDS));
+ }
+
+ @Test
public void withAuthentication() throws Exception {
Config cfg = newConfig();
cfg.setString(SECTION_ELASTICSEARCH, null, KEY_USERNAME, "myself");