honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-24 05:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix LicenseIntegrationTest rebase fail

Browse Source 
Original commit: elastic/x-pack-elasticsearch@e4e1d56cd8
This commit is contained in:
Brian Murphy 2015-04-07 20:07:21 -04:00
parent 31fbbcfc9a
commit 2127373bb2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/elasticsearch/watcher/license/LicenseIntegrationTests.java
View File

@ -93,7 +93,7 @@ public class LicenseIntegrationTests extends AbstractWatcherIntegrationTests {
assertThat(watcherClient().prepareAckWatch(watchName).get().getStatus().ackStatus().state(), is(Watch.Status.AckStatus.State.ACKED));
// get watch API should work
assertThat(watcherClient().prepareGetWatch(watchName).get().getResponse().getId(), is(watchName));
assertThat(watcherClient().prepareGetWatch(watchName).get().id(), is(watchName));
// delete watch API should work
assertThat(watcherClient().prepareDeleteWatch(watchName).get().deleteResponse().isFound(), is(true));
@ -189,7 +189,7 @@ public class LicenseIntegrationTests extends AbstractWatcherIntegrationTests {
}
try {
assertThat(watcherClient().prepareGetWatch(watchName).get().getResponse().getId(), is(watchName));
assertThat(watcherClient().prepareGetWatch(watchName).get().id(), is(watchName));
fail("get watch API should NOT work when license is disabled");
} catch (LicenseExpiredException lee) {
assertThat(lee.feature(), is(LicenseService.FEATURE_NAME));
@ -242,7 +242,7 @@ public class LicenseIntegrationTests extends AbstractWatcherIntegrationTests {
assertBusy(new Runnable() {
@Override
public void run() {
Map<String, Object> source = watcherClient().prepareGetWatch(watchName).get().getResponse().getSource();
Map<String, Object> source = watcherClient().prepareGetWatch(watchName).get().sourceAsMap();
assertThat(XContentMapValues.extractValue("status.ack.state", source), is((Object) "ackable"));
}
});
@ -251,7 +251,7 @@ public class LicenseIntegrationTests extends AbstractWatcherIntegrationTests {
assertThat(watcherClient().prepareAckWatch(watchName).get().getStatus().ackStatus().state(), is(Watch.Status.AckStatus.State.ACKED));
// get watch API should work
assertThat(watcherClient().prepareGetWatch(watchName).get().getResponse().getId(), is(watchName));
assertThat(watcherClient().prepareGetWatch(watchName).get().id(), is(watchName));
// delete watch API should work
assertThat(watcherClient().prepareDeleteWatch(watchName).get().deleteResponse().isFound(), is(true));