Skip to content

Commit 6d8a6ed

Browse files
committed
ТЗ 10 исправлен, перенесен в другой проект. исправлены для автотестов
1 parent d245e2d commit 6d8a6ed

4 files changed

Lines changed: 31 additions & 28 deletions

File tree

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<dependency>
2525
<groupId>org.projectlombok</groupId>
2626
<artifactId>lombok</artifactId>
27+
<version>1.18.34</version>
2728
<scope>provided</scope>
2829
</dependency>
2930
<dependency>
@@ -39,7 +40,7 @@
3940
<dependency>
4041
<groupId>org.springframework.boot</groupId>
4142
<artifactId>spring-boot-starter-validation</artifactId>
42-
<version>3.3.4</version>
43+
4344
</dependency>
4445
<dependency>
4546
<groupId>org.slf4j</groupId>
@@ -80,6 +81,7 @@
8081
<plugin>
8182
<groupId>org.springframework.boot</groupId>
8283
<artifactId>spring-boot-maven-plugin</artifactId>
84+
<version>3.3.1</version>
8385
</plugin>
8486
</plugins>
8587
</build>

src/test/java/ru/yandex/practicum/filmorate/FilmControllerTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,76 +23,76 @@ void setUp() {
2323
}
2424

2525
@Test
26-
public void FilmNullName() {
26+
public void filmNullName() {
2727
film.setName(null);
2828
exception = Assertions.assertThrows(ValidationNullException.class, () -> validate.validateFilm(film));
2929
Assertions.assertEquals("название пустое", exception.getMessage());
3030
}
3131

3232
@Test
33-
public void FilmNullDescription() {
33+
public void filmNullDescription() {
3434
film.setDescription(null);
3535
exception = Assertions.assertThrows(ValidationNullException.class, () -> validate.validateFilm(film));
3636
Assertions.assertEquals("описание пустое", exception.getMessage());
3737
}
3838

3939
@Test
40-
public void FilmNullReleaseDate() {
40+
public void filmNullReleaseDate() {
4141
film.setReleaseDate(null);
4242
exception = Assertions.assertThrows(ValidationNullException.class, () -> validate.validateFilm(film));
4343
Assertions.assertEquals("дата выпуска не заполнена", exception.getMessage());
4444
}
4545

4646
@Test
47-
public void FilmEmptyName() {
47+
public void filmEmptyName() {
4848
film.setName("");
4949
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateFilm(film));
5050
Assertions.assertEquals("название пустое", exception.getMessage());
5151
}
5252

5353
@Test
54-
public void FilmEmptyDescription() {
54+
public void filmEmptyDescription() {
5555
film.setDescription("");
5656
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateFilm(film));
5757
Assertions.assertEquals("описание пустое", exception.getMessage());
5858
}
5959

6060
@Test
61-
public void FilmMax200Description() {
61+
public void filmMax200Description() {
6262
film.setDescription(Strings.repeat("*", 220));
6363
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateFilm(film));
6464
Assertions.assertEquals("превышает количество символов", exception.getMessage());
6565
}
6666

6767
@Test
68-
public void FilmMax201Description() {
68+
public void filmMax201Description() {
6969
film.setDescription(Strings.repeat("*", 201));
7070
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateFilm(film));
7171
Assertions.assertEquals("превышает количество символов", exception.getMessage());
7272
}
7373

7474
@Test
75-
public void FilmMax199Description() {
75+
public void filmMax199Description() {
7676
film.setDescription(Strings.repeat("*", 199));
7777
Assertions.assertDoesNotThrow(() -> validate.validateFilm(film));
7878
}
7979

8080
@Test
81-
public void FilmNotReleaseDate() {
81+
public void filmNotReleaseDate() {
8282
film.setReleaseDate(LocalDate.MIN);
8383
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateFilm(film));
8484
Assertions.assertEquals("дата выпуска раньше 28 декабря 1895", exception.getMessage());
8585
}
8686

8787
@Test
88-
public void FilmPositiveDuration() {
88+
public void filmPositiveDuration() {
8989
film.setDuration(-4);
9090
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateFilm(film));
9191
Assertions.assertEquals("продолжительность <= 0", exception.getMessage());
9292
}
9393

9494
@Test
95-
public void FilmIs0Duration() {
95+
public void filmIs0Duration() {
9696
film.setDuration(0);
9797
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateFilm(film));
9898
Assertions.assertEquals("продолжительность <= 0", exception.getMessage());

src/test/java/ru/yandex/practicum/filmorate/UserControllerTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,70 +23,70 @@ void setUp() {
2323
}
2424

2525
@Test
26-
public void UserNullEmail() {
26+
public void userNullEmail() {
2727
user.setEmail(null);
2828
exception = Assertions.assertThrows(ValidationNullException.class, () -> validate.validateUser(user));
2929
Assertions.assertEquals("email пустой", exception.getMessage());
3030
}
3131

3232
@Test
33-
public void UserNullLogin() {
33+
public void userNullLogin() {
3434
user.setLogin(null);
3535
exception = Assertions.assertThrows(ValidationNullException.class, () -> validate.validateUser(user));
3636
Assertions.assertEquals("login пустой", exception.getMessage());
3737
}
3838

3939
@Test
40-
public void UserNullName() {
40+
public void userNullName() {
4141
user.setName(null);
4242
validate.validateUser(user);
4343
Assertions.assertEquals(user.getLogin(), user.getName(), " имя не заполнено, должно присвоенно как login");
4444
}
4545

4646
@Test
47-
public void UserNullBirthday() {
47+
public void userNullBirthday() {
4848
user.setBirthday(null);
4949
exception = Assertions.assertThrows(ValidationNullException.class, () -> validate.validateUser(user));
5050
Assertions.assertEquals("дата пустая", exception.getMessage());
5151
}
5252

5353
@Test
54-
public void UserEmptyEmail() {
54+
public void userEmptyEmail() {
5555
user.setEmail("");
5656
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateUser(user));
5757
Assertions.assertEquals("email пустой", exception.getMessage());
5858
}
5959

6060
@Test
61-
public void UserEmptyLogin() {
61+
public void userEmptyLogin() {
6262
user.setLogin("");
6363
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateUser(user));
6464
Assertions.assertEquals("login пустой", exception.getMessage());
6565
}
6666

6767
@Test
68-
public void UserOtherName() {
68+
public void userOtherName() {
6969
user.setName("");
7070
validate.validateUser(user);
7171
Assertions.assertEquals(user.getLogin(), user.getName(), " имя не заполнено, должно присвоенно как login");
7272
}
7373

7474
@Test
75-
public void UserNotEmail() {
75+
public void userNotEmail() {
7676
user.setEmail("yaya.ru");
7777
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateUser(user));
7878
Assertions.assertEquals("введен не email", exception.getMessage());
7979
}
8080

8181
@Test
82-
public void UserWhitespaceLogin() {
82+
public void userWhitespaceLogin() {
8383
user.setLogin("login login");
8484
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateUser(user));
8585
Assertions.assertEquals("присутствуют пробелы", exception.getMessage());
8686
}
8787

8888
@Test
89-
public void UserFutureBirthday() {
89+
public void userFutureBirthday() {
9090
user.setBirthday(LocalDate.now().plusYears(3));
9191
exception = Assertions.assertThrows(ValidationException.class, () -> validate.validateUser(user));
9292
Assertions.assertEquals("введена дата из будущего", exception.getMessage());

src/test/java/ru/yandex/practicum/filmorate/ValidateTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ void setUp() {
2626
}
2727

2828
@Test
29-
void ValidatorUserOk() {
29+
void validatorUserOk() {
3030
User user = new User(1L, "name@yabex.ru", "log", "name", LocalDate.now().minusYears(3));
3131
Set<ConstraintViolation<User>> violations = validator.validate(user);
3232
assertTrue(violations.isEmpty());
3333
}
3434

3535
@Test
36-
void ValidatorUserTest() {
36+
void validatorUserTest() {
3737
User user = new User(1L, "nameyabex.ru", "log", "name", LocalDate.now().plusYears(3));
3838
Set<ConstraintViolation<User>> violations = validator.validate(user);
3939
assertFalse(violations.isEmpty());
@@ -43,7 +43,7 @@ void ValidatorUserTest() {
4343
}
4444

4545
@Test
46-
void ValidatorUserNotNull() {
46+
void validatorUserNotNull() {
4747
User user = new User(1L, null, null, "name", null);
4848
Set<ConstraintViolation<User>> violations = validator.validate(user);
4949
assertFalse(violations.isEmpty());
@@ -53,14 +53,14 @@ void ValidatorUserNotNull() {
5353
}
5454

5555
@Test
56-
void ValidatorFilmOk() {
56+
void validatorFilmOk() {
5757
Film film = new Film(1L, "kino", "kino o kine", LocalDate.of(1990, 02, 22), 25);
5858
Set<ConstraintViolation<Film>> violations = validator.validate(film);
5959
assertTrue(violations.isEmpty());
6060
}
6161

6262
@Test
63-
void ValidatorFilmTest() {
63+
void validatorFilmTest() {
6464
Film film = new Film(1L, "kino", Strings.repeat("*", 220),
6565
LocalDate.now().plusYears(3), -12);
6666
Set<ConstraintViolation<Film>> violations = validator.validate(film);
@@ -71,7 +71,7 @@ void ValidatorFilmTest() {
7171
}
7272

7373
@Test
74-
void ValidatorFilmNotNull() {
74+
void validatorFilmNotNull() {
7575
Film film = new Film(1L, null, null,
7676
null, 0);
7777
Set<ConstraintViolation<Film>> violations = validator.validate(film);
@@ -82,3 +82,4 @@ void ValidatorFilmNotNull() {
8282
}
8383

8484
}
85+

0 commit comments

Comments
 (0)