etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix flaky tests in SMTPMailSenderTest.java and ReflectionToStringBuilderUtilsTest.java (#6875)

This commit is contained in:
yannizhou05 2022-11-09 07:04:31 -06:00 committed by GitHub
parent 4c5a2ba3a6
commit 5b09340420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/src/test/java/org/apache/cloudstack/utils/mailing/SMTPMailSenderTest.java
View File

@ -22,6 +22,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@ -547,7 +548,7 @@ public class SMTPMailSenderTest extends TestCase {
public void setMailRecipientsTest() throws UnsupportedEncodingException, MessagingException {
SMTPMessage messageMock = new SMTPMessage(Mockito.mock(MimeMessage.class));
Set<MailAddress> recipients = new HashSet<>();
Set<MailAddress> recipients = new LinkedHashSet<>();
recipients.add(new MailAddress(null));
recipients.add(new MailAddress(""));
recipients.add(new MailAddress(" "));

4
utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java
View File

@ -175,8 +175,10 @@ public class ReflectionToStringBuilderUtilsTest extends TestCase {
public void validateGetNonSelectedFieldsObjectIsNotACollectionAndValidSelectedFieldsMustReturnNonSelectedFields(){
String fieldToRemove = classToReflectRemovedField;
String[] expectedResult = classToReflectFieldsNamesArray;
Arrays.sort(expectedResult);
String[] result = ReflectionToStringBuilderUtils.getNonSelectedFields("test", fieldToRemove);
Arrays.sort(result);
Assert.assertArrayEquals(expectedResult, result);
}
@ -184,8 +186,10 @@ public class ReflectionToStringBuilderUtilsTest extends TestCase {
public void validateGetNonSelectedFieldsObjectIsACollectionAndValidSelectedFieldsMustReturnNonSelectedFields(){
String fieldToRemove = classToReflectRemovedField;
String[] expectedResult = classToReflectFieldsNamesArray;
Arrays.sort(expectedResult);
String[] result = ReflectionToStringBuilderUtils.getNonSelectedFields(Arrays.asList("test1", "test2"), fieldToRemove);
Arrays.sort(result);
Assert.assertArrayEquals(expectedResult, result);
}