Skip to content

Commit 25724c5

Browse files
authored
Adjust date parsing in ILM integration tests (elastic#48648)
The format returned by the API is not always parsable with `Instant.parse()`, so this commit adjusts to parsing those dates as `ISO_ZONED_DATE_TIME` instead, which appears to always parse the returned value correctly.
1 parent ef92755 commit 25724c5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
import java.util.concurrent.atomic.AtomicLong;
6565
import java.util.stream.Collectors;
6666

67+
import static java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME;
6768
import static org.elasticsearch.client.Requests.clusterHealthRequest;
6869
import static org.elasticsearch.client.Requests.createIndexRequest;
6970
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
@@ -181,7 +182,7 @@ public void testSingleNodeCluster() throws Exception {
181182
GetLifecycleAction.LifecyclePolicyResponseItem responseItem = getLifecycleResponse.getPolicies().get(0);
182183
assertThat(responseItem.getLifecyclePolicy(), equalTo(lifecyclePolicy));
183184
assertThat(responseItem.getVersion(), equalTo(1L));
184-
long actualModifiedDate = Instant.parse(responseItem.getModifiedDate()).toEpochMilli();
185+
long actualModifiedDate = Instant.from(ISO_ZONED_DATE_TIME.parse(responseItem.getModifiedDate())).toEpochMilli();
185186
assertThat(actualModifiedDate,
186187
is(both(greaterThanOrEqualTo(lowerBoundModifiedDate)).and(lessThanOrEqualTo(upperBoundModifiedDate))));
187188

@@ -220,7 +221,7 @@ public void testExplainExecution() throws Exception {
220221
GetLifecycleAction.LifecyclePolicyResponseItem responseItem = getLifecycleResponse.getPolicies().get(0);
221222
assertThat(responseItem.getLifecyclePolicy(), equalTo(lifecyclePolicy));
222223
assertThat(responseItem.getVersion(), equalTo(1L));
223-
long actualModifiedDate = Instant.parse(responseItem.getModifiedDate()).toEpochMilli();
224+
long actualModifiedDate = Instant.from(ISO_ZONED_DATE_TIME.parse(responseItem.getModifiedDate())).toEpochMilli();
224225

225226
logger.info("Creating index [test]");
226227
CreateIndexResponse createIndexResponse = client().admin().indices().create(createIndexRequest("test").settings(settings))
@@ -295,7 +296,6 @@ public void testExplainParseOriginationDate() throws Exception {
295296
GetLifecycleAction.LifecyclePolicyResponseItem responseItem = getLifecycleResponse.getPolicies().get(0);
296297
assertThat(responseItem.getLifecyclePolicy(), equalTo(lifecyclePolicy));
297298
assertThat(responseItem.getVersion(), equalTo(1L));
298-
long actualModifiedDate = Instant.parse(responseItem.getModifiedDate()).toEpochMilli();
299299

300300
String indexName = "test-2019.09.14";
301301
logger.info("Creating index [{}]", indexName);
@@ -496,7 +496,7 @@ public void testCreatePolicyWhenStopped() throws Exception {
496496
GetLifecycleAction.LifecyclePolicyResponseItem responseItem = getLifecycleResponse.getPolicies().get(0);
497497
assertThat(responseItem.getLifecyclePolicy(), equalTo(lifecyclePolicy));
498498
assertThat(responseItem.getVersion(), equalTo(1L));
499-
long actualModifiedDate = Instant.parse(responseItem.getModifiedDate()).toEpochMilli();
499+
long actualModifiedDate = Instant.from(ISO_ZONED_DATE_TIME.parse(responseItem.getModifiedDate())).toEpochMilli();
500500
assertThat(actualModifiedDate,
501501
is(both(greaterThanOrEqualTo(lowerBoundModifiedDate)).and(lessThanOrEqualTo(upperBoundModifiedDate))));
502502
// assert ILM is still stopped

0 commit comments

Comments
 (0)