commit 0c47d5386e7042ca9035196bd29a86618bd2346f
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Aug 18 23:16:35 2017 -0700
committer Andrea Campanella <andrea@opennetworking.org> Fri Oct 20 09:40:05 2017 +0000
tree 343aa77cb943daaee5988df5ea6700d20d7f9add
parent 69bf4ddc27db2abe27065f726c16ed3f5856d696

Deprecate joda-time

- ref:
  http://blog.joda.org/2014/11/converting-from-joda-time-to-javatime.html

Change-Id: I1115e8053f601e78cb933ccbfa664ff8787d2da1

core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java

diff --git a/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java b/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java
index cc6916f..bc40f67 100644
--- a/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java
@@ -15,9 +15,9 @@
  */
 package org.onosproject.cluster;
 
+import java.time.Instant;
 import java.util.Set;
 
-import org.joda.time.DateTime;
 import org.onlab.packet.IpAddress;
 
 import com.google.common.collect.ImmutableSet;
@@ -56,7 +56,7 @@
     }
 
     @Override
-    public DateTime getLastUpdated(NodeId nodeId) {
+    public Instant getLastUpdatedInstant(NodeId nodeId) {
         return null;
     }
 

core/api/src/test/java/org/onosproject/ui/table/cell/TimeFormatterTest.java

diff --git a/core/api/src/test/java/org/onosproject/ui/table/cell/TimeFormatterTest.java b/core/api/src/test/java/org/onosproject/ui/table/cell/TimeFormatterTest.java
index 4f73490..7517aac 100644
--- a/core/api/src/test/java/org/onosproject/ui/table/cell/TimeFormatterTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/table/cell/TimeFormatterTest.java
@@ -16,14 +16,15 @@
 
 package org.onosproject.ui.table.cell;
 
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.junit.Test;
 import org.onosproject.ui.table.CellFormatter;
 
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.Locale;
 
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.Matchers.isOneOf;
+import static org.junit.Assert.assertThat;
 
 /**
  * Unit tests for {@link TimeFormatter}.
@@ -31,9 +32,9 @@
 public class TimeFormatterTest {
 
     private static final Locale LOCALE = Locale.ENGLISH;
-    private static final DateTimeZone ZONE = DateTimeZone.UTC;
+    private static final ZoneOffset ZONE = ZoneOffset.UTC;
 
-    private static final DateTime TIME = new DateTime(2015, 5, 4, 15, 30, ZONE);
+    private static final OffsetDateTime TIME = OffsetDateTime.of(2015, 5, 4, 15, 30, 0, 0, ZONE);
     private static final String EXP_ZONE_NAME = "3:30:00 PM UTC";
     private static final String EXP_ZONE_OFFSET = "3:30:00 PM +00:00";
 
@@ -45,7 +46,6 @@
 
     @Test
     public void basic() {
-        assertTrue("wrong format", (EXP_ZONE_NAME.equals(fmt.format(TIME)) ||
-                   EXP_ZONE_OFFSET.equals(fmt.format(TIME))));
+        assertThat(fmt.format(TIME), isOneOf(EXP_ZONE_OFFSET, EXP_ZONE_NAME));
     }
 }