lab 3_2

.gitignore

@@ -2,3 +2,4 @@
 /.settings/
 /.classpath
 /.project
+/.vscode

src/main/java/edu/iis/mto/time/Order.java

@@ -1,5 +1,6 @@
 package edu.iis.mto.time;
 
+import java.time.Clock;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -10,32 +11,37 @@ public class Order {
     private static final long VALID_PERIOD_HOURS = 24;
     private State orderState;
     private List<OrderItem> items = new ArrayList<>();
-    private LocalDateTime subbmitionDate;
+    private LocalDateTime submissionDate;
+    private final Clock clock;
 
     public Order() {
         orderState = State.CREATED;
+        this.clock = Clock.systemDefaultZone();
+    }
+
+    public Order(Clock clock) {
+        this.clock = clock;
+        orderState = State.CREATED;
     }
 
     public void addItem(OrderItem item) {
         requireState(State.CREATED, State.SUBMITTED);
 
         items.add(item);
         orderState = State.CREATED;
-
     }
 
     public void submit() {
         requireState(State.CREATED);
 
         orderState = State.SUBMITTED;
-        subbmitionDate = LocalDateTime.now();
-
+        submissionDate = LocalDateTime.now(clock);
     }
 
     public void confirm() {
         requireState(State.SUBMITTED);
-        long hoursElapsedAfterSubmittion = subbmitionDate.until(LocalDateTime.now(), ChronoUnit.HOURS);
-        if (hoursElapsedAfterSubmittion > VALID_PERIOD_HOURS) {
+        long hoursElapsedAfterSubmission = submissionDate.until(LocalDateTime.now(clock), ChronoUnit.HOURS);
+        if (hoursElapsedAfterSubmission > VALID_PERIOD_HOURS) {
             orderState = State.CANCELLED;
             throw new OrderExpiredException();
         }

src/test/java/edu/iis/mto/time/OrderTest.java

@@ -1,19 +1,70 @@
 package edu.iis.mto.time;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.when;
 
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-
+@ExtendWith(MockitoExtension.class)
 class OrderTest {
+    @Mock
+    private Clock clock;
+    private Order order;
+    private final Instant date = Instant.parse("2005-01-01T10:00:00Z");
 
     @BeforeEach
-    void setUp() throws Exception {}
+    void setUp() {
+        when(clock.getZone()).thenReturn(ZoneId.systemDefault());
+        order = new Order(clock);
+    }
+
+    @Test
+    void sameTimeExpectedOrderConfirmed() {
+        Instant expirationTime = date.plus(0, ChronoUnit.HOURS);
+        when(clock.instant()).thenReturn(date).thenReturn(expirationTime);
+        try {
+            order.submit();
+            order.confirm();
+            assertSame(Order.State.CONFIRMED, order.getOrderState());
+        } catch (OrderExpiredException e) {
+            fail(e.getMessage());
+        }
+    }
 
     @Test
-    void test() {
-        fail("Not yet implemented");
+    void differentTimeExpectedOrderCancelled() {
+        Instant expirationTime = date.plus(9999999, ChronoUnit.HOURS);
+        when(clock.instant()).thenReturn(date).thenReturn(expirationTime);
+
+        order.addItem(new OrderItem());
+        order.submit();
+        Assertions.assertThrows(OrderExpiredException.class, () -> order.confirm());
+
+        assertEquals(order.getOrderState(), Order.State.CANCELLED);
     }
 
+    @Test
+    void differentTimeExpectedOrderConfirmed() {
+        Instant expirationTime = date.plus(1, ChronoUnit.HOURS);
+        when(clock.instant()).thenReturn(date).thenReturn(expirationTime);
+        try {
+            order.submit();
+            order.confirm();
+            assertSame(Order.State.CONFIRMED, order.getOrderState());
+        } catch (OrderExpiredException e) {
+            fail(e.getMessage());
+        }
+
+        assertEquals(order.getOrderState(), Order.State.CONFIRMED);
+    }
 }