From 779e7e83c0d568fdb7a3639d1bdad58dfe990b6c Mon Sep 17 00:00:00 2001
From: Brian Murphy <brian.p.murphy@gmail.com>
Date: Wed, 26 Nov 2014 16:28:11 +0000
Subject: [PATCH] TEST Fix Bootstrap test that got munged by merge.

Original commit: elastic/x-pack-elasticsearch@b0f40fd764a3b3af2f37cc40451d957c681681d9
---
 src/test/java/org/elasticsearch/alerts/BootStrapTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/elasticsearch/alerts/BootStrapTest.java b/src/test/java/org/elasticsearch/alerts/BootStrapTest.java
index 4d5c91b5bf0..33599aaffd5 100644
--- a/src/test/java/org/elasticsearch/alerts/BootStrapTest.java
+++ b/src/test/java/org/elasticsearch/alerts/BootStrapTest.java
@@ -110,17 +110,18 @@ public class BootStrapTest extends AbstractAlertingTests {
             String actionHistoryIndex = AlertActionManager.getAlertHistoryIndexNameForTime(historyIndexDate);
             createIndex(actionHistoryIndex);
             ensureGreen(actionHistoryIndex);
+
             for (int j=0; j<numberOfAlertHistoryEntriesPerIndex; ++j){
-                Alert alert = new Alert("entryTestAlert" + i + "-" + j,
+                Alert alert = new Alert("action-test-"+ i + " " + j,
                         searchRequest,
                         new ScriptedTrigger("hits.total == 1", ScriptService.ScriptType.INLINE, "groovy"),
                         new ArrayList< AlertAction>(),
                         "0 0/5 * * * ? *",
                         new DateTime(),
                         0,
-                        true,
                         new TimeValue(0),
                         AlertAckState.NOT_ACKABLE);
+
                 AlertActionEntry entry = new AlertActionEntry(alert, historyIndexDate, historyIndexDate, AlertActionState.SEARCH_NEEDED);
                 IndexResponse indexResponse = client().prepareIndex(actionHistoryIndex, AlertActionManager.ALERT_HISTORY_TYPE, entry.getId())
                         .setConsistencyLevel(WriteConsistencyLevel.ALL)
@@ -137,7 +138,6 @@ public class BootStrapTest extends AbstractAlertingTests {
 
         assertTrue(response.isAlertActionManagerStarted());
         assertThat(response.getAlertManagerStarted(), equalTo(State.STARTED));
-        assertThat(response.getNumberOfRegisteredAlerts(), equalTo(0L));
         assertThat(response.getAlertActionManagerLargestQueueSize(),
                 equalTo((long)(numberOfAlertHistoryEntriesPerIndex*numberOfAlertHistoryIndices)));