hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

cate userId from entity UserRoleAssignment

Browse Source 
(it comes implicitly through the relationship)
This commit is contained in:
Michael Hoennig
2019-04-30 17:58:56 +02:00
parent 084c12d2c4
commit 3c89878c21
23 changed files with 44 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java
View File

@ -53,8 +53,8 @@ public class CustomerResourceIntTest {
private static final Integer DEFAULT_REFERENCE = 10000;
private static final Integer UPDATED_REFERENCE = 10001;
private static final String DEFAULT_PREFIX = "xfl";
private static final String UPDATED_PREFIX = "x0";
private static final String DEFAULT_PREFIX = "z4a";
private static final String UPDATED_PREFIX = "dr";
private static final String DEFAULT_NAME = "AAAAAAAAAA";
private static final String UPDATED_NAME = "BBBBBBBBBB";

94
src/test/java/org/hostsharing/hsadminng/web/rest/UserRoleAssignmentResourceIntTest.java
View File

@ -50,9 +50,6 @@ public class UserRoleAssignmentResourceIntTest {
private static final Long DEFAULT_ENTITY_OBJECT_ID = 1L;
private static final Long UPDATED_ENTITY_OBJECT_ID = 2L;
private static final Long DEFAULT_USER_ID = 1L;
private static final Long UPDATED_USER_ID = 2L;
private static final UserRole DEFAULT_ASSIGNED_ROLE = UserRole.HOSTMASTER;
private static final UserRole UPDATED_ASSIGNED_ROLE = UserRole.ADMIN;
@ -109,7 +106,6 @@ public class UserRoleAssignmentResourceIntTest {
UserRoleAssignment userRoleAssignment = new UserRoleAssignment()
.entityTypeId(DEFAULT_ENTITY_TYPE_ID)
.entityObjectId(DEFAULT_ENTITY_OBJECT_ID)
.userId(DEFAULT_USER_ID)
.assignedRole(DEFAULT_ASSIGNED_ROLE);
return userRoleAssignment;
}
@ -137,7 +133,6 @@ public class UserRoleAssignmentResourceIntTest {
UserRoleAssignment testUserRoleAssignment = userRoleAssignmentList.get(userRoleAssignmentList.size() - 1);
assertThat(testUserRoleAssignment.getEntityTypeId()).isEqualTo(DEFAULT_ENTITY_TYPE_ID);
assertThat(testUserRoleAssignment.getEntityObjectId()).isEqualTo(DEFAULT_ENTITY_OBJECT_ID);
assertThat(testUserRoleAssignment.getUserId()).isEqualTo(DEFAULT_USER_ID);
assertThat(testUserRoleAssignment.getAssignedRole()).isEqualTo(DEFAULT_ASSIGNED_ROLE);
}
@ -161,25 +156,6 @@ public class UserRoleAssignmentResourceIntTest {
assertThat(userRoleAssignmentList).hasSize(databaseSizeBeforeCreate);
}
@Test
@Transactional
public void checkUserIdIsRequired() throws Exception {
int databaseSizeBeforeTest = userRoleAssignmentRepository.findAll().size();
// set the field null
userRoleAssignment.setUserId(null);
// Create the UserRoleAssignment, which fails.
restUserRoleAssignmentMockMvc.perform(
post("/api/user-role-assignments")
.contentType(TestUtil.APPLICATION_JSON_UTF8)
.content(TestUtil.convertObjectToJsonBytes(userRoleAssignment)))
.andExpect(status().isBadRequest());
List<UserRoleAssignment> userRoleAssignmentList = userRoleAssignmentRepository.findAll();
assertThat(userRoleAssignmentList).hasSize(databaseSizeBeforeTest);
}
@Test
@Transactional
public void checkAssignedRoleIsRequired() throws Exception {
@ -212,7 +188,6 @@ public class UserRoleAssignmentResourceIntTest {
.andExpect(jsonPath("$.[*].id").value(hasItem(userRoleAssignment.getId().intValue())))
.andExpect(jsonPath("$.[*].entityTypeId").value(hasItem(DEFAULT_ENTITY_TYPE_ID.toString())))
.andExpect(jsonPath("$.[*].entityObjectId").value(hasItem(DEFAULT_ENTITY_OBJECT_ID.intValue())))
.andExpect(jsonPath("$.[*].userId").value(hasItem(DEFAULT_USER_ID.intValue())))
.andExpect(jsonPath("$.[*].assignedRole").value(hasItem(DEFAULT_ASSIGNED_ROLE.toString())));
}
@ -229,7 +204,6 @@ public class UserRoleAssignmentResourceIntTest {
.andExpect(jsonPath("$.id").value(userRoleAssignment.getId().intValue()))
.andExpect(jsonPath("$.entityTypeId").value(DEFAULT_ENTITY_TYPE_ID.toString()))
.andExpect(jsonPath("$.entityObjectId").value(DEFAULT_ENTITY_OBJECT_ID.intValue()))
.andExpect(jsonPath("$.userId").value(DEFAULT_USER_ID.intValue()))
.andExpect(jsonPath("$.assignedRole").value(DEFAULT_ASSIGNED_ROLE.toString()));
}
@ -338,71 +312,6 @@ public class UserRoleAssignmentResourceIntTest {
defaultUserRoleAssignmentShouldBeFound("entityObjectId.lessThan=" + UPDATED_ENTITY_OBJECT_ID);
}
@Test
@Transactional
public void getAllUserRoleAssignmentsByUserIdIsEqualToSomething() throws Exception {
// Initialize the database
userRoleAssignmentRepository.saveAndFlush(userRoleAssignment);
// Get all the userRoleAssignmentList where userId equals to DEFAULT_USER_ID
defaultUserRoleAssignmentShouldBeFound("userId.equals=" + DEFAULT_USER_ID);
// Get all the userRoleAssignmentList where userId equals to UPDATED_USER_ID
defaultUserRoleAssignmentShouldNotBeFound("userId.equals=" + UPDATED_USER_ID);
}
@Test
@Transactional
public void getAllUserRoleAssignmentsByUserIdIsInShouldWork() throws Exception {
// Initialize the database
userRoleAssignmentRepository.saveAndFlush(userRoleAssignment);
// Get all the userRoleAssignmentList where userId in DEFAULT_USER_ID or UPDATED_USER_ID
defaultUserRoleAssignmentShouldBeFound("userId.in=" + DEFAULT_USER_ID + "," + UPDATED_USER_ID);
// Get all the userRoleAssignmentList where userId equals to UPDATED_USER_ID
defaultUserRoleAssignmentShouldNotBeFound("userId.in=" + UPDATED_USER_ID);
}
@Test
@Transactional
public void getAllUserRoleAssignmentsByUserIdIsNullOrNotNull() throws Exception {
// Initialize the database
userRoleAssignmentRepository.saveAndFlush(userRoleAssignment);
// Get all the userRoleAssignmentList where userId is not null
defaultUserRoleAssignmentShouldBeFound("userId.specified=true");
// Get all the userRoleAssignmentList where userId is null
defaultUserRoleAssignmentShouldNotBeFound("userId.specified=false");
}
@Test
@Transactional
public void getAllUserRoleAssignmentsByUserIdIsGreaterThanOrEqualToSomething() throws Exception {
// Initialize the database
userRoleAssignmentRepository.saveAndFlush(userRoleAssignment);
// Get all the userRoleAssignmentList where userId greater than or equals to DEFAULT_USER_ID
defaultUserRoleAssignmentShouldBeFound("userId.greaterOrEqualThan=" + DEFAULT_USER_ID);
// Get all the userRoleAssignmentList where userId greater than or equals to UPDATED_USER_ID
defaultUserRoleAssignmentShouldNotBeFound("userId.greaterOrEqualThan=" + UPDATED_USER_ID);
}
@Test
@Transactional
public void getAllUserRoleAssignmentsByUserIdIsLessThanSomething() throws Exception {
// Initialize the database
userRoleAssignmentRepository.saveAndFlush(userRoleAssignment);
// Get all the userRoleAssignmentList where userId less than or equals to DEFAULT_USER_ID
defaultUserRoleAssignmentShouldNotBeFound("userId.lessThan=" + DEFAULT_USER_ID);
// Get all the userRoleAssignmentList where userId less than or equals to UPDATED_USER_ID
defaultUserRoleAssignmentShouldBeFound("userId.lessThan=" + UPDATED_USER_ID);
}
@Test
@Transactional
public void getAllUserRoleAssignmentsByAssignedRoleIsEqualToSomething() throws Exception {
@ -470,7 +379,6 @@ public class UserRoleAssignmentResourceIntTest {
.andExpect(jsonPath("$.[*].id").value(hasItem(userRoleAssignment.getId().intValue())))
.andExpect(jsonPath("$.[*].entityTypeId").value(hasItem(DEFAULT_ENTITY_TYPE_ID)))
.andExpect(jsonPath("$.[*].entityObjectId").value(hasItem(DEFAULT_ENTITY_OBJECT_ID.intValue())))
.andExpect(jsonPath("$.[*].userId").value(hasItem(DEFAULT_USER_ID.intValue())))
.andExpect(jsonPath("$.[*].assignedRole").value(hasItem(DEFAULT_ASSIGNED_ROLE.toString())));
// Check, that the count call also returns 1
@ -520,7 +428,6 @@ public class UserRoleAssignmentResourceIntTest {
updatedUserRoleAssignment
.entityTypeId(UPDATED_ENTITY_TYPE_ID)
.entityObjectId(UPDATED_ENTITY_OBJECT_ID)
.userId(UPDATED_USER_ID)
.assignedRole(UPDATED_ASSIGNED_ROLE);
restUserRoleAssignmentMockMvc.perform(
@ -535,7 +442,6 @@ public class UserRoleAssignmentResourceIntTest {
UserRoleAssignment testUserRoleAssignment = userRoleAssignmentList.get(userRoleAssignmentList.size() - 1);
assertThat(testUserRoleAssignment.getEntityTypeId()).isEqualTo(UPDATED_ENTITY_TYPE_ID);
assertThat(testUserRoleAssignment.getEntityObjectId()).isEqualTo(UPDATED_ENTITY_OBJECT_ID);
assertThat(testUserRoleAssignment.getUserId()).isEqualTo(UPDATED_USER_ID);
assertThat(testUserRoleAssignment.getAssignedRole()).isEqualTo(UPDATED_ASSIGNED_ROLE);
}

4
src/test/javascript/spec/app/entities/user-role-assignment/user-role-assignment.service.spec.ts
View File

@ -21,7 +21,7 @@ describe('Service Tests', () => {
service = injector.get(UserRoleAssignmentService);
httpMock = injector.get(HttpTestingController);
elemDefault = new UserRoleAssignment(0, 'AAAAAAA', 0, 0, UserRole.HOSTMASTER);
elemDefault = new UserRoleAssignment(0, 'AAAAAAA', 0, UserRole.HOSTMASTER);
});
describe('Service methods', async () => {
@ -57,7 +57,6 @@ describe('Service Tests', () => {
{
entityTypeId: 'BBBBBB',
entityObjectId: 1,
userId: 1,
assignedRole: 'BBBBBB'
},
elemDefault
@ -77,7 +76,6 @@ describe('Service Tests', () => {
{
entityTypeId: 'BBBBBB',
entityObjectId: 1,
userId: 1,
assignedRole: 'BBBBBB'
},
elemDefault