Skip to content

Commit 5b09340

Browse files
authored
Fix flaky tests in SMTPMailSenderTest.java and ReflectionToStringBuilderUtilsTest.java (#6875)
1 parent 4c5a2ba commit 5b09340

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

utils/src/test/java/org/apache/cloudstack/utils/mailing/SMTPMailSenderTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.Date;
2323
import java.util.HashMap;
2424
import java.util.HashSet;
25+
import java.util.LinkedHashSet;
2526
import java.util.Map;
2627
import java.util.Properties;
2728
import java.util.Set;
@@ -547,7 +548,7 @@ public void validateSMTPMailSenderCreateMessageSubjectContentAndContentTypeDefin
547548
public void setMailRecipientsTest() throws UnsupportedEncodingException, MessagingException {
548549
SMTPMessage messageMock = new SMTPMessage(Mockito.mock(MimeMessage.class));
549550

550-
Set<MailAddress> recipients = new HashSet<>();
551+
Set<MailAddress> recipients = new LinkedHashSet<>();
551552
recipients.add(new MailAddress(null));
552553
recipients.add(new MailAddress(""));
553554
recipients.add(new MailAddress(" "));

utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,21 @@ public void validateGetNonSelectedFieldsNullObjectClassMustReturnNull(){
175175
public void validateGetNonSelectedFieldsObjectIsNotACollectionAndValidSelectedFieldsMustReturnNonSelectedFields(){
176176
String fieldToRemove = classToReflectRemovedField;
177177
String[] expectedResult = classToReflectFieldsNamesArray;
178+
Arrays.sort(expectedResult);
178179

179180
String[] result = ReflectionToStringBuilderUtils.getNonSelectedFields("test", fieldToRemove);
181+
Arrays.sort(result);
180182
Assert.assertArrayEquals(expectedResult, result);
181183
}
182184

183185
@Test
184186
public void validateGetNonSelectedFieldsObjectIsACollectionAndValidSelectedFieldsMustReturnNonSelectedFields(){
185187
String fieldToRemove = classToReflectRemovedField;
186188
String[] expectedResult = classToReflectFieldsNamesArray;
189+
Arrays.sort(expectedResult);
187190

188191
String[] result = ReflectionToStringBuilderUtils.getNonSelectedFields(Arrays.asList("test1", "test2"), fieldToRemove);
192+
Arrays.sort(result);
189193
Assert.assertArrayEquals(expectedResult, result);
190194
}
191195

0 commit comments

Comments
 (0)