Skip to content

Commit

Permalink
test: update test code
Browse files Browse the repository at this point in the history
  • Loading branch information
@songyi00
songyi00 committed Feb 26, 2024
1 parent c737f8e commit 57e0cff
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 23 deletions.
11 changes: 5 additions & 6 deletions ...erver/src/test/java/nexters/payout/apiserver/stock/application/StockQueryServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Month;
import java.util.List;
import java.util.Optional;

Expand Down Expand Up @@ -77,11 +76,11 @@ class StockQueryServiceTest {
// given
LocalDate now = LocalDate.now();
int lastYear = LocalDate.now(UTC).getYear() - 1;
Instant paymentDate = LocalDate.of(lastYear, now.getMonth(), now.getDayOfMonth()).atStartOfDay().toInstant(UTC);
Instant exDividendDate = LocalDate.of(lastYear, now.getMonth(), now.getDayOfMonth()).atStartOfDay().toInstant(UTC);
Double expectedPrice = 2.0;
Double expectedDividend = 0.5;
Stock aapl = StockFixture.createStock(AAPL, Sector.TECHNOLOGY, 2.0);
Dividend dividend = DividendFixture.createDividend(aapl.getId(), 0.5, paymentDate);
Dividend dividend = DividendFixture.createDividendWithExDividendDate(aapl.getId(), 0.5, exDividendDate);

given(stockRepository.findByTicker(any())).willReturn(Optional.of(aapl));
given(dividendRepository.findAllByStockId(any())).willReturn(List.of(dividend));
Expand All @@ -103,9 +102,9 @@ class StockQueryServiceTest {
// given
LocalDate now = LocalDate.now();
int lastYear = now.getYear() - 1;
Instant paymentDate = LocalDate.of(lastYear, now.getMonth(), now.getDayOfMonth()).atStartOfDay().toInstant(UTC);
Instant exDividendDate = LocalDate.of(lastYear, now.getMonth(), now.getDayOfMonth()).atStartOfDay().toInstant(UTC);
Stock appl = StockFixture.createStock(AAPL, Sector.TECHNOLOGY, 2.0);
Dividend dividend = DividendFixture.createDividend(appl.getId(), 0.5, paymentDate);
Dividend dividend = DividendFixture.createDividendWithPaymentDate(appl.getId(), 0.5, exDividendDate);

given(stockRepository.findByTicker(any())).willReturn(Optional.of(appl));
given(dividendRepository.findAllByStockId(any())).willReturn(List.of(dividend));
Expand Down Expand Up @@ -157,7 +156,7 @@ class StockQueryServiceTest {
void 배당락일이_다가오는_주식_리스트를_가져온다() {
// given
Stock stock = StockFixture.createStock(AAPL, TECHNOLOGY);
Dividend expected = DividendFixture.createDividend(stock.getId(), LocalDateTime.now().plusDays(1).toInstant(UTC));
Dividend expected = DividendFixture.createDividendWithPaymentDate(stock.getId(), LocalDateTime.now().plusDays(1).toInstant(UTC));
given(stockRepository.findUpcomingDividendStock(1, 10))
.willReturn(List.of(new StockDividendDto(stock, expected)));

Expand Down
2 changes: 1 addition & 1 deletion ...est/java/nexters/payout/apiserver/stock/presentation/integration/StockControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ class StockControllerTest extends IntegrationTest {
Double dividend = 12.0;
Stock tsla = stockRepository.save(StockFixture.createStock(TSLA, Sector.CONSUMER_CYCLICAL, price));
Instant paymentDate = LocalDate.of(2023, 4, 5).atStartOfDay().toInstant(UTC);
dividendRepository.save(DividendFixture.createDividend(tsla.getId(), dividend, paymentDate));
dividendRepository.save(DividendFixture.createDividendWithPaymentDate(tsla.getId(), dividend, paymentDate));

// when, then
StockDetailResponse stockDetailResponse = RestAssured
Expand Down
4 changes: 2 additions & 2 deletions batch/src/test/java/nexters/payout/batch/application/DividendBatchServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void setUp() {

// given
Stock stock = stockRepository.save(StockFixture.createStock(AAPL, 12.51, 120000));
Dividend expected = DividendFixture.createDividend(stock.getId());
Dividend expected = DividendFixture.createDividendWithPaymentDate(stock.getId());

List<FinancialClient.DividendData> responses = new ArrayList<>();
responses.add(new FinancialClient.DividendData(
Expand Down Expand Up @@ -145,7 +145,7 @@ void setUp() {
void 새로운_미래_배당금_정보를_생성한다() {
// given
Stock stock = stockRepository.save(StockFixture.createStock(AAPL, 12.51, 120000));
Dividend expected = DividendFixture.createDividend(stock.getId());
Dividend expected = DividendFixture.createDividendWithPaymentDate(stock.getId());
Instant expectedDate = LocalDateTime.now().plusDays(1).toInstant(UTC);

List<FinancialClient.DividendData> responses = new ArrayList<>();
Expand Down
14 changes: 7 additions & 7 deletions domain/src/test/java/nexters/payout/domain/stock/service/DividendAnalysisServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ class DividendAnalysisServiceTest {
Instant julPaymentDate = LocalDate.of(lastYear, 7, 3).atStartOfDay().toInstant(UTC);
Instant fakePaymentDate = LocalDate.of(LocalDate.now().getYear(), 8, 3).atStartOfDay().toInstant(UTC);

Dividend janDividend = DividendFixture.createDividend(stock.getId(), janPaymentDate);
Dividend aprDividend = DividendFixture.createDividend(stock.getId(), aprPaymentDate);
Dividend julDividend = DividendFixture.createDividend(stock.getId(), julPaymentDate);
Dividend fakeDividend = DividendFixture.createDividend(stock.getId(), fakePaymentDate);
Dividend janDividend = DividendFixture.createDividendWithPaymentDate(stock.getId(), janPaymentDate);
Dividend aprDividend = DividendFixture.createDividendWithPaymentDate(stock.getId(), aprPaymentDate);
Dividend julDividend = DividendFixture.createDividendWithPaymentDate(stock.getId(), julPaymentDate);
Dividend fakeDividend = DividendFixture.createDividendWithPaymentDate(stock.getId(), fakePaymentDate);

// when
List<Month> actual = dividendAnalysisService.calculateDividendMonths(stock, List.of(janDividend, aprDividend, julDividend, fakeDividend));
Expand All @@ -52,7 +52,7 @@ class DividendAnalysisServiceTest {
Stock stock = StockFixture.createStock(StockFixture.AAPL, Sector.TECHNOLOGY);
Instant fakePaymentDate = LocalDate.of(LocalDate.now().getYear(), 8, 3).atStartOfDay().toInstant(UTC);

Dividend fakeDividend = DividendFixture.createDividend(stock.getId(), fakePaymentDate);
Dividend fakeDividend = DividendFixture.createDividendWithPaymentDate(stock.getId(), fakePaymentDate);

// when
List<Month> actual = dividendAnalysisService.calculateDividendMonths(stock, List.of(fakeDividend));
Expand All @@ -78,13 +78,13 @@ class DividendAnalysisServiceTest {
// given
LocalDate now = LocalDate.now();

Dividend pastDividend = DividendFixture.createDividend(
Dividend pastDividend = DividendFixture.createDividendWithPaymentDate(
UUID.randomUUID(),
LocalDate.of(now.getYear() - 1, 1, 10)
.atStartOfDay(ZoneId.systemDefault()).toInstant()
);

Dividend earlistDividend = DividendFixture.createDividend(
Dividend earlistDividend = DividendFixture.createDividendWithPaymentDate(
UUID.randomUUID(),
LocalDate.of(now.getYear() - 1, 3, 10)
.atStartOfDay(ZoneId.systemDefault()).toInstant()
Expand Down
14 changes: 7 additions & 7 deletions domain/src/testFixtures/java/nexters/payout/domain/DividendFixture.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.UUID;

public class DividendFixture {
public static Dividend createDividend(UUID stockId, Double dividend) {
public static Dividend createDividendWithPaymentDate(UUID stockId, Double dividend) {
return new Dividend(
UUID.randomUUID(),
stockId,
Expand All @@ -17,24 +17,24 @@ public static Dividend createDividend(UUID stockId, Double dividend) {
);
}

public static Dividend createDividend(UUID stockId, Instant paymentDate) {
public static Dividend createDividendWithPaymentDate(UUID stockId, Instant exDividendDate) {
return new Dividend(
UUID.randomUUID(),
stockId,
12.21,
exDividendDate,
Instant.parse("2023-12-21T00:00:00Z"),
paymentDate,
Instant.parse("2023-12-22T00:00:00Z"));
}

public static Dividend createDividend(UUID stockId, Double dividend, Instant paymentDate) {
public static Dividend createDividendWithPaymentDate(UUID stockId, Double dividend, Instant paymentDate) {
return new Dividend(
UUID.randomUUID(),
stockId,
dividend,
Instant.parse("2023-12-21T00:00:00Z"),
paymentDate,
Instant.parse("2023-12-22T00:00:00Z"));
paymentDate,
paymentDate);
}

public static Dividend createDividendWithExDividendDate(UUID stockId, Double dividend, Instant exDividendDate) {
Expand All @@ -47,7 +47,7 @@ public static Dividend createDividendWithExDividendDate(UUID stockId, Double div
exDividendDate);
}

public static Dividend createDividend(UUID stockId) {
public static Dividend createDividendWithPaymentDate(UUID stockId) {
return new Dividend(
UUID.randomUUID(),
stockId,
Expand Down

0 comments on commit 57e0cff

Please sign in to comment.