From 3f1a62ac381acc8e0f2367aab1b8d38d194e2ace Mon Sep 17 00:00:00 2001 From: Tatjana Date: Tue, 7 Apr 2026 21:51:48 +0200 Subject: [PATCH 1/2] Test: add unit tests for ActivityLogResponse DTO. --- .../activitylog/ActivityLogResponseTest.java | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/test/java/org/example/vet1177/dto/response/activitylog/ActivityLogResponseTest.java diff --git a/src/test/java/org/example/vet1177/dto/response/activitylog/ActivityLogResponseTest.java b/src/test/java/org/example/vet1177/dto/response/activitylog/ActivityLogResponseTest.java new file mode 100644 index 0000000..2b78eaa --- /dev/null +++ b/src/test/java/org/example/vet1177/dto/response/activitylog/ActivityLogResponseTest.java @@ -0,0 +1,57 @@ +package org.example.vet1177.dto.response.activitylog; + +import org.example.vet1177.entities.ActivityLog; +import org.example.vet1177.entities.ActivityType; +import org.example.vet1177.entities.MedicalRecord; +import org.example.vet1177.entities.User; +import org.junit.jupiter.api.Test; + +import java.time.Instant; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class ActivityLogResponseTest { + + @Test + void shouldMapActivityLogToResponseCorrectly(){ + //Arrange + UUID logId = UUID.randomUUID(); + UUID userId = UUID.randomUUID(); + UUID recordId = UUID.randomUUID(); + + User user = mock(User.class); + MedicalRecord record = mock(MedicalRecord.class); + + when(user.getId()).thenReturn(userId); + when(user.getName()).thenReturn("Alice"); + when(record.getId()).thenReturn(recordId); + + ActivityLog log = mock(ActivityLog.class); + + when(log.getId()).thenReturn(logId); + when(log.getAction()).thenReturn(ActivityType.UPDATED); + when(log.getDescription()).thenReturn("Update record"); + when(log.getPerformedBy()).thenReturn(user); + when(log.getMedicalRecord()).thenReturn(record); + when(log.getCreatedAt()).thenReturn(Instant.now()); + + //Act + ActivityLogResponse response = ActivityLogResponse.from(log); + + //Assert + assertEquals(logId, response.id()); + assertEquals(ActivityType.UPDATED, response.action()); + assertEquals("Update record", response.description()); + assertEquals(userId, response.performedById()); + assertEquals("Alice", response.performedByName()); + assertEquals(recordId, response.recordId()); + assertNotNull(response.createdAt()); + + } + + +} From c1a6b673a2e4ad59accb6683fd21050d641967c8 Mon Sep 17 00:00:00 2001 From: Tatjana Date: Tue, 7 Apr 2026 22:02:24 +0200 Subject: [PATCH 2/2] Test: improve ActivityLogResponse test with deterministic timestamp assertion --- .../dto/response/activitylog/ActivityLogResponseTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/example/vet1177/dto/response/activitylog/ActivityLogResponseTest.java b/src/test/java/org/example/vet1177/dto/response/activitylog/ActivityLogResponseTest.java index 2b78eaa..4b22c6c 100644 --- a/src/test/java/org/example/vet1177/dto/response/activitylog/ActivityLogResponseTest.java +++ b/src/test/java/org/example/vet1177/dto/response/activitylog/ActivityLogResponseTest.java @@ -23,6 +23,8 @@ void shouldMapActivityLogToResponseCorrectly(){ UUID userId = UUID.randomUUID(); UUID recordId = UUID.randomUUID(); + Instant createdAt = Instant.parse("2026-01-01T00:00:00Z"); + User user = mock(User.class); MedicalRecord record = mock(MedicalRecord.class); @@ -37,7 +39,7 @@ void shouldMapActivityLogToResponseCorrectly(){ when(log.getDescription()).thenReturn("Update record"); when(log.getPerformedBy()).thenReturn(user); when(log.getMedicalRecord()).thenReturn(record); - when(log.getCreatedAt()).thenReturn(Instant.now()); + when(log.getCreatedAt()).thenReturn(createdAt); //Act ActivityLogResponse response = ActivityLogResponse.from(log); @@ -49,7 +51,7 @@ void shouldMapActivityLogToResponseCorrectly(){ assertEquals(userId, response.performedById()); assertEquals("Alice", response.performedByName()); assertEquals(recordId, response.recordId()); - assertNotNull(response.createdAt()); + assertEquals(createdAt, response.createdAt()); }