Merge pull request #1865 from xwandi/fix-test-suite

Fix test suite
ita-social-projects · Nov 7, 2023 · f3fcad7 · f3fcad7
2 parents f2866b1 + ae339b5
commit f3fcad7
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 75 deletions.
diff --git a/src/main/java/com/softserve/teachua/model/Gender.java b/src/main/java/com/softserve/teachua/model/Gender.java
@@ -24,7 +24,7 @@ public class Gender {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(nullable = false, unique = true)
+    @Column(nullable = false, unique = true, name = "`value`")
     private String value;
 
 }
diff --git a/src/main/java/com/softserve/teachua/model/WorkTime.java b/src/main/java/com/softserve/teachua/model/WorkTime.java
@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.softserve.teachua.constants.Days;
 import com.softserve.teachua.dto.marker.Convertible;
+
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -38,6 +40,7 @@ public class WorkTime implements Convertible {
     private Club club;
 
     @Enumerated(EnumType.ORDINAL)
+    @Column(name = "`day`")
     private Days day;
 
     private String startTime;

diff --git a/src/test/java/com/softserve/teachua/service/ChildServiceImplTest.java b/src/test/java/com/softserve/teachua/service/ChildServiceImplTest.java
@@ -7,6 +7,7 @@
 import com.softserve.teachua.model.Child;
 import com.softserve.teachua.model.User;
 import com.softserve.teachua.repository.ChildRepository;
+import com.softserve.teachua.repository.GenderRepository;
 import com.softserve.teachua.service.impl.ChildServiceImpl;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -29,6 +30,8 @@ class ChildServiceImplTest {
     private DtoConverter dtoConverter;
     @Mock
     private UserService userService;
+    @Mock
+    private GenderRepository genderRepository;
 
     @InjectMocks
     private ChildServiceImpl childService;