From a42c9ed252af961027086a4b8ae48e48b1273860 Mon Sep 17 00:00:00 2001
From: Aaron Vaage <vaage@google.com>
Date: Sun, 2 Apr 2017 12:08:46 -0700
Subject: [PATCH 1/2] Reworking Test

Moved Test from common to Util.

Changed the implementation to use Date all the time and not just for
converting it to a string.

Added the first test for Time to ensure that "fromMs" and "toMs"
yielded the same values.
---
 src/codeu/chat/client/View.java               |  2 +-
 src/codeu/chat/common/Conversation.java       |  1 +
 .../chat/common/ConversationSummary.java      |  1 +
 src/codeu/chat/common/LogicalView.java        |  2 +-
 src/codeu/chat/common/Message.java            |  5 ++--
 src/codeu/chat/common/RawController.java      |  2 ++
 src/codeu/chat/common/Relay.java              |  3 +-
 src/codeu/chat/common/User.java               |  5 ++--
 src/codeu/chat/relay/Server.java              |  2 +-
 src/codeu/chat/relay/ServerFrontEnd.java      |  2 +-
 src/codeu/chat/server/Controller.java         |  2 +-
 src/codeu/chat/server/Model.java              |  2 +-
 src/codeu/chat/server/NoOpRelay.java          |  2 +-
 src/codeu/chat/server/RemoteRelay.java        |  2 +-
 src/codeu/chat/server/Server.java             |  2 +-
 src/codeu/chat/server/View.java               |  2 +-
 src/codeu/chat/{common => util}/Time.java     | 19 ++++++-------
 test/codeu/chat/TestRunner.java               |  1 +
 test/codeu/chat/relay/ServerTest.java         |  2 +-
 test/codeu/chat/server/RawControllerTest.java |  2 +-
 test/codeu/chat/util/TimeTest.java            | 28 +++++++++++++++++++
 21 files changed, 60 insertions(+), 29 deletions(-)
 rename src/codeu/chat/{common => util}/Time.java (77%)
 create mode 100644 test/codeu/chat/util/TimeTest.java

diff --git a/src/codeu/chat/client/View.java b/src/codeu/chat/client/View.java
index a460a03d6..58ece8295 100644
--- a/src/codeu/chat/client/View.java
+++ b/src/codeu/chat/client/View.java
@@ -23,12 +23,12 @@
 import codeu.chat.common.LogicalView;
 import codeu.chat.common.Message;
 import codeu.chat.common.NetworkCode;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.connections.Connection;
 import codeu.chat.util.connections.ConnectionSource;
 
diff --git a/src/codeu/chat/common/Conversation.java b/src/codeu/chat/common/Conversation.java
index 8ef188f3c..e3ad62362 100644
--- a/src/codeu/chat/common/Conversation.java
+++ b/src/codeu/chat/common/Conversation.java
@@ -24,6 +24,7 @@
 import codeu.chat.common.Uuids;
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 
 public final class Conversation {
 
diff --git a/src/codeu/chat/common/ConversationSummary.java b/src/codeu/chat/common/ConversationSummary.java
index eddd44b6d..9eaed61af 100644
--- a/src/codeu/chat/common/ConversationSummary.java
+++ b/src/codeu/chat/common/ConversationSummary.java
@@ -22,6 +22,7 @@
 import codeu.chat.common.Uuids;
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 
 public final class ConversationSummary implements ListViewable {
 
diff --git a/src/codeu/chat/common/LogicalView.java b/src/codeu/chat/common/LogicalView.java
index 8c7796a51..e2a896a77 100644
--- a/src/codeu/chat/common/LogicalView.java
+++ b/src/codeu/chat/common/LogicalView.java
@@ -16,7 +16,7 @@
 
 import java.util.Collection;
 
-import codeu.chat.common.Uuid;
+import codeu.chat.util.Time;
 
 // LOGICAL VIEW
 //
diff --git a/src/codeu/chat/common/Message.java b/src/codeu/chat/common/Message.java
index 76392fb83..d96de02ac 100644
--- a/src/codeu/chat/common/Message.java
+++ b/src/codeu/chat/common/Message.java
@@ -18,10 +18,11 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import codeu.chat.util.Serializer;
-import codeu.chat.util.Serializers;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
+import codeu.chat.util.Serializer;
+import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 
 public final class Message {
 
diff --git a/src/codeu/chat/common/RawController.java b/src/codeu/chat/common/RawController.java
index 93fe6dd1d..3712eabac 100644
--- a/src/codeu/chat/common/RawController.java
+++ b/src/codeu/chat/common/RawController.java
@@ -14,6 +14,8 @@
 
 package codeu.chat.common;
 
+import codeu.chat.util.Time;
+
 // RAW CONTROLLER
 //
 // A controller that grants a large amount of control over how data is inserted
diff --git a/src/codeu/chat/common/Relay.java b/src/codeu/chat/common/Relay.java
index b4d482cf2..5572adecf 100644
--- a/src/codeu/chat/common/Relay.java
+++ b/src/codeu/chat/common/Relay.java
@@ -16,8 +16,7 @@
 
 import java.util.Collection;
 
-import codeu.chat.common.Time;
-import codeu.chat.common.Uuid;
+import codeu.chat.util.Time;
 
 // RELAY
 //
diff --git a/src/codeu/chat/common/User.java b/src/codeu/chat/common/User.java
index b16ae6aac..8d168112e 100644
--- a/src/codeu/chat/common/User.java
+++ b/src/codeu/chat/common/User.java
@@ -18,10 +18,11 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import codeu.chat.util.Serializer;
-import codeu.chat.util.Serializers;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
+import codeu.chat.util.Serializer;
+import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 
 public final class User {
 
diff --git a/src/codeu/chat/relay/Server.java b/src/codeu/chat/relay/Server.java
index ab52b90ac..9c4fc1b84 100644
--- a/src/codeu/chat/relay/Server.java
+++ b/src/codeu/chat/relay/Server.java
@@ -24,10 +24,10 @@
 
 import codeu.chat.common.LinearUuidGenerator;
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
 import codeu.chat.util.Logger;
+import codeu.chat.util.Time;
 
 public final class Server implements Relay {
 
diff --git a/src/codeu/chat/relay/ServerFrontEnd.java b/src/codeu/chat/relay/ServerFrontEnd.java
index df9aa2238..3c65a600a 100644
--- a/src/codeu/chat/relay/ServerFrontEnd.java
+++ b/src/codeu/chat/relay/ServerFrontEnd.java
@@ -21,12 +21,12 @@
 
 import codeu.chat.common.NetworkCode;
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.connections.Connection;
 
 public final class ServerFrontEnd {
diff --git a/src/codeu/chat/server/Controller.java b/src/codeu/chat/server/Controller.java
index d77a5cb55..e04ca0f92 100644
--- a/src/codeu/chat/server/Controller.java
+++ b/src/codeu/chat/server/Controller.java
@@ -20,11 +20,11 @@
 import codeu.chat.common.Conversation;
 import codeu.chat.common.Message;
 import codeu.chat.common.RawController;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
 import codeu.chat.util.Logger;
+import codeu.chat.util.Time;
 
 public final class Controller implements RawController, BasicController {
 
diff --git a/src/codeu/chat/server/Model.java b/src/codeu/chat/server/Model.java
index 6d245b505..857d92092 100644
--- a/src/codeu/chat/server/Model.java
+++ b/src/codeu/chat/server/Model.java
@@ -20,9 +20,9 @@
 import codeu.chat.common.ConversationSummary;
 import codeu.chat.common.LinearUuidGenerator;
 import codeu.chat.common.Message;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.common.Uuid;
+import codeu.chat.util.Time;
 import codeu.chat.util.store.Store;
 import codeu.chat.util.store.StoreAccessor;
 
diff --git a/src/codeu/chat/server/NoOpRelay.java b/src/codeu/chat/server/NoOpRelay.java
index d9d544e6c..32511cb36 100644
--- a/src/codeu/chat/server/NoOpRelay.java
+++ b/src/codeu/chat/server/NoOpRelay.java
@@ -18,8 +18,8 @@
 import java.util.Collection;
 
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.common.Uuid;
+import codeu.chat.util.Time;
 
 
 // NO OP RELAY
diff --git a/src/codeu/chat/server/RemoteRelay.java b/src/codeu/chat/server/RemoteRelay.java
index 5fbe102cf..fa2540f1f 100644
--- a/src/codeu/chat/server/RemoteRelay.java
+++ b/src/codeu/chat/server/RemoteRelay.java
@@ -22,12 +22,12 @@
 
 import codeu.chat.common.NetworkCode;
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.connections.Connection;
 import codeu.chat.util.connections.ConnectionSource;
 
diff --git a/src/codeu/chat/server/Server.java b/src/codeu/chat/server/Server.java
index 4b36261b7..1f8950a34 100644
--- a/src/codeu/chat/server/Server.java
+++ b/src/codeu/chat/server/Server.java
@@ -29,12 +29,12 @@
 import codeu.chat.common.Message;
 import codeu.chat.common.NetworkCode;
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Timeline;
 import codeu.chat.util.connections.Connection;
 
diff --git a/src/codeu/chat/server/View.java b/src/codeu/chat/server/View.java
index 0e9f64aa8..b85e2ea37 100644
--- a/src/codeu/chat/server/View.java
+++ b/src/codeu/chat/server/View.java
@@ -33,10 +33,10 @@
 import codeu.chat.common.LogicalView;
 import codeu.chat.common.Message;
 import codeu.chat.common.SinglesView;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.common.Uuid;
 import codeu.chat.util.Logger;
+import codeu.chat.util.Time;
 import codeu.chat.util.store.StoreAccessor;
 
 public final class View implements BasicView, LogicalView, SinglesView {
diff --git a/src/codeu/chat/common/Time.java b/src/codeu/chat/util/Time.java
similarity index 77%
rename from src/codeu/chat/common/Time.java
rename to src/codeu/chat/util/Time.java
index 551fa3c61..64481ea2f 100644
--- a/src/codeu/chat/common/Time.java
+++ b/src/codeu/chat/util/Time.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package codeu.chat.common;
+package codeu.chat.util;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,9 +20,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import codeu.chat.util.Serializer;
-import codeu.chat.util.Serializers;
-
 public final class Time implements Comparable<Time> {
 
   public static final Serializer<Time> SERIALIZER = new Serializer<Time>() {
@@ -30,7 +27,7 @@ public final class Time implements Comparable<Time> {
     @Override
     public void write(OutputStream out, Time value) throws IOException {
 
-      Serializers.LONG.write(out, value.totalMs);
+      Serializers.LONG.write(out, value.inMs());
 
     }
 
@@ -45,24 +42,24 @@ public Time read(InputStream in) throws IOException {
   private static final SimpleDateFormat formatter =
       new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss.SSS");
 
-  private final long totalMs;
+  private final Date date;
 
-  private Time(long totalMs) { this.totalMs = totalMs; }
+  private Time(long totalMs) { this.date = new Date(totalMs); }
 
-  public long inMs() { return totalMs; }
+  public long inMs() { return date.getTime(); }
 
   @Override
   public int compareTo(Time other) {
-    return Long.compare(totalMs, other.totalMs);
+    return date.compareTo(other.date);
   }
 
   public boolean inRange(Time start, Time end) {
-    return totalMs >= start.totalMs && totalMs <= end.totalMs;
+    return this.compareTo(start) >= 0 && this.compareTo(end) <= 0;
   }
 
   @Override
   public String toString() {
-    return formatter.format(new Date(totalMs));
+    return formatter.format(date);
   }
 
   public static Time fromMs(long ms) { return new Time(ms); }
diff --git a/test/codeu/chat/TestRunner.java b/test/codeu/chat/TestRunner.java
index 0c0314207..65a361e96 100644
--- a/test/codeu/chat/TestRunner.java
+++ b/test/codeu/chat/TestRunner.java
@@ -28,6 +28,7 @@ public static void main(String[] args) {
              codeu.chat.relay.ServerTest.class,
              codeu.chat.server.BasicControllerTest.class,
              codeu.chat.server.RawControllerTest.class,
+             codeu.chat.util.TimeTest.class,
              codeu.chat.util.store.StoreTest.class
          );
       for (final Failure failure : result.getFailures()) {
diff --git a/test/codeu/chat/relay/ServerTest.java b/test/codeu/chat/relay/ServerTest.java
index 3455a7c8a..f9f3a61b3 100644
--- a/test/codeu/chat/relay/ServerTest.java
+++ b/test/codeu/chat/relay/ServerTest.java
@@ -21,9 +21,9 @@
 import org.junit.Before;
 
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
+import codeu.chat.util.Time;
 
 public final class ServerTest {
 
diff --git a/test/codeu/chat/server/RawControllerTest.java b/test/codeu/chat/server/RawControllerTest.java
index f2a8e0a3b..cb751986f 100644
--- a/test/codeu/chat/server/RawControllerTest.java
+++ b/test/codeu/chat/server/RawControllerTest.java
@@ -21,10 +21,10 @@
 import codeu.chat.common.Conversation;
 import codeu.chat.common.Message;
 import codeu.chat.common.RawController;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.common.Uuid;
 import codeu.chat.common.Uuids;
+import codeu.chat.util.Time;
 
 public final class RawControllerTest {
 
diff --git a/test/codeu/chat/util/TimeTest.java b/test/codeu/chat/util/TimeTest.java
new file mode 100644
index 000000000..1b93b13bc
--- /dev/null
+++ b/test/codeu/chat/util/TimeTest.java
@@ -0,0 +1,28 @@
+// Copyright 2017 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package codeu.chat.util;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.Before;
+
+public final class TimeTest {
+
+  @Test
+  public void testFromMs() {
+    assertEquals(0, Time.fromMs(0).inMs());
+    assertEquals(10, Time.fromMs(10).inMs());
+  }
+}

From c399de6821d30a0a1e0269b3a7258caab7265738 Mon Sep 17 00:00:00 2001
From: Aaron Vaage <vaage@google.com>
Date: Mon, 3 Apr 2017 12:36:25 -0700
Subject: [PATCH 2/2] Update ServerFrontEnd.java

---
 src/codeu/chat/relay/ServerFrontEnd.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/codeu/chat/relay/ServerFrontEnd.java b/src/codeu/chat/relay/ServerFrontEnd.java
index 8dee89e4c..0cd8a804c 100644
--- a/src/codeu/chat/relay/ServerFrontEnd.java
+++ b/src/codeu/chat/relay/ServerFrontEnd.java
@@ -24,7 +24,7 @@
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
-import codeu.chat.util.Time;ers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 import codeu.chat.util.connections.Connection;