Oleja123/Internet-programming-UlSTU-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Пофиксил тесты

Browse Source
This commit is contained in:
gg12 darfren 2024-05-21 16:19:24 +04:00
parent 17f70e4061
commit 0fa5ae0f6c
4 changed files with 166 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
demo/data.mv.db
View File

Binary file not shown.

104
demo/src/test/java/com/example/demo/GroupServiceTests.java
View File

@ -21,67 +21,67 @@ import com.example.demo.users.service.UserService;
@SpringBootTest @SpringBootTest
@TestMethodOrder(OrderAnnotation.class) @TestMethodOrder(OrderAnnotation.class)
class GroupServiceTests { class GroupServiceTests {
// @Autowired @Autowired
// private GroupService groupService; private GroupService groupService;
// @Autowired @Autowired
// private UserService userService; private UserService userService;
// private GroupEntity group; private GroupEntity group;
// private UserEntity user; private UserEntity user;
// @BeforeEach @BeforeEach
// void createData() { void createData() {
// removeData(); removeData();
// user = userService.create(new UserEntity("oleg", "tester1", "1234")); user = userService.create(new UserEntity("tester1", "1234"));
// groupService.create(user.getId(), new GroupEntity("group1")); groupService.create(user.getId(), new GroupEntity("group1"));
// groupService.create(user.getId(), new GroupEntity("group2")); groupService.create(user.getId(), new GroupEntity("group2"));
// group = groupService.create(user.getId(), new GroupEntity("group3")); group = groupService.create(user.getId(), new GroupEntity("group3"));
// } }
// @AfterEach @AfterEach
// void removeData() { void removeData() {
// userService.getAll().forEach(item -> userService.delete(item.getId())); userService.getAll().forEach(item -> userService.delete(item.getId()));
// } }
// @Test @Test
// void getTest() { void getTest() {
// Assertions.assertThrows(NotFoundException.class, () -> groupService.get(0L)); Assertions.assertThrows(NotFoundException.class, () -> groupService.get(0L));
// } }
// @Test @Test
// void createTest() { void createTest() {
// Assertions.assertEquals(3, groupService.getAll(user.getId()).size()); Assertions.assertEquals(3, groupService.getAll(user.getId()).size());
// var res = groupService.get(group.getId()); var res = groupService.get(group.getId());
// Assertions.assertEquals(group, groupService.get(group.getId())); Assertions.assertEquals(group, groupService.get(group.getId()));
// } }
// @Test @Test
// void createNullableTest() { void createNullableTest() {
// final GroupEntity nullableGroup= new GroupEntity(null); final GroupEntity nullableGroup= new GroupEntity(null);
// Assertions.assertThrows(DataIntegrityViolationException.class, () -> groupService.create(user.getId(), nullableGroup)); Assertions.assertThrows(DataIntegrityViolationException.class, () -> groupService.create(user.getId(), nullableGroup));
// } }
// @Test @Test
// void updateTest() { void updateTest() {
// final String test = "TEST"; final String test = "TEST";
// final String oldName = group.getName(); final String oldName = group.getName();
// final GroupEntity newEntity = groupService.update(group.getId(), new GroupEntity(test)); final GroupEntity newEntity = groupService.update(group.getId(), new GroupEntity(test));
// Assertions.assertEquals(3, groupService.getAll(user.getId()).size()); Assertions.assertEquals(3, groupService.getAll(user.getId()).size());
// Assertions.assertEquals(newEntity, groupService.get(group.getId())); Assertions.assertEquals(newEntity, groupService.get(group.getId()));
// Assertions.assertEquals(test, newEntity.getName()); Assertions.assertEquals(test, newEntity.getName());
// Assertions.assertEquals(user, newEntity.getUser()); Assertions.assertEquals(user, newEntity.getUser());
// Assertions.assertNotEquals(oldName, newEntity.getName()); Assertions.assertNotEquals(oldName, newEntity.getName());
// } }
// @Test @Test
// void deleteTest() { void deleteTest() {
// groupService.delete(group.getId()); groupService.delete(group.getId());
// Assertions.assertEquals(2, groupService.getAll(user.getId()).size()); Assertions.assertEquals(2, groupService.getAll(user.getId()).size());
// final GroupEntity newEntity = groupService.create(user.getId(), new GroupEntity(group.getName())); final GroupEntity newEntity = groupService.create(user.getId(), new GroupEntity(group.getName()));
// Assertions.assertEquals(3, groupService.getAll(user.getId()).size()); Assertions.assertEquals(3, groupService.getAll(user.getId()).size());
// Assertions.assertNotEquals(group.getId(), newEntity.getId()); Assertions.assertNotEquals(group.getId(), newEntity.getId());
// } }
} }

105
demo/src/test/java/com/example/demo/MemberServiceTests.java
View File

@ -13,6 +13,7 @@ import org.springframework.boot.autoconfigure.security.SecurityProperties.User;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;
import com.example.demo.core.configuration.Constants;
import com.example.demo.core.error.NotFoundException; import com.example.demo.core.error.NotFoundException;
import com.example.demo.groups.model.GroupEntity; import com.example.demo.groups.model.GroupEntity;
import com.example.demo.groups.service.GroupService; import com.example.demo.groups.service.GroupService;
@ -34,66 +35,66 @@ class MemberServiceTests {
private GroupEntity group; private GroupEntity group;
private UserEntity user; private UserEntity user;
// @BeforeEach @BeforeEach
// void createData() { void createData() {
// removeData(); removeData();
// user = userService.create(new UserEntity("oleg", "tester1", "1234")); user = userService.create(new UserEntity("tester1", "1234"));
// group = groupService.create(user.getId(), new GroupEntity("group1")); group = groupService.create(user.getId(), new GroupEntity("group1"));
// member = memberService.create(group.getId(), new MemberEntity("member1", "mem1","expert", 1615L)); member = memberService.create(group.getId(), new MemberEntity("member1", "mem1","expert", 1615L));
// memberService.create(group.getId(), new MemberEntity("member1", "mem1","expert", 1712L)); memberService.create(group.getId(), new MemberEntity("member1", "mem1","expert", 1712L));
// memberService.create(group.getId(), new MemberEntity("member1", "mem1","expert", 1651L)); memberService.create(group.getId(), new MemberEntity("member1", "mem1","expert", 1651L));
// } }
// @AfterEach @AfterEach
// void removeData() { void removeData() {
// userService.getAll().forEach(item -> userService.delete(item.getId())); userService.getAll().forEach(item -> userService.delete(item.getId()));
// } }
// @Test @Test
// void getTest() { void getTest() {
// Assertions.assertThrows(NotFoundException.class, () -> memberService.get(0L)); Assertions.assertThrows(NotFoundException.class, () -> memberService.get(0L));
// } }
// @Test @Test
// void createTest() { void createTest() {
// Assertions.assertEquals(3, memberService.getAll(group.getId()).size()); Assertions.assertEquals(3, memberService.getAll(group.getId(), 0, Constants.DEFUALT_PAGE_SIZE).getContent().size());
// Assertions.assertEquals(member, memberService.get(member.getId())); Assertions.assertEquals(member, memberService.get(member.getId()));
// } }
// @Test @Test
// void createNullableTest() { void createNullableTest() {
// final MemberEntity nullableMember= new MemberEntity(null, null, null, null); final MemberEntity nullableMember= new MemberEntity(null, null, null, null);
// Assertions.assertThrows(DataIntegrityViolationException.class, () -> memberService.create(group.getId(), nullableMember)); Assertions.assertThrows(DataIntegrityViolationException.class, () -> memberService.create(group.getId(), nullableMember));
// } }
// @Test @Test
// void updateTest() { void updateTest() {
// final String test = "TEST"; final String test = "TEST";
// final String oldName = member.getName(); final String oldName = member.getName();
// final String oldHandle = member.getHandle(); final String oldHandle = member.getHandle();
// final String oldRank = member.getRank(); final String oldRank = member.getRank();
// final MemberEntity newEntity = memberService.update(member.getId(), new MemberEntity(test, test, test, null)); final MemberEntity newEntity = memberService.update(member.getId(), new MemberEntity(test, test, test, null));
// Assertions.assertEquals(3, memberService.getAll(group.getId()).size()); Assertions.assertEquals(3, memberService.getAll(group.getId(), 0, Constants.DEFUALT_PAGE_SIZE).getContent().size());
// Assertions.assertEquals(newEntity, memberService.get(member.getId())); Assertions.assertEquals(newEntity, memberService.get(member.getId()));
// Assertions.assertEquals(test, newEntity.getName()); Assertions.assertEquals(test, newEntity.getName());
// Assertions.assertEquals(test, newEntity.getHandle()); Assertions.assertEquals(test, newEntity.getHandle());
// Assertions.assertEquals(test, newEntity.getRank()); Assertions.assertEquals(test, newEntity.getRank());
// Assertions.assertNotEquals(oldName, newEntity.getName()); Assertions.assertNotEquals(oldName, newEntity.getName());
// Assertions.assertNotEquals(oldHandle, newEntity.getHandle()); Assertions.assertNotEquals(oldHandle, newEntity.getHandle());
// Assertions.assertNotEquals(oldRank, newEntity.getRank()); Assertions.assertNotEquals(oldRank, newEntity.getRank());
// } }
// @Test @Test
// void deleteTest() { void deleteTest() {
// memberService.delete(member.getId()); memberService.delete(member.getId());
// Assertions.assertEquals(2, memberService.getAll(group.getId()).size()); Assertions.assertEquals(2, memberService.getAll(group.getId(), 0, Constants.DEFUALT_PAGE_SIZE).getContent().size());
// final MemberEntity newEntity = memberService.create(group.getId(), new MemberEntity(member.getName(), member.getHandle(), member.getRank(), final MemberEntity newEntity = memberService.create(group.getId(), new MemberEntity(member.getName(), member.getHandle(), member.getRank(),
// member.getRating())); member.getRating()));
// Assertions.assertEquals(3, memberService.getAll(group.getId()).size()); Assertions.assertEquals(3, memberService.getAll(group.getId(), 0, Constants.DEFUALT_PAGE_SIZE).getContent().size());
// Assertions.assertNotEquals(member.getId(), newEntity.getId()); Assertions.assertNotEquals(member.getId(), newEntity.getId());
// } }
} }

131
demo/src/test/java/com/example/demo/UserServiceTests.java
View File

@ -14,87 +14,78 @@ import com.example.demo.users.service.UserService;
@SpringBootTest @SpringBootTest
class UserServiceTests { class UserServiceTests {
// @Autowired @Autowired
// private UserService userService; private UserService userService;
// private UserEntity user; private UserEntity user;
// @BeforeEach @BeforeEach
// void createData() { void createData() {
// removeData(); removeData();
// user = userService.create(new UserEntity("oleg", "tester1", "1234")); user = userService.create(new UserEntity("tester1", "1234"));
// userService.create(new UserEntity("arthur", "tester2", "123")); userService.create(new UserEntity("tester2", "123"));
// userService.create(new UserEntity("egor", "tester3", "12345")); userService.create(new UserEntity("tester3", "12345"));
// } }
// @AfterEach @AfterEach
// void removeData() { void removeData() {
// userService.getAll().forEach(item -> userService.delete(item.getId())); userService.getAll().forEach(item -> userService.delete(item.getId()));
// } }
// @Test @Test
// void getTest() { void getTest() {
// Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L)); Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L));
// } }
// @Test @Test
// void createTest() { void createTest() {
// Assertions.assertEquals(3, userService.getAll().size()); Assertions.assertEquals(3, userService.getAll().size());
// Long id = user.getId(); Long id = user.getId();
// var res = userService.get(user.getId()); var res = userService.get(user.getId());
// Assertions.assertEquals(user, userService.get(user.getId())); Assertions.assertEquals(user, userService.get(user.getId()));
// } }
// @Test @Test
// void createNotUniqueHandleTest() { void createNotUniqueHandleTest() {
// final UserEntity nonUniqueHandleUser = new UserEntity("oleg", "tester4", "1234"); final UserEntity nonUniqueHandleUser = new UserEntity("tester4", "1234");
// Assertions.assertThrows(IllegalArgumentException.class, () -> userService.create(nonUniqueHandleUser)); Assertions.assertThrows(IllegalArgumentException.class, () -> userService.create(nonUniqueHandleUser));
// } }
// @Test @Test
// void createNullableHandleTest() { void createNullableHandleTest() {
// final UserEntity nullableUser = new UserEntity(null, "asads", "asdsad"); final UserEntity nullableUser = new UserEntity("asads", "asdsad");
// Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser)); Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser));
// } }
// @Test @Test
// void createNullableEmailTest() { void createNullablePassswordTest() {
// final UserEntity nullableUser = new UserEntity("asads", null, "asdsad"); final UserEntity nullableUser = new UserEntity("asads", null);
// Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser)); Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser));
// } }
// @Test
// void createNullablePassswordTest() {
// final UserEntity nullableUser = new UserEntity("asads", "asads", null);
// Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser));
// }
// @Test @Test
// void updateTest() { void updateTest() {
// final String test = "TEST"; final String test = "TEST";
// final String oldHandle = user.getHandle(); final String oldHandle = user.getLogin();
// final String oldEmail = user.getEmail(); final String oldPassword = user.getPassword();
// final String oldPassword = user.getPassword(); final UserEntity newEntity = userService.update(user.getId(), new UserEntity(test,test));
// final UserEntity newEntity = userService.update(user.getId(), new UserEntity(test, test,test)); Assertions.assertEquals(3, userService.getAll().size());
// Assertions.assertEquals(3, userService.getAll().size()); Assertions.assertEquals(newEntity, userService.get(user.getId()));
// Assertions.assertEquals(newEntity, userService.get(user.getId())); Assertions.assertEquals(test, newEntity.getLogin());
// Assertions.assertEquals(test, newEntity.getHandle()); Assertions.assertEquals(test, newEntity.getPassword());
// Assertions.assertEquals(test, newEntity.getEmail()); Assertions.assertNotEquals(oldHandle, newEntity.getLogin());
// Assertions.assertEquals(test, newEntity.getPassword()); Assertions.assertNotEquals(oldPassword, newEntity.getPassword());
// Assertions.assertNotEquals(oldHandle, newEntity.getHandle()); }
// Assertions.assertNotEquals(oldEmail, newEntity.getEmail());
// Assertions.assertNotEquals(oldPassword, newEntity.getPassword());
// }
// @Test @Test
// void deleteTest() { void deleteTest() {
// userService.delete(user.getId()); userService.delete(user.getId());
// Assertions.assertEquals(2, userService.getAll().size()); Assertions.assertEquals(2, userService.getAll().size());
// final UserEntity newEntity = userService.create(new UserEntity(user.getHandle(), user.getEmail(), user.getPassword())); final UserEntity newEntity = userService.create(new UserEntity(user.getLogin(), user.getPassword()));
// Assertions.assertEquals(3, userService.getAll().size()); Assertions.assertEquals(3, userService.getAll().size());
// Assertions.assertNotEquals(user.getId(), newEntity.getId()); Assertions.assertNotEquals(user.getId(), newEntity.getId());
// } }
} }