Hexagonal pattern: move business logic to core
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package com.iluwatar.hexagonal.lottery;
|
||||
package com.iluwatar.hexagonal.domain;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
@@ -30,22 +30,15 @@ import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import com.iluwatar.hexagonal.domain.*;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.iluwatar.hexagonal.administration.LotteryAdministration;
|
||||
import com.iluwatar.hexagonal.administration.LotteryAdministrationImpl;
|
||||
import com.iluwatar.hexagonal.banking.WireTransfers;
|
||||
import com.iluwatar.hexagonal.banking.WireTransfersImpl;
|
||||
import com.iluwatar.hexagonal.database.LotteryTicketRepository;
|
||||
import com.iluwatar.hexagonal.database.LotteryTicketInMemoryRepository;
|
||||
import com.iluwatar.hexagonal.domain.LotteryNumbers;
|
||||
import com.iluwatar.hexagonal.domain.LotteryTicket;
|
||||
import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult;
|
||||
import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult.CheckResult;
|
||||
import com.iluwatar.hexagonal.domain.LotteryTicketId;
|
||||
import com.iluwatar.hexagonal.service.LotteryService;
|
||||
import com.iluwatar.hexagonal.service.LotteryServiceImpl;
|
||||
import com.iluwatar.hexagonal.test.LotteryTestUtils;
|
||||
|
||||
/**
|
||||
@@ -55,8 +48,7 @@ import com.iluwatar.hexagonal.test.LotteryTestUtils;
|
||||
*/
|
||||
public class LotteryTest {
|
||||
|
||||
private final LotteryAdministration admin = new LotteryAdministrationImpl();
|
||||
private final LotteryService service = new LotteryServiceImpl();
|
||||
private final LotterySystem lotterySystem = new LotterySystemImpl();
|
||||
private final LotteryTicketRepository repository = new LotteryTicketInMemoryRepository();
|
||||
private final WireTransfers wireTransfers = new WireTransfersImpl();
|
||||
|
||||
@@ -72,34 +64,34 @@ public class LotteryTest {
|
||||
wireTransfers.setFunds("123-12312", 100);
|
||||
|
||||
// admin resets the lottery
|
||||
admin.resetLottery();
|
||||
assertEquals(admin.getAllSubmittedTickets().size(), 0);
|
||||
lotterySystem.resetLottery();
|
||||
assertEquals(lotterySystem.getAllSubmittedTickets().size(), 0);
|
||||
|
||||
// players submit the lottery tickets
|
||||
Optional<LotteryTicketId> ticket1 = service.submitTicket(LotteryTestUtils.createLotteryTicket("cvt@bbb.com",
|
||||
Optional<LotteryTicketId> ticket1 = lotterySystem.submitTicket(LotteryTestUtils.createLotteryTicket("cvt@bbb.com",
|
||||
"123-12312", "+32425255", new HashSet<>(Arrays.asList(1, 2, 3, 4))));
|
||||
assertTrue(ticket1.isPresent());
|
||||
Optional<LotteryTicketId> ticket2 = service.submitTicket(LotteryTestUtils.createLotteryTicket("ant@bac.com",
|
||||
Optional<LotteryTicketId> ticket2 = lotterySystem.submitTicket(LotteryTestUtils.createLotteryTicket("ant@bac.com",
|
||||
"123-12312", "+32423455", new HashSet<>(Arrays.asList(11, 12, 13, 14))));
|
||||
assertTrue(ticket2.isPresent());
|
||||
Optional<LotteryTicketId> ticket3 = service.submitTicket(LotteryTestUtils.createLotteryTicket("arg@boo.com",
|
||||
Optional<LotteryTicketId> ticket3 = lotterySystem.submitTicket(LotteryTestUtils.createLotteryTicket("arg@boo.com",
|
||||
"123-12312", "+32421255", new HashSet<>(Arrays.asList(6, 8, 13, 19))));
|
||||
assertTrue(ticket3.isPresent());
|
||||
assertEquals(admin.getAllSubmittedTickets().size(), 3);
|
||||
assertEquals(lotterySystem.getAllSubmittedTickets().size(), 3);
|
||||
|
||||
// perform lottery
|
||||
LotteryNumbers winningNumbers = admin.performLottery();
|
||||
LotteryNumbers winningNumbers = lotterySystem.performLottery();
|
||||
|
||||
// cheat a bit for testing sake, use winning numbers to submit another ticket
|
||||
Optional<LotteryTicketId> ticket4 = service.submitTicket(LotteryTestUtils.createLotteryTicket("lucky@orb.com",
|
||||
Optional<LotteryTicketId> ticket4 = lotterySystem.submitTicket(LotteryTestUtils.createLotteryTicket("lucky@orb.com",
|
||||
"123-12312", "+12421255", winningNumbers.getNumbers()));
|
||||
assertTrue(ticket4.isPresent());
|
||||
assertEquals(admin.getAllSubmittedTickets().size(), 4);
|
||||
assertEquals(lotterySystem.getAllSubmittedTickets().size(), 4);
|
||||
|
||||
// check winners
|
||||
Map<LotteryTicketId, LotteryTicket> tickets = admin.getAllSubmittedTickets();
|
||||
Map<LotteryTicketId, LotteryTicket> tickets = lotterySystem.getAllSubmittedTickets();
|
||||
for (LotteryTicketId id: tickets.keySet()) {
|
||||
LotteryTicketCheckResult checkResult = service.checkTicketForPrize(id, winningNumbers);
|
||||
LotteryTicketCheckResult checkResult = lotterySystem.checkTicketForPrize(id, winningNumbers);
|
||||
assertTrue(checkResult.getResult() != CheckResult.TICKET_NOT_SUBMITTED);
|
||||
if (checkResult.getResult().equals(CheckResult.WIN_PRIZE)) {
|
||||
assertTrue(checkResult.getPrizeAmount() > 0);
|
||||
@@ -109,7 +101,7 @@ public class LotteryTest {
|
||||
}
|
||||
|
||||
// check another ticket that has not been submitted
|
||||
LotteryTicketCheckResult checkResult = service.checkTicketForPrize(new LotteryTicketId(), winningNumbers);
|
||||
LotteryTicketCheckResult checkResult = lotterySystem.checkTicketForPrize(new LotteryTicketId(), winningNumbers);
|
||||
assertTrue(checkResult.getResult() == CheckResult.TICKET_NOT_SUBMITTED);
|
||||
assertEquals(checkResult.getPrizeAmount(), 0);
|
||||
}
|
Reference in New Issue
Block a user