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/UserResourceIT.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/pamapi/src/test/java/com/pollex/pam/web/rest/UserResourceIT.java b/pamapi/src/test/java/com/pollex/pam/web/rest/UserResourceIT.java
index 069730b..b1357ef 100644
--- a/pamapi/src/test/java/com/pollex/pam/web/rest/UserResourceIT.java
+++ b/pamapi/src/test/java/com/pollex/pam/web/rest/UserResourceIT.java
@@ -7,14 +7,13 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import com.pollex.pam.IntegrationTest;
-import com.pollex.pam.domain.Authority;
-import com.pollex.pam.domain.User;
-import com.pollex.pam.repository.UserRepository;
-import com.pollex.pam.security.AuthoritiesConstants;
-import com.pollex.pam.service.dto.AdminUserDTO;
-import com.pollex.pam.service.dto.UserDTO;
-import com.pollex.pam.service.mapper.UserMapper;
-import com.pollex.pam.web.rest.vm.ManagedUserVM;
+import com.pollex.pam.business.domain.Authority;
+import com.pollex.pam.business.domain.User;
+import com.pollex.pam.business.repository.UserRepository;
+import com.pollex.pam.business.security.AuthoritiesConstants;
+import com.pollex.pam.business.service.dto.AdminUserDTO;
+import com.pollex.pam.business.service.mapper.UserMapper;
+import com.pollex.pam.business.web.vm.ManagedUserVM;
import java.time.Instant;
import java.util.*;
import java.util.function.Consumer;
@@ -43,8 +42,8 @@
private static final Long DEFAULT_ID = 1L;
- private static final String DEFAULT_PASSWORD = "passjohndoe";
- private static final String UPDATED_PASSWORD = "passjhipster";
+ private static final String DEFAULT_PAXXWORD = "passjohndoe";
+ private static final String UPDATED_PAXXWORD = "passjhipster";
private static final String DEFAULT_EMAIL = "johndoe@localhost";
private static final String UPDATED_EMAIL = "jhipster@localhost";
@@ -126,7 +125,7 @@
// Create the User
ManagedUserVM managedUserVM = new ManagedUserVM();
managedUserVM.setLogin(DEFAULT_LOGIN);
- managedUserVM.setPassword(DEFAULT_PASSWORD);
+ managedUserVM.setPassword(DEFAULT_PAXXWORD);
managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
managedUserVM.setLastName(DEFAULT_LASTNAME);
managedUserVM.setEmail(DEFAULT_EMAIL);
@@ -162,7 +161,7 @@
ManagedUserVM managedUserVM = new ManagedUserVM();
managedUserVM.setId(DEFAULT_ID);
managedUserVM.setLogin(DEFAULT_LOGIN);
- managedUserVM.setPassword(DEFAULT_PASSWORD);
+ managedUserVM.setPassword(DEFAULT_PAXXWORD);
managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
managedUserVM.setLastName(DEFAULT_LASTNAME);
managedUserVM.setEmail(DEFAULT_EMAIL);
@@ -191,7 +190,7 @@
ManagedUserVM managedUserVM = new ManagedUserVM();
managedUserVM.setLogin(DEFAULT_LOGIN); // this login should already be used
- managedUserVM.setPassword(DEFAULT_PASSWORD);
+ managedUserVM.setPassword(DEFAULT_PAXXWORD);
managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
managedUserVM.setLastName(DEFAULT_LASTNAME);
managedUserVM.setEmail("anothermail@localhost");
@@ -220,7 +219,7 @@
ManagedUserVM managedUserVM = new ManagedUserVM();
managedUserVM.setLogin("anotherlogin");
- managedUserVM.setPassword(DEFAULT_PASSWORD);
+ managedUserVM.setPassword(DEFAULT_PAXXWORD);
managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
managedUserVM.setLastName(DEFAULT_LASTNAME);
managedUserVM.setEmail(DEFAULT_EMAIL); // this email should already be used
@@ -301,7 +300,7 @@
ManagedUserVM managedUserVM = new ManagedUserVM();
managedUserVM.setId(updatedUser.getId());
managedUserVM.setLogin(updatedUser.getLogin());
- managedUserVM.setPassword(UPDATED_PASSWORD);
+ managedUserVM.setPassword(UPDATED_PAXXWORD);
managedUserVM.setFirstName(UPDATED_FIRSTNAME);
managedUserVM.setLastName(UPDATED_LASTNAME);
managedUserVM.setEmail(UPDATED_EMAIL);
@@ -345,7 +344,7 @@
ManagedUserVM managedUserVM = new ManagedUserVM();
managedUserVM.setId(updatedUser.getId());
managedUserVM.setLogin(UPDATED_LOGIN);
- managedUserVM.setPassword(UPDATED_PASSWORD);
+ managedUserVM.setPassword(UPDATED_PAXXWORD);
managedUserVM.setFirstName(UPDATED_FIRSTNAME);
managedUserVM.setLastName(UPDATED_LASTNAME);
managedUserVM.setEmail(UPDATED_EMAIL);
--
Gitblit v1.8.0