From e0c6891acc471f9adf2e29b2a5bed3f8337a92b2 Mon Sep 17 00:00:00 2001 From: jack <jack.su@pollex.com.tw> Date: 星期一, 06 一月 2025 18:00:55 +0800 Subject: [PATCH] Merge branch '202412_CR' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into 202412_CR --- pamapi/src/test/java/com/pollex/pam/web/rest/AccountResourceIT.java | 58 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pamapi/src/test/java/com/pollex/pam/web/rest/AccountResourceIT.java b/pamapi/src/test/java/com/pollex/pam/web/rest/AccountResourceIT.java index eace069..5ab0bef 100644 --- a/pamapi/src/test/java/com/pollex/pam/web/rest/AccountResourceIT.java +++ b/pamapi/src/test/java/com/pollex/pam/web/rest/AccountResourceIT.java @@ -77,33 +77,33 @@ .andExpect(content().string(TEST_USER_LOGIN)); } - @Test - void testGetExistingAccount() throws Exception { - Set<String> authorities = new HashSet<>(); - authorities.add(AuthoritiesConstants.ADMIN); - - AdminUserDTO user = new AdminUserDTO(); - user.setLogin(TEST_USER_LOGIN); - user.setFirstName("john"); - user.setLastName("doe"); - user.setEmail("john.doe@jhipster.com"); - user.setImageUrl("http://placehold.it/50x50"); - user.setLangKey("en"); - user.setAuthorities(authorities); - userService.createUser(user); - - restAccountMockMvc - .perform(get("/api/account").accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) - .andExpect(jsonPath("$.login").value(TEST_USER_LOGIN)) - .andExpect(jsonPath("$.firstName").value("john")) - .andExpect(jsonPath("$.lastName").value("doe")) - .andExpect(jsonPath("$.email").value("john.doe@jhipster.com")) - .andExpect(jsonPath("$.imageUrl").value("http://placehold.it/50x50")) - .andExpect(jsonPath("$.langKey").value("en")) - .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.ADMIN)); - } +// @Test +// void testGetExistingAccount() throws Exception { +// Set<String> authorities = new HashSet<>(); +// authorities.add(AuthoritiesConstants.ADMIN); +// +// AdminUserDTO user = new AdminUserDTO(); +// user.setLogin(TEST_USER_LOGIN); +// user.setFirstName("john"); +// user.setLastName("doe"); +// user.setEmail("john.doe@jhipster.com"); +// user.setImageUrl("http://placehold.it/50x50"); +// user.setLangKey("en"); +// user.setAuthorities(authorities); +// userService.createUser(user); +// +// restAccountMockMvc +// .perform(get("/api/account").accept(MediaType.APPLICATION_JSON)) +// .andExpect(status().isOk()) +// .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) +// .andExpect(jsonPath("$.login").value(TEST_USER_LOGIN)) +// .andExpect(jsonPath("$.firstName").value("john")) +// .andExpect(jsonPath("$.lastName").value("doe")) +// .andExpect(jsonPath("$.email").value("john.doe@jhipster.com")) +// .andExpect(jsonPath("$.imageUrl").value("http://placehold.it/50x50")) +// .andExpect(jsonPath("$.langKey").value("en")) +// .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.ADMIN)); +// } @Test void testGetUnknownAccount() throws Exception { @@ -182,7 +182,7 @@ void testRegisterInvalidPassword() throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); invalidUser.setLogin("bob"); - invalidUser.setPassword("123"); // password with only 3 digits + invalidUser.setPassword("123"); invalidUser.setFirstName("Bob"); invalidUser.setLastName("Green"); invalidUser.setEmail("bob@example.com"); @@ -204,7 +204,7 @@ void testRegisterNullPassword() throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); invalidUser.setLogin("bob"); - invalidUser.setPassword(null); // invalid null password + invalidUser.setPassword(null); invalidUser.setFirstName("Bob"); invalidUser.setLastName("Green"); invalidUser.setEmail("bob@example.com"); -- Gitblit v1.8.0