Update aai-parent in babel to 1.13.3

[aai/babel.git] / src / test / java / org / onap / aai / babel / service / TestInfoService.java

diff --git a/src/test/java/org/onap/aai/babel/service/TestInfoService.java b/src/test/java/org/onap/aai/babel/service/TestInfoService.java
index 1d60839..cd2f3b3 100644 (file)
--- a/src/test/java/org/onap/aai/babel/service/TestInfoService.java
+++ b/src/test/java/org/onap/aai/babel/service/TestInfoService.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -22,12 +22,12 @@ package org.onap.aai.babel.service;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.time.Clock;
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import org.junit.Test;
+import java.time.ZoneOffset;
+import org.junit.jupiter.api.Test;
 
 public class TestInfoService {
 
@@ -42,28 +42,28 @@ public class TestInfoService {
     @Test
     public void testStatusReport() {
         InfoService infoService = new InfoService();
-        LocalDateTime now = LocalDateTime.now();
-        Clock clock = buildClock(now);
+        LocalDateTime startTime = LocalDateTime.now();
+        Clock clock = buildClock(startTime);
 
         String info = infoService.statusReport(clock);
         assertThat(info, containsString("Started at"));
         assertThat(info, containsString("total=1"));
 
         // Skip ahead 1 day
-        clock = buildClock(now.plusDays(1));
+        clock = buildClock(startTime.plusDays(1));
         info = infoService.statusReport(clock);
         assertThat(info, containsString("Up time 1 day "));
         assertThat(info, containsString("total=2"));
 
         // Skip ahead 5 days
-        clock = buildClock(now.plusDays(5));
+        clock = buildClock(startTime.plusDays(5));
         info = infoService.statusReport(clock);
         assertThat(info, containsString("Up time 5 days "));
         assertThat(info, containsString("total=3"));
     }
 
-    private Clock buildClock(LocalDateTime now) {
-        return Clock.fixed(now.toInstant(OffsetDateTime.now().getOffset()), Clock.systemDefaultZone().getZone());
+    private Clock buildClock(LocalDateTime dateTime) {
+        return Clock.fixed(dateTime.toInstant(ZoneOffset.UTC), Clock.systemUTC().getZone());
     }
 
 }