Skip to content

Commit 862810c

Browse files
ocielliottcocielliottc
committed
Updates to fix tests.
1 parent fd7fcbb commit 862810c

File tree

4 files changed

+43
-26
lines changed

4 files changed

+43
-26
lines changed

‎server/src/main/java/com/objectcomputing/checkins/services/member_skill/MemberSkill.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@ public class MemberSkill {
6262
public MemberSkill() {
6363
}
6464

65+
// Used in tests
66+
public MemberSkill(UUID memberid, UUID skillid) {
67+
this.memberid = memberid;
68+
this.skillid = skillid;
69+
}
70+
71+
// Used in tests
72+
public MemberSkill(UUID id, UUID memberid, UUID skillid) {
73+
this.id = id;
74+
this.memberid = memberid;
75+
this.skillid = skillid;
76+
}
77+
6578
public MemberSkill(UUID memberid, UUID skillid, String skilllevel, LocalDate lastuseddate, boolean interested) {
6679
this.memberid = memberid;
6780
this.skillid = skillid;

‎server/src/test/java/com/objectcomputing/checkins/services/fixture/MemberSkillFixture.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
public interface MemberSkillFixture extends RepositoryFixture{
1010

1111
default MemberSkill createMemberSkill(MemberProfile memberProfile, Skill skill, String skillLevel, LocalDate lastUsedDate) {
12-
return getMemberSkillRepository().save(new MemberSkill(memberProfile.getId(), skill.getId(), skillLevel, lastUsedDate));
12+
return getMemberSkillRepository().save(new MemberSkill(memberProfile.getId(), skill.getId(), skillLevel, lastUsedDate, true));
13+
}
14+
15+
default MemberSkill createMemberSkill(MemberProfile memberProfile, Skill skill, String skillLevel, LocalDate lastUsedDate, boolean interested) {
16+
return getMemberSkillRepository().save(new MemberSkill(memberProfile.getId(), skill.getId(), skillLevel, lastUsedDate, interested));
1317
}
1418
}

‎server/src/test/java/com/objectcomputing/checkins/services/member_skill/skillsreport/SkillsReportControllerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ void testValidRequestNonEmptyResponse() {
5050

5151
final MemberProfile memberProfile = createADefaultMemberProfile();
5252
final Skill skill = createADefaultSkill();
53-
final MemberSkill memberSkill = createMemberSkill(memberProfile, skill, SkillLevel.ADVANCED_LEVEL, LocalDate.now());
53+
final MemberSkill memberSkill = createMemberSkill(memberProfile, skill, SkillLevel.PRACTITIONER_LEVEL, LocalDate.now());
5454

5555
final SkillsReportRequestDTO skillsReportRequestDTO = new SkillsReportRequestDTO();
5656
final List<SkillLevelDTO> skillLevelDTOList = new ArrayList<>();
5757
final SkillLevelDTO skillLevelDTO = new SkillLevelDTO();
5858
skillLevelDTO.setId(skill.getId());
59-
skillLevelDTO.setLevel(SkillLevel.INTERMEDIATE);
59+
skillLevelDTO.setLevel(SkillLevel.PRACTITIONER);
6060
skillLevelDTOList.add(skillLevelDTO);
6161
skillsReportRequestDTO.setSkills(skillLevelDTOList);
6262

@@ -84,7 +84,7 @@ void testValidRequestEmptyResponse() {
8484

8585
final MemberProfile memberProfile = createADefaultMemberProfile();
8686
final Skill skill = createADefaultSkill();
87-
createMemberSkill(memberProfile, skill, SkillLevel.INTERMEDIATE_LEVEL, null);
87+
createMemberSkill(memberProfile, skill, SkillLevel.PRACTITIONER_LEVEL, null);
8888

8989
final SkillsReportRequestDTO skillsReportRequestDTO = new SkillsReportRequestDTO();
9090
final List<SkillLevelDTO> skillLevelDTOList = new ArrayList<>();
@@ -116,7 +116,7 @@ void testInvalidRequestSkillNotExist() {
116116
final SkillLevelDTO skillLevelDTO = new SkillLevelDTO();
117117
final UUID skillId = UUID.randomUUID();
118118
skillLevelDTO.setId(skillId);
119-
skillLevelDTO.setLevel(SkillLevel.ADVANCED);
119+
skillLevelDTO.setLevel(SkillLevel.PRACTITIONER);
120120
skillLevelDTOList.add(skillLevelDTO);
121121
skillsReportRequestDTO.setSkills(skillLevelDTOList);
122122

‎server/src/test/java/com/objectcomputing/checkins/services/member_skill/skillsreport/SkillsReportServicesImplTest.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void finalizeMocks() throws Exception {
7777
void testReportSkillNotExist() {
7878
final SkillLevelDTO dto = new SkillLevelDTO();
7979
dto.setId(UUID.randomUUID());
80-
dto.setLevel(SkillLevel.INTERMEDIATE);
80+
dto.setLevel(SkillLevel.PRACTITIONER);
8181

8282
final List<SkillLevelDTO> skills = new ArrayList<>();
8383
skills.add(dto);
@@ -127,15 +127,15 @@ void testReport() {
127127
final UUID memberId3 = UUID.randomUUID();
128128
final UUID memberId4 = UUID.randomUUID();
129129

130-
final MemberSkill ms1 = new MemberSkill(memberId1, skillId1, SkillLevel.INTERMEDIATE_LEVEL, LocalDate.now());
131-
final MemberSkill ms2 = new MemberSkill(memberId1, skillId2, SkillLevel.ADVANCED_LEVEL, LocalDate.now());
132-
final MemberSkill ms3 = new MemberSkill(memberId2, skillId3, SkillLevel.NOVICE_LEVEL, LocalDate.now());
133-
final MemberSkill ms4 = new MemberSkill(memberId2, skillId4, SkillLevel.EXPERT_LEVEL, LocalDate.now());
134-
final MemberSkill ms5 = new MemberSkill(memberId3, skillId2, SkillLevel.INTERESTED_LEVEL, LocalDate.now());
135-
final MemberSkill ms6 = new MemberSkill(memberId3, skillId3, SkillLevel.ADVANCED_LEVEL, LocalDate.now());
136-
final MemberSkill ms7 = new MemberSkill(memberId4, skillId1, SkillLevel.ADVANCED_LEVEL, LocalDate.now());
137-
final MemberSkill ms8 = new MemberSkill(memberId4, skillId2, SkillLevel.INTERMEDIATE_LEVEL, LocalDate.now());
138-
final MemberSkill ms9 = new MemberSkill(memberId4, skillId4, SkillLevel.EXPERT_LEVEL, LocalDate.now());
130+
final MemberSkill ms1 = new MemberSkill(memberId1, skillId1, SkillLevel.PRACTITIONER_LEVEL, LocalDate.now(), true);
131+
final MemberSkill ms2 = new MemberSkill(memberId1, skillId2, SkillLevel.PRACTITIONER_LEVEL, LocalDate.now(), false);
132+
final MemberSkill ms3 = new MemberSkill(memberId2, skillId3, SkillLevel.NOVICE_LEVEL, LocalDate.now(), true);
133+
final MemberSkill ms4 = new MemberSkill(memberId2, skillId4, SkillLevel.EXPERT_LEVEL, LocalDate.now(), false);
134+
final MemberSkill ms5 = new MemberSkill(memberId3, skillId2, SkillLevel.NONE_LEVEL, LocalDate.now(), true);
135+
final MemberSkill ms6 = new MemberSkill(memberId3, skillId3, SkillLevel.PRACTITIONER_LEVEL, LocalDate.now(), false);
136+
final MemberSkill ms7 = new MemberSkill(memberId4, skillId1, SkillLevel.PRACTITIONER_LEVEL, LocalDate.now(), true);
137+
final MemberSkill ms8 = new MemberSkill(memberId4, skillId2, SkillLevel.PRACTITIONER_LEVEL, LocalDate.now(), false);
138+
final MemberSkill ms9 = new MemberSkill(memberId4, skillId4, SkillLevel.EXPERT_LEVEL, LocalDate.now(), true);
139139

140140
final List<MemberSkill> skillList1 = new ArrayList<>();
141141
skillList1.add(ms1);
@@ -183,10 +183,10 @@ void testReport() {
183183
final SkillLevelDTO dto2 = new SkillLevelDTO();
184184
final SkillLevelDTO dto3 = new SkillLevelDTO();
185185
dto1.setId(skillId1);
186-
dto1.setLevel(SkillLevel.INTERMEDIATE);
186+
dto1.setLevel(SkillLevel.PRACTITIONER);
187187
dto2.setId(skillId2);
188188
dto3.setId(skillId3);
189-
dto3.setLevel(SkillLevel.ADVANCED);
189+
dto3.setLevel(SkillLevel.PRACTITIONER);
190190

191191
final List<SkillLevelDTO> requestedSkills1 = new ArrayList<>();
192192
requestedSkills1.add(dto1);
@@ -250,9 +250,9 @@ void testReport() {
250250
final SkillLevelDTO dto4 = new SkillLevelDTO();
251251
final SkillLevelDTO dto5 = new SkillLevelDTO();
252252
dto4.setId(skillId2);
253-
dto4.setLevel(SkillLevel.INTERMEDIATE);
253+
dto4.setLevel(SkillLevel.PRACTITIONER);
254254
dto5.setId(skillId4);
255-
dto5.setLevel(SkillLevel.ADVANCED);
255+
dto5.setLevel(SkillLevel.PRACTITIONER);
256256

257257
final List<SkillLevelDTO> requestedSkills2 = new ArrayList<>();
258258
requestedSkills2.add(dto4);
@@ -270,7 +270,7 @@ void testReport() {
270270
for (SkillLevelDTO skill : response4.getTeamMembers().get(0).getSkills()) {
271271
assertTrue(skill.getId().equals(skillId2) || skill.getId().equals(skillId4));
272272
if (skill.getId().equals(skillId2)) {
273-
assertEquals(SkillLevel.convertFromString(SkillLevel.INTERMEDIATE_LEVEL), skill.getLevel());
273+
assertEquals(SkillLevel.convertFromString(SkillLevel.PRACTITIONER_LEVEL), skill.getLevel());
274274
} else {
275275
assertEquals(SkillLevel.convertFromString(SkillLevel.EXPERT_LEVEL), skill.getLevel());
276276
}
@@ -287,9 +287,9 @@ private void assertReturnedMember1(TeamMemberSkillDTO elem, UUID skillId1, UUID
287287
for (SkillLevelDTO skill : elem.getSkills()) {
288288
assertTrue(skill.getId().equals(skillId1) || skill.getId().equals(skillId2));
289289
if (skill.getId().equals(skillId1)) {
290-
assertEquals(SkillLevel.convertFromString(SkillLevel.INTERMEDIATE_LEVEL), skill.getLevel());
290+
assertEquals(SkillLevel.convertFromString(SkillLevel.PRACTITIONER_LEVEL), skill.getLevel());
291291
} else {
292-
assertEquals(SkillLevel.convertFromString(SkillLevel.ADVANCED_LEVEL), skill.getLevel());
292+
assertEquals(SkillLevel.convertFromString(SkillLevel.PRACTITIONER_LEVEL), skill.getLevel());
293293
}
294294
}
295295
}
@@ -300,9 +300,9 @@ private void assertReturnedMember3(TeamMemberSkillDTO elem, UUID skillId2, UUID
300300
for (SkillLevelDTO skill : elem.getSkills()) {
301301
assertTrue(skill.getId().equals(skillId2) || skill.getId().equals(skillId3));
302302
if (skill.getId().equals(skillId2)) {
303-
assertEquals(SkillLevel.convertFromString(SkillLevel.INTERESTED_LEVEL), skill.getLevel());
303+
assertEquals(SkillLevel.convertFromString(SkillLevel.NONE_LEVEL), skill.getLevel());
304304
} else {
305-
assertEquals(SkillLevel.convertFromString(SkillLevel.ADVANCED_LEVEL), skill.getLevel());
305+
assertEquals(SkillLevel.convertFromString(SkillLevel.PRACTITIONER_LEVEL), skill.getLevel());
306306
}
307307
}
308308
}
@@ -313,9 +313,9 @@ private void assertReturnedMember4(TeamMemberSkillDTO elem, UUID skillId1, UUID
313313
for (SkillLevelDTO skill : elem.getSkills()) {
314314
assertTrue(skill.getId().equals(skillId1) || skill.getId().equals(skillId2));
315315
if (skill.getId().equals(skillId1)) {
316-
assertEquals(SkillLevel.convertFromString(SkillLevel.ADVANCED_LEVEL), skill.getLevel());
316+
assertEquals(SkillLevel.convertFromString(SkillLevel.PRACTITIONER_LEVEL), skill.getLevel());
317317
} else {
318-
assertEquals(SkillLevel.convertFromString(SkillLevel.INTERMEDIATE_LEVEL), skill.getLevel());
318+
assertEquals(SkillLevel.convertFromString(SkillLevel.PRACTITIONER_LEVEL), skill.getLevel());
319319
}
320320
}
321321
}

0 commit comments

Comments
 (0)