Move default params function to static

leung018 · Nov 19, 2024 · 1b38f7c · 1b38f7c
1 parent ca8de69
commit 1b38f7c
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/test/java/com/leungcheng/spring_simple_backend/SpringSimpleBackendApplicationTests.java b/src/test/java/com/leungcheng/spring_simple_backend/SpringSimpleBackendApplicationTests.java
@@ -50,7 +50,7 @@ private void clearAccessToken() {
   }
 
   private String useNewUserAccessToken() throws Exception {
-    UserCredentials userCredentials = sampleUserCredentials();
+    UserCredentials userCredentials = UserCredentials.sample();
 
     signup(userCredentials).andExpect(status().isCreated());
     User user = userRepository.findByUsername(userCredentials.username).orElseThrow();
@@ -71,7 +71,7 @@ private String useNewUserAccessToken() throws Exception {
   public void shouldCreateAndGetProduct() throws Exception {
     useNewUserAccessToken();
 
-    CreateProductParams params = validParams();
+    CreateProductParams params = CreateProductParams.sample();
     MvcResult mvcResult =
         createProduct(params)
             .andExpect(status().isCreated())
@@ -107,11 +107,11 @@ public void shouldIgnoreIdWhenCreateProduct() throws Exception {
   public void shouldRejectCreateProductWithInvalidData() throws Exception {
     useNewUserAccessToken();
 
-    CreateProductParams params = validParams();
+    CreateProductParams params = CreateProductParams.sample();
     params.name = "";
     createProduct(params).andExpect(status().isBadRequest());
 
-    params = validParams();
+    params = CreateProductParams.sample();
     params.price = -1;
     createProduct(params).andExpect(status().isBadRequest());
   }
@@ -150,7 +150,7 @@ public void shouldRejectLoginWithNonexistentUsername() throws Exception {
   @Test
   public void shouldRejectNonAuthApiCallWithoutToken() throws Exception {
     clearAccessToken();
-    createProduct(validParams()).andExpect(status().isForbidden());
+    createProduct(CreateProductParams.sample()).andExpect(status().isForbidden());
   }
 
   @Test
@@ -162,23 +162,23 @@ public void shouldRejectIfAuthHeaderIsNotSetCorrectly() throws Exception {
             post("/products")
                 .contentType("application/json")
                 .header("Authorization", "NotBearer " + accessToken.orElseThrow())
-                .content(validParams().toContent()))
+                .content(CreateProductParams.sample().toContent()))
         .andExpect(status().isForbidden());
 
     mockMvc
         .perform(
             post("/products")
                 .contentType("application/json")
                 .header("Authorization", "Bearer ")
-                .content(validParams().toContent()))
+                .content(CreateProductParams.sample().toContent()))
         .andExpect(status().isForbidden());
   }
 
   @Test
   public void shouldCreateProductWithUserIdSameAsCreator() throws Exception {
     String userId = useNewUserAccessToken();
 
-    CreateProductParams params = validParams();
+    CreateProductParams params = CreateProductParams.sample();
     createProduct(params)
         .andExpect(status().isCreated())
         .andExpect(jsonPath("$.userId").value(userId));
@@ -189,6 +189,10 @@ private static class CreateProductParams {
     double price;
     int quantity;
 
+    private static CreateProductParams sample() {
+      return new CreateProductParams("Product 1", 1.0, 50);
+    }
+
     private CreateProductParams(String name, double price, int quantity) {
       this.name = name;
       this.price = price;
@@ -206,10 +210,6 @@ public String toContent() {
     }
   }
 
-  private CreateProductParams validParams() {
-    return new CreateProductParams("Product 1", 1.0, 50);
-  }
-
   private ResultActions createProduct(CreateProductParams params) throws Exception {
     MockHttpServletRequestBuilder builder =
         post("/products").contentType("application/json").content(params.toContent());
@@ -227,6 +227,10 @@ private static class UserCredentials {
     String username;
     String password;
 
+    private static UserCredentials sample() {
+      return new UserCredentials("sample-user", "sample-password");
+    }
+
     private UserCredentials(String username, String password) {
       this.username = username;
       this.password = password;
@@ -237,10 +241,6 @@ public String toContent() {
     }
   }
 
-  private UserCredentials sampleUserCredentials() {
-    return new UserCredentials("sample-user", "sample-password");
-  }
-
   private ResultActions signup(UserCredentials userCredentials) throws Exception {
     return mockMvc.perform(
         post("/signup").contentType("application/json").content(userCredentials.toContent()));