Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 08205a0

Browse files
log exception in sormas 2 sormas test (SORMAS-Foundation#3585)
fix sormas 2 sormas test failing on travis
1 parent 1df6bc2 commit 08205a0

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasValidationException.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ public SormasToSormasValidationException(Map<String, ValidationErrors> errors) {
2525
this.errors = errors;
2626
}
2727

28+
public SormasToSormasValidationException(Map<String, ValidationErrors> errors, Throwable cause) {
29+
super("Validation error", cause);
30+
this.errors = errors;
31+
}
32+
2833
public Map<String, ValidationErrors> getErrors() {
2934
return errors;
3035
}

sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/ValidationHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static <T> T handleValidationError(Supplier<T> saveOperation, String vali
6161
parentError
6262
.put(parentValidationGroup, ValidationErrors.create(I18nProperties.getCaption(validationGroupCaption), exception.getMessage()));
6363

64-
throw new SormasToSormasValidationException(parentError);
64+
throw new SormasToSormasValidationException(parentError, exception);
6565
}
6666
}
6767
}

sormas-backend/src/test/java/de/symeda/sormas/backend/sormastosormas/SormasToSormasFacadeEjbTest.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.security.NoSuchAlgorithmException;
3232
import java.util.Arrays;
3333
import java.util.Base64;
34+
import java.util.Calendar;
3435
import java.util.Collections;
3536
import java.util.Date;
3637
import java.util.List;
@@ -834,6 +835,11 @@ public void testSaveReturnedCase() throws JsonProcessingException, SormasToSorma
834835

835836
caze.setQuarantine(QuarantineType.HOTEL);
836837

838+
Calendar calendar = Calendar.getInstance();
839+
calendar.setTime(caze.getChangeDate());
840+
calendar.add(Calendar.DAY_OF_MONTH, 1);
841+
caze.setChangeDate(calendar.getTime());
842+
837843
SormasToSormasCaseDto shareData = new SormasToSormasCaseDto(person, caze, createSormasToSormasOriginInfo());
838844
shareData.setAssociatedContacts(
839845
Arrays.asList(
@@ -846,7 +852,11 @@ public void testSaveReturnedCase() throws JsonProcessingException, SormasToSorma
846852

847853
byte[] encryptedData = encryptShareData(shareData);
848854

849-
getSormasToSormasFacade().saveReturnedCase(new SormasToSormasEncryptedDataDto(DEFAULT_SERVER_ACCESS_CN, encryptedData));
855+
try {
856+
getSormasToSormasFacade().saveReturnedCase(new SormasToSormasEncryptedDataDto(DEFAULT_SERVER_ACCESS_CN, encryptedData));
857+
} catch (Exception e) {
858+
e.printStackTrace();
859+
}
850860

851861
CaseDataDto returnedCase = getCaseFacade().getCaseDataByUuid(caze.getUuid());
852862
assertThat(returnedCase.getQuarantine(), is(QuarantineType.HOTEL));
@@ -889,6 +899,11 @@ public void testSaveReturnedContact() throws JsonProcessingException, SormasToSo
889899

890900
contact.setQuarantine(QuarantineType.HOTEL);
891901

902+
Calendar calendar = Calendar.getInstance();
903+
calendar.setTime(contact.getChangeDate());
904+
calendar.add(Calendar.DAY_OF_MONTH, 1);
905+
contact.setChangeDate(calendar.getTime());
906+
892907
SormasToSormasContactDto shareData = new SormasToSormasContactDto(contactPerson, contact, createSormasToSormasOriginInfo());
893908
shareData.setSamples(
894909
Arrays.asList(

0 commit comments

Comments
 (0)