From 1bf205f862a32640d4febcd61cea49a04e406fa0 Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Fri, 13 Jul 2018 09:33:29 -0500 Subject: [PATCH] Test: Fix a second case of bad watch creation There was still a case with a null text that allowed for 0 attachments to be created. This commit ensures that greater than zero are created if the text is null. Otherwise, it uses the same logic to create 0 to 3 random attachments. Closes #31948 --- .../notification/slack/message/SlackMessageTests.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java index 14d732064e5..10544e464ac 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java @@ -461,7 +461,6 @@ public class SlackMessageTests extends ESTestCase { assertThat(parsed, equalTo(template)); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/31948") public void testTemplateRender() throws Exception { Settings settings = SlackMessageDefaultsTests.randomSettings(); SlackMessageDefaults defaults = new SlackMessageDefaults(settings); @@ -483,7 +482,9 @@ public class SlackMessageTests extends ESTestCase { templateBuilder.setText(randomAlphaOfLength(10)); } if (templateBuilder.text == null || randomBoolean()) { - int count = randomIntBetween(0, 3); + // ensure at least one attachment in the event the text is null + int minimumAttachments = templateBuilder.text == null ? 1 : 0; + int count = randomIntBetween(minimumAttachments, 3); for (int i = 0; i < count; i++) { Attachment.Template.Builder attachmentBuilder = createRandomAttachmentTemplateBuilder(); templateBuilder.addAttachments(attachmentBuilder);