ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-23 01:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to 0.1.0

Browse Source 
update to 0.1.0
This commit is contained in:
jack ning
2024-04-30 09:37:49 +08:00
parent c58dfebfd4
commit c47c6db2a5
415 changed files with 15736 additions and 6076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/team/src/test/java/com/bytedesk/team/DepartmentControllerTests.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-02-02 09:13:26
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2024-02-02 10:12:12
* @LastEditTime: 2024-04-24 17:23:25
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -43,14 +43,14 @@ public class DepartmentControllerTests {
MockitoAnnotations.openMocks(this);
}
@SuppressWarnings("null")
// @SuppressWarnings("null")
@Test
public void testCreateSuccess() {
// Arrange
DepartmentRequest departmentRequest = new DepartmentRequest();
departmentRequest.setNickname("Test Department");
departmentRequest.setParent_did(null);
departmentRequest.setOrg_oid("f01f5444ecbc437cb5b8de7ca7dd023c");
departmentRequest.setName("Test Department");
departmentRequest.setParentDid(null);
departmentRequest.setOrgOid("f01f5444ecbc437cb5b8de7ca7dd023c");
// Act
ResponseEntity<JsonResult<?>> response = departmentController.create(departmentRequest);
@@ -68,8 +68,8 @@ public class DepartmentControllerTests {
// Arrange
DepartmentRequest departmentRequest = new DepartmentRequest();
departmentRequest.setDid("testDid");
departmentRequest.setParent_did(null);
departmentRequest.setOrg_oid("testOrgOid");
departmentRequest.setParentDid(null);
departmentRequest.setOrgOid("testOrgOid");
// Act
ResponseEntity<JsonResult<?>> response = departmentController.create(departmentRequest);

160
modules/team/src/test/java/com/bytedesk/team/DepartmentServiceTests.java
View File

@@ -1,101 +1,101 @@
package com.bytedesk.team;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
// import static org.junit.jupiter.api.Assertions.assertEquals;
// import static org.junit.jupiter.api.Assertions.assertNotNull;
// import static org.mockito.Mockito.when;
import java.util.Optional;
// import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
// import org.junit.jupiter.api.BeforeEach;
// import org.junit.jupiter.api.Test;
// import org.modelmapper.ModelMapper;
// import org.springframework.beans.factory.annotation.Autowired;
// import org.springframework.boot.test.context.SpringBootTest;
// import org.springframework.boot.test.mock.mockito.MockBean;
// import org.springframework.test.context.ActiveProfiles;
import com.bytedesk.core.auth.AuthService;
import com.bytedesk.core.rbac.user.User;
import com.bytedesk.team.department.Department;
import com.bytedesk.team.department.DepartmentRepository;
import com.bytedesk.team.department.DepartmentRequest;
import com.bytedesk.team.department.DepartmentService;
import com.bytedesk.team.organization.Organization;
import com.bytedesk.team.organization.OrganizationService;
import com.bytedesk.core.utils.Utils;
// import com.bytedesk.core.auth.AuthService;
// import com.bytedesk.core.rbac.user.User;
// import com.bytedesk.team.department.Department;
// import com.bytedesk.team.department.DepartmentRepository;
// import com.bytedesk.team.department.DepartmentRequest;
// import com.bytedesk.team.department.DepartmentService;
// import com.bytedesk.team.organization.Organization;
// import com.bytedesk.team.organization.OrganizationService;
// import com.bytedesk.core.utils.Utils;
@SpringBootTest
@ActiveProfiles("test")
public class DepartmentServiceTests {
// @SpringBootTest
// @ActiveProfiles("test")
// public class DepartmentServiceTests {
@Autowired
private DepartmentService departmentService;
// @Autowired
// private DepartmentService departmentService;
@MockBean
private ModelMapper modelMapper;
// @MockBean
// private ModelMapper modelMapper;
@MockBean
private AuthService authService;
// @MockBean
// private AuthService authService;
@MockBean
private OrganizationService organizationService;
// @MockBean
// private OrganizationService organizationService;
@MockBean
private DepartmentRepository departmentRepository;
// @MockBean
// private DepartmentRepository departmentRepository;
private DepartmentRequest departmentRequest;
private User user;
private Organization organization;
// private DepartmentRequest departmentRequest;
// private User user;
// private Organization organization;
@BeforeEach
public void setUp() {
departmentRequest = new DepartmentRequest();
departmentRequest.setDescription("Test department");
departmentRequest.setParent_did("parentDid");
departmentRequest.setOrg_oid("f01f5444ecbc437cb5b8de7ca7dd023c");
departmentRequest.setId(1L);
departmentRequest.setDid(Utils.getUid());
departmentRequest.setNickname("Test Department");
departmentRequest.setAvatar("testAvatar");
// @BeforeEach
// public void setUp() {
// departmentRequest = new DepartmentRequest();
// departmentRequest.setDescription("Test department");
// departmentRequest.setParent_did("parentDid");
// departmentRequest.setOrgOid("f01f5444ecbc437cb5b8de7ca7dd023c");
// departmentRequest.setId(1L);
// departmentRequest.setDid(Utils.getUid());
// departmentRequest.setNickname("Test Department");
// departmentRequest.setAvatar("testAvatar");
user = new User();
user.setUsername("testUser");
// user = new User();
// user.setUsername("testUser");
organization = new Organization();
// organization = new Organization();
when(authService.getCurrentUser()).thenReturn(user);
when(organizationService.findByOid(departmentRequest.getOrg_oid())).thenReturn(Optional.of(organization));
when(modelMapper.map(departmentRequest, Department.class)).thenAnswer(invocation -> {
Department dept = new Department();
dept.setDid(departmentRequest.getDid());
dept.setOrganization(organization);
dept.setUser(user);
return dept;
});
}
// when(authService.getCurrentUser()).thenReturn(user);
// when(organizationService.findByOid(departmentRequest.getOrgOid())).thenReturn(Optional.of(organization));
// when(modelMapper.map(departmentRequest, Department.class)).thenAnswer(invocation -> {
// Department dept = new Department();
// dept.setDid(departmentRequest.getDid());
// dept.setOrganization(organization);
// // dept.setUser(user);
// return dept;
// });
// }
@Test
public void testCreateDepartmentWithValidRequest() {
// Act
Department createdDepartment = departmentService.create(departmentRequest);
// @Test
// public void testCreateDepartmentWithValidRequest() {
// // Act
// Department createdDepartment = departmentService.create(departmentRequest);
// Assert
assertNotNull(createdDepartment);
assertEquals(departmentRequest.getDid(), createdDepartment.getDid());
assertEquals(organization, createdDepartment.getOrganization());
assertEquals(user, createdDepartment.getUser());
// // Assert
// assertNotNull(createdDepartment);
// assertEquals(departmentRequest.getDid(), createdDepartment.getDid());
// assertEquals(organization, createdDepartment.getOrganization());
// // assertEquals(user, createdDepartment.getUser());
// Verify that the repository's save method is called
// verify(departmentRepository).save(any(Department.class));
}
// // Verify that the repository's save method is called
// // verify(departmentRepository).save(any(Department.class));
// }
@Test
public void testCreateDepartmentWithNonExistingOrgOid() {
// Arrange
when(organizationService.findByOid(departmentRequest.getOrg_oid())).thenReturn(Optional.empty());
// @Test
// public void testCreateDepartmentWithNonExistingOrgOid() {
// // Arrange
// when(organizationService.findByOid(departmentRequest.getOrgOid())).thenReturn(Optional.empty());
// Act & Assert
// Department createdDepartment = departmentService.create(departmentRequest);
// assertNull(createdDepartment);
}
}
// // Act & Assert
// // Department createdDepartment = departmentService.create(departmentRequest);
// // assertNull(createdDepartment);
// }
// }

3
modules/team/src/test/java/com/bytedesk/team/OrganizationServiceTests.java
View File

@@ -20,7 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import com.bytedesk.core.auth.AuthService;
import com.bytedesk.core.rbac.auth.AuthService;
import com.bytedesk.team.organization.OrganizationRepository;
import com.bytedesk.team.organization.OrganizationService;