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

Commit 1617ff2

Browse files
author
Thomas Broyer
committed
Fix tests
Change-Id: Iee802e9af3c37d27cf1695f31851ae6f814f7851
1 parent af865d1 commit 1617ff2

2 files changed

Lines changed: 35 additions & 46 deletions

File tree

‎sormas-backend/src/test/java/de/symeda/sormas/backend/TestDataCreator.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,6 +1226,17 @@ public void updateDiseaseConfiguration(Disease disease, Boolean active, Boolean
12261226
beanTest.getDiseaseConfigurationFacade().saveDiseaseConfiguration(config);
12271227
}
12281228

1229+
public DocumentDto createDocument(
1230+
UserReferenceDto uploadingUser,
1231+
String name,
1232+
String contentType,
1233+
long size,
1234+
EventReferenceDto event,
1235+
byte[] content)
1236+
throws IOException {
1237+
return createDocument(uploadingUser, name, contentType, size, DocumentRelatedEntityType.EVENT, event.getUuid(), content);
1238+
}
1239+
12291240
public DocumentDto createDocument(
12301241
UserReferenceDto uploadingUser,
12311242
String name,

‎sormas-backend/src/test/java/de/symeda/sormas/backend/document/DocumentFacadeEjbTest.java‎

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
import de.symeda.sormas.api.document.DocumentDto;
3636
import de.symeda.sormas.api.document.DocumentRelatedEntityType;
37+
import de.symeda.sormas.api.event.EventDto;
3738
import de.symeda.sormas.api.user.UserDto;
38-
import de.symeda.sormas.api.utils.DataHelper;
3939
import de.symeda.sormas.backend.AbstractBeanTest;
4040
import de.symeda.sormas.backend.TestDataCreator;
4141

@@ -45,55 +45,39 @@ public class DocumentFacadeEjbTest extends AbstractBeanTest {
4545
public void testDocumentCreation() throws IOException {
4646
TestDataCreator.RDCF rdcf = creator.createRDCF("Region", "District", "Community", "Facility");
4747
UserDto user = creator.createUser(rdcf);
48-
String eventUuid = DataHelper.createUuid();
48+
EventDto event = creator.createEvent(user.toReference());
4949

50-
DocumentDto document = creator.createDocument(
51-
user.toReference(),
52-
"Name.pdf",
53-
"application/pdf",
54-
42L,
55-
DocumentRelatedEntityType.EVENT,
56-
eventUuid,
57-
"content".getBytes(StandardCharsets.UTF_8));
50+
DocumentDto document = creator
51+
.createDocument(user.toReference(), "Name.pdf", "application/pdf", 42L, event.toReference(), "content".getBytes(StandardCharsets.UTF_8));
5852

5953
assertNotNull(getDocumentFacade().getDocumentByUuid(document.getUuid()));
6054

61-
assertThat(getDocumentFacade().getDocumentsRelatedToEntity(DocumentRelatedEntityType.EVENT, eventUuid), hasSize(1));
55+
assertThat(getDocumentFacade().getDocumentsRelatedToEntity(DocumentRelatedEntityType.EVENT, event.getUuid()), hasSize(1));
6256
}
6357

6458
@Test
6559
public void testExistingDocument() throws IOException {
6660
TestDataCreator.RDCF rdcf = creator.createRDCF("Region", "District", "Community", "Facility");
6761
UserDto user = creator.createUser(rdcf);
68-
String eventUuid = DataHelper.createUuid();
69-
70-
DocumentDto document = creator.createDocument(
71-
user.toReference(),
72-
"Name.pdf",
73-
"application/pdf",
74-
42L,
75-
DocumentRelatedEntityType.EVENT,
76-
eventUuid,
77-
"content".getBytes(StandardCharsets.UTF_8));
78-
79-
assertEquals(document.getUuid(), getDocumentFacade().isExistingDocument(DocumentRelatedEntityType.EVENT, eventUuid, document.getName()));
80-
assertNull(getDocumentFacade().isExistingDocument(DocumentRelatedEntityType.EVENT, eventUuid, "Some other name.docx"));
62+
EventDto event = creator.createEvent(user.toReference());
63+
64+
DocumentDto document = creator
65+
.createDocument(user.toReference(), "Name.pdf", "application/pdf", 42L, event.toReference(), "content".getBytes(StandardCharsets.UTF_8));
66+
67+
assertEquals(
68+
document.getUuid(),
69+
getDocumentFacade().isExistingDocument(DocumentRelatedEntityType.EVENT, event.getUuid(), document.getName()));
70+
assertNull(getDocumentFacade().isExistingDocument(DocumentRelatedEntityType.EVENT, event.getUuid(), "Some other name.docx"));
8171
}
8272

8373
@Test(expected = EntityExistsException.class)
8474
public void testDuplicate() throws IOException {
8575
TestDataCreator.RDCF rdcf = creator.createRDCF("Region", "District", "Community", "Facility");
8676
UserDto user = creator.createUser(rdcf);
87-
String eventUuid = DataHelper.createUuid();
77+
EventDto event = creator.createEvent(user.toReference());
8878

89-
DocumentDto document = creator.createDocument(
90-
user.toReference(),
91-
"Name.pdf",
92-
"application/pdf",
93-
42L,
94-
DocumentRelatedEntityType.EVENT,
95-
eventUuid,
96-
"content".getBytes(StandardCharsets.UTF_8));
79+
DocumentDto document = creator
80+
.createDocument(user.toReference(), "Name.pdf", "application/pdf", 42L, event.toReference(), "content".getBytes(StandardCharsets.UTF_8));
9781

9882
getDocumentFacade().saveDocument(document, "duplicate".getBytes(StandardCharsets.UTF_8));
9983
}
@@ -102,21 +86,15 @@ public void testDuplicate() throws IOException {
10286
public void testDocumentDeletion() throws IOException {
10387
TestDataCreator.RDCF rdcf = creator.createRDCF("Region", "District", "Community", "Facility");
10488
UserDto user = creator.createUser(rdcf);
105-
String eventUuid = DataHelper.createUuid();
89+
EventDto event = creator.createEvent(user.toReference());
10690

107-
DocumentDto document = creator.createDocument(
108-
user.toReference(),
109-
"Name.pdf",
110-
"application/pdf",
111-
42L,
112-
DocumentRelatedEntityType.EVENT,
113-
eventUuid,
114-
"content".getBytes(StandardCharsets.UTF_8));
91+
DocumentDto document = creator
92+
.createDocument(user.toReference(), "Name.pdf", "application/pdf", 42L, event.toReference(), "content".getBytes(StandardCharsets.UTF_8));
11593

11694
assumeNotNull(getDocumentFacade().getDocumentByUuid(document.getUuid()));
117-
assumeThat(getDocumentFacade().getDocumentsRelatedToEntity(DocumentRelatedEntityType.EVENT, eventUuid), hasSize(1));
95+
assumeThat(getDocumentFacade().getDocumentsRelatedToEntity(DocumentRelatedEntityType.EVENT, event.getUuid()), hasSize(1));
11896
assumeThat(
119-
getDocumentFacade().isExistingDocument(DocumentRelatedEntityType.EVENT, eventUuid, document.getName()),
97+
getDocumentFacade().isExistingDocument(DocumentRelatedEntityType.EVENT, event.getUuid(), document.getName()),
12098
equalTo(document.getUuid()));
12199

122100
getDocumentFacade().deleteDocument(document.getUuid());
@@ -125,7 +103,7 @@ public void testDocumentDeletion() throws IOException {
125103
assertNotNull(deleted);
126104
assertTrue(deleted.isDeleted());
127105

128-
assertThat(getDocumentFacade().getDocumentsRelatedToEntity(DocumentRelatedEntityType.EVENT, eventUuid), empty());
129-
assertNull(getDocumentFacade().isExistingDocument(DocumentRelatedEntityType.EVENT, eventUuid, document.getName()));
106+
assertThat(getDocumentFacade().getDocumentsRelatedToEntity(DocumentRelatedEntityType.EVENT, event.getUuid()), empty());
107+
assertNull(getDocumentFacade().isExistingDocument(DocumentRelatedEntityType.EVENT, event.getUuid(), document.getName()));
130108
}
131109
}

0 commit comments

Comments
 (0)