BENCH-269 refactors to CategoryService unit tests

Author: AndyFlintAnswerDigital

…ilder/AddCategoryRequestTestBuilder.java …/builder/CategoryRequestTestBuilder.javasrc/test/java/com/answerdigital/answerking/builder/AddCategoryRequestTestBuilder.java renamed to src/test/java/com/answerdigital/answerking/builder/CategoryRequestTestBuilder.java src/test/java/com/answerdigital/answerking/builder/AddCategoryRequestTestBuilder.java renamed to src/test/java/com/answerdigital/answerking/builder/CategoryRequestTestBuilder.java

@@ -2,24 +2,30 @@
 
 import com.answerdigital.answerking.request.CategoryRequest;
 
-public class AddCategoryRequestTestBuilder {
+public class CategoryRequestTestBuilder {
 
     private String name;
 
     private String description;
 
-    public AddCategoryRequestTestBuilder withDefaultValues() {
+    public CategoryRequestTestBuilder withDefaultAddRequestValues() {
         this.name = "Burgers";
         this.description = "A selection of delicious burgers.";
         return this;
     }
 
-    public AddCategoryRequestTestBuilder withName(final String name) {
+    public CategoryRequestTestBuilder withDefaultUpdateRequestValues() {
+        this.name = "Pizzas";
+        this.description = "Italian style stone baked pizzas.";
+        return this;
+    }
+
+    public CategoryRequestTestBuilder withName(final String name) {
         this.name = name;
         return this;
     }
 
-    public AddCategoryRequestTestBuilder withDescription(final String description) {
+    public CategoryRequestTestBuilder withDescription(final String description) {
         this.description = description;
         return this;
     }

src/test/java/com/answerdigital/answerking/builder/CategoryTestBuilder.java

@@ -9,7 +9,7 @@
 
 public class CategoryTestBuilder {
 
-    private Long id = 1L;
+    private Long id;
 
     private String name;
 
@@ -27,8 +27,8 @@ public CategoryTestBuilder withDefaultValues() {
         this.id = 1L;
         this.name = "Burgers";
         this.description = "A selection of delicious burgers.";
-        this.createdOn = LocalDateTime.now();
-        this.lastUpdated = LocalDateTime.now();
+        this.createdOn = LocalDateTime.of(2022, 1, 1, 0, 0);
+        this.lastUpdated = LocalDateTime.of(2022, 1, 1, 0, 0);
         this.retired = false;
         this.products = new HashSet<>();
         return this;

src/test/java/com/answerdigital/answerking/builder/UpdateCategoryRequestTestBuilder.java

@@ -1,9 +1,8 @@
 package com.answerdigital.answerking.service;
 
-import com.answerdigital.answerking.builder.AddCategoryRequestTestBuilder;
+import com.answerdigital.answerking.builder.CategoryRequestTestBuilder;
 import com.answerdigital.answerking.builder.CategoryTestBuilder;
 import com.answerdigital.answerking.builder.ProductTestBuilder;
-import com.answerdigital.answerking.builder.UpdateCategoryRequestTestBuilder;
 import com.answerdigital.answerking.exception.custom.NameUnavailableException;
 import com.answerdigital.answerking.exception.custom.ProductAlreadyPresentException;
 import com.answerdigital.answerking.exception.custom.RetirementException;
@@ -45,18 +44,15 @@ final class CategoryServiceTest {
 
     private final CategoryTestBuilder categoryTestBuilder;
 
-    private final AddCategoryRequestTestBuilder addCategoryRequestTestBuilder;
-
-    private final UpdateCategoryRequestTestBuilder updateCategoryRequestTestBuilder;
+    private final CategoryRequestTestBuilder categoryRequestTestBuilder;
 
     private final ProductTestBuilder productTestBuilder;
 
     private static final Long NONEXISTENT_CATEGORY_ID = 2L;
 
     private CategoryServiceTest() {
         categoryTestBuilder = new CategoryTestBuilder();
-        addCategoryRequestTestBuilder = new AddCategoryRequestTestBuilder();
-        updateCategoryRequestTestBuilder = new UpdateCategoryRequestTestBuilder();
+        categoryRequestTestBuilder = new CategoryRequestTestBuilder();
         productTestBuilder = new ProductTestBuilder();
     }
 
@@ -73,7 +69,7 @@ void tearDown() {
     @Test
     void testAddCategory() {
         // given
-        final CategoryRequest addCategoryRequest = addCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest addCategoryRequest = categoryRequestTestBuilder.withDefaultAddRequestValues().build();
         final Category expectedResponse = categoryTestBuilder.withDefaultValues().build();
 
         // when
@@ -94,7 +90,7 @@ void testAddCategory() {
     @Test
     void testAddCategoryThatAlreadyExists() {
         // given
-        final CategoryRequest addCategoryRequest = addCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest addCategoryRequest = categoryRequestTestBuilder.withDefaultAddRequestValues().build();
 
         // when
         doReturn(true).when(categoryRepository).existsByName(anyString());
@@ -110,17 +106,11 @@ void testAddCategoryThatAlreadyExists() {
     void testUpdateCategory() {
         // given
         final Category existingCategory = categoryTestBuilder.withDefaultValues().build();
-        final CategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
-        final Category expectedResponse = categoryTestBuilder
-                .withDefaultValues()
+        final CategoryRequest updateCategoryRequest = categoryRequestTestBuilder.withDefaultUpdateRequestValues().build();
+        final Category expectedResponse = categoryTestBuilder.withDefaultValues()
                 .withName(updateCategoryRequest.name())
                 .withDescription(updateCategoryRequest.description())
                 .build();
-        final var categoryResponse = CategoryResponse.builder()
-                .id(1L)
-                .name("Pizzas")
-                .description("Italian style stone baked pizzas.")
-                .build();
 
         // when
         doReturn(false).when(categoryRepository).existsByNameAndIdIsNot(anyString(), anyLong());
@@ -130,7 +120,7 @@ void testUpdateCategory() {
         final CategoryResponse response = categoryService.updateCategory(updateCategoryRequest, existingCategory.getId());
 
         // then
-        assertEquals(categoryResponse.getName(), response.getName());
+        assertEquals(expectedResponse.getName(), response.getName());
         verify(categoryRepository).existsByNameAndIdIsNot(anyString(), anyLong());
         verify(categoryRepository).findById(anyLong());
         verify(categoryRepository).save(any(Category.class));
@@ -139,7 +129,7 @@ void testUpdateCategory() {
     @Test
     void testUpdateCategoryThatDoesNotExist() {
         // given
-        final CategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest updateCategoryRequest = categoryRequestTestBuilder.withDefaultUpdateRequestValues().build();
 
         // when
         doReturn(false).when(categoryRepository).existsByNameAndIdIsNot(anyString(), anyLong());
@@ -157,7 +147,7 @@ void testUpdateCategoryThatDoesNotExist() {
     void testUpdateCategoryNameToCategoryThatAlreadyExists() {
         // given
         final Category existingCategory = categoryTestBuilder.withDefaultValues().build();
-        final CategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest updateCategoryRequest = categoryRequestTestBuilder.withDefaultUpdateRequestValues().build();
 
         // when
         doReturn(true).when(categoryRepository).existsByNameAndIdIsNot(anyString(), anyLong());
@@ -173,8 +163,7 @@ void testUpdateCategoryNameToCategoryThatAlreadyExists() {
     void testAddProductToCategoryThatIsAlreadyInCategory() {
         // given
         final Product product = productTestBuilder.withDefaultValues().build();
-        final Category category = categoryTestBuilder
-                .withDefaultValues()
+        final Category category = categoryTestBuilder.withDefaultValues()
                 .withProduct(product)
                 .build();
 
@@ -209,8 +198,7 @@ void testAddProductToCategoryThatDoesNotExist() {
     void testRemoveProductFromCategory() {
         // given
         final Product product = productTestBuilder.withDefaultValues().build();
-        final Category category = categoryTestBuilder
-                .withDefaultValues()
+        final Category category = categoryTestBuilder.withDefaultValues()
                 .withProduct(product)
                 .build();
         final Category expectedResponse = categoryTestBuilder.withDefaultValues().build();
@@ -266,15 +254,9 @@ void testRemoveProductFromCategoryThatDoesNotExist() {
     void testRetireCategory() {
         // given
         final Category category = categoryTestBuilder.withDefaultValues().build();
-        final Category expectedCategory = categoryTestBuilder
-                .withDefaultValues()
+        final Category expectedCategory = categoryTestBuilder.withDefaultValues()
                 .withRetired(true)
                 .build();
-        final var categoryResponse = CategoryResponse.builder()
-                .id(1L)
-                .name("Pizzas")
-                .description("Italian style stone baked pizzas.")
-                .build();
 
         // when
         doReturn(Optional.of(category)).when(categoryRepository).findById(anyLong());
@@ -290,8 +272,7 @@ void testRetireCategory() {
     @Test
     void testRetireCategoryAlreadyRetiredThrowsRetirementException() {
         // given
-        final Category retiredCategory = categoryTestBuilder
-                .withDefaultValues()
+        final Category retiredCategory = categoryTestBuilder.withDefaultValues()
                 .withRetired(true)
                 .build();