Skip to content

Commit 4480dc8

Browse files
committed
IPTE-165: Test Refactoring
1 parent f94c978 commit 4480dc8

File tree

1 file changed

+20
-25
lines changed

1 file changed

+20
-25
lines changed
Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package de.doubleslash.keeptime.REST_API.controller;
22

3+
import de.doubleslash.keeptime.REST_API.DTO.ColorDTO;
34
import de.doubleslash.keeptime.REST_API.DTO.ProjectColorDTO;
45
import de.doubleslash.keeptime.REST_API.mapper.ProjectMapper;
56
import de.doubleslash.keeptime.model.Project;
67
import javafx.scene.paint.Color;
78
import org.junit.jupiter.api.Test;
89

9-
1010
import static org.junit.jupiter.api.Assertions.*;
1111

1212
class ProjectMapperTest {
13-
ProjectMapper projectMapper= ProjectMapper.INSTANCE;
13+
ProjectMapper projectMapper = ProjectMapper.INSTANCE;
1414

1515
@Test
1616
void projectToProjectDTO() {
@@ -24,34 +24,29 @@ void projectToProjectDTO() {
2424
project.setEnabled(true);
2525
project.setWork(false);
2626

27-
28-
2927
//ACT
3028
final ProjectColorDTO projectColorDTO = projectMapper.projectToProjectDTO(project);
3129
//Assert
3230
assertEquals(Color.BLUE.getBlue(), projectColorDTO.getColor().getBlue());
3331

3432
}
3533

36-
// @Test
37-
// void projectDTOToProject() {
38-
// //ARRANGE
39-
// ProjectColorDTO project = new ProjectColorDTO();
40-
// project.setName("ProjectName");
41-
// project.setDescription("ProjectDescription");
42-
// project.setColor();
43-
// project.setIndex(0);
44-
// project.setDefault(true);
45-
// project.setEnabled(true);
46-
// project.setWork(false);
47-
//
48-
////ColorDTO colorDTO;
49-
//
50-
// //ACT
51-
// final ProjectColorDTO projectColorDTO = new ProjectColorDTO("ddssdf","Test", colorDTO.getRed(),colorDTO.getBlue(),true,2,true);
52-
// Project project1= projectMapper.projectDTOToProject(projectColorDTO);
53-
// //Assert
54-
// assertEquals(Color.BLUE.getBlue(), projectColorDTO.getColor().getBlue());
55-
//
56-
// }
34+
@Test
35+
void projectDTOToProject() {
36+
// ARRANGE
37+
ColorDTO colorDTO = new ColorDTO();
38+
colorDTO.setRed(1.0);
39+
colorDTO.setGreen(0.0);
40+
colorDTO.setBlue(0.0);
41+
42+
ProjectColorDTO project = new ProjectColorDTO(1, "ProjectName", "ProjectDescription", colorDTO, false, 0, true);
43+
44+
// ACT
45+
final Project project1 = projectMapper.projectDTOToProject(project);
46+
47+
// ASSERT
48+
assertEquals(colorDTO.getBlue(), project1.getColor().getBlue());
49+
assertEquals("ProjectName", project1.getName());
50+
assertEquals("ProjectDescription", project1.getDescription());
51+
}
5752
}

0 commit comments

Comments
 (0)