diff --git a/src/main/java/ru/ulstu/is/cbapp/service/StudentService.java b/src/main/java/ru/ulstu/is/cbapp/service/StudentService.java index e971eae..a575d76 100644 --- a/src/main/java/ru/ulstu/is/cbapp/service/StudentService.java +++ b/src/main/java/ru/ulstu/is/cbapp/service/StudentService.java @@ -43,7 +43,7 @@ public class StudentService { } @Transactional - public Student updateDrivingSchool(Long id, String surname, String name, String phoneNumber) { + public Student updateStudent(Long id, String surname, String name, String phoneNumber) { if (!StringUtils.hasText(name) ||!StringUtils.hasText(surname) || !StringUtils.hasText(phoneNumber)) { throw new IllegalArgumentException("Student's data is null or empty"); } diff --git a/src/test/java/ru/ulstu/is/cbapp/DrivingSchoolServiceTests.java b/src/test/java/ru/ulstu/is/cbapp/DrivingSchoolServiceTests.java index 747b5ed..888ae41 100644 --- a/src/test/java/ru/ulstu/is/cbapp/DrivingSchoolServiceTests.java +++ b/src/test/java/ru/ulstu/is/cbapp/DrivingSchoolServiceTests.java @@ -57,10 +57,10 @@ public class DrivingSchoolServiceTests { public void testUpdateDrivingSchool() { drivingSchoolService.deleteAllDrivingSchools(); String name = "DrivingSchool1"; - drivingSchoolService.addDrivingSchool(name); + DrivingSchool ds = drivingSchoolService.addDrivingSchool(name); String name2 = "DrivingSchool2"; - drivingSchoolService.updateDrivingSchool(drivingSchoolService.findDrivingSchool(name).getId(), name2); - Assertions.assertNotNull(drivingSchoolService.findDrivingSchool(name2)); + drivingSchoolService.updateDrivingSchool(ds.getId(), name2); + Assertions.assertNotNull(drivingSchoolService.findDrivingSchool(ds.getId())); drivingSchoolService.deleteAllDrivingSchools(); } diff --git a/src/test/java/ru/ulstu/is/cbapp/StudentServiceTests.java b/src/test/java/ru/ulstu/is/cbapp/StudentServiceTests.java index a3968e2..2ed6daf 100644 --- a/src/test/java/ru/ulstu/is/cbapp/StudentServiceTests.java +++ b/src/test/java/ru/ulstu/is/cbapp/StudentServiceTests.java @@ -32,7 +32,7 @@ public class StudentServiceTests { final String newName = "name"; Student e = studentService.addStudent("surname", "name", "111"); - studentService.updateDrivingSchool(e.getId(),e.getSurname(), newName, e.getPhoneNumber()); + studentService.updateStudent(e.getId(),e.getSurname(), newName, e.getPhoneNumber()); Assertions.assertEquals(newName, studentService.findStudent(e.getId()).getName()); studentService.deleteAllStudents(); }