Skip to content

Commit

Permalink
style: (#68) 개행 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
aiaiaiai1 committed Jul 20, 2023
1 parent faf6fc6 commit 3cecd49
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public ResponseEntity<Void> removeFavoriteCategory(final Member member, @PathVar
@ApiResponse(responseCode = "200", description = "조회 성공")
@GetMapping
public ResponseEntity<List<CategoryResponse>> getAllCategories(final Member member) {
List<CategoryResponse> categories = categoryService.getAllCategories(member);
final List<CategoryResponse> categories = categoryService.getAllCategories(member);
return ResponseEntity.status(HttpStatus.OK).body(categories);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
package com.votogether.domain.category.contorller;

import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.doNothing;

import com.votogether.domain.category.dto.response.CategoryResponse;
import com.votogether.domain.category.entity.Category;
import com.votogether.domain.category.service.CategoryService;
import io.restassured.module.mockmvc.RestAssuredMockMvc;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
Expand All @@ -21,6 +13,15 @@
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpStatus;

import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.doNothing;

@WebMvcTest(CategoryController.class)
class CategoryControllerTest {

Expand Down Expand Up @@ -76,15 +77,14 @@ void getAllCategoriesFromMember() {
given(categoryService.getAllCategories(any())).willReturn(categoryResponses);

// when
List<CategoryResponse> results = RestAssuredMockMvc.
given().log().all()
List<CategoryResponse> results = RestAssuredMockMvc
.given().log().all()
.when().get("/categories")
.then().log().all()
.status(HttpStatus.OK)
.extract()
.as(
new ParameterizedTypeReference<List<CategoryResponse>>() {
}.getType());
.as(new ParameterizedTypeReference<List<CategoryResponse>>() {
}.getType());

// then
assertThat(results).usingRecursiveComparison().isEqualTo(categoryResponses);
Expand Down

0 comments on commit 3cecd49

Please sign in to comment.