Просмотр исходного кода

Make topics use new date APIs.

pull/658/head
Chris Smith 8 лет назад
Родитель
Сommit
8e1c213a8c
3 измененных файлов: 11 добавлений и 11 удалений
  1. 2
    2
      src/com/dmdirc/ChannelEventHandler.java
  2. 3
    3
      src/com/dmdirc/Topic.java
  3. 6
    6
      test/com/dmdirc/TopicTest.java

+ 2
- 2
src/com/dmdirc/ChannelEventHandler.java Просмотреть файл

@@ -60,7 +60,7 @@ import com.dmdirc.parser.interfaces.Parser;
60 60
 import com.google.common.base.Strings;
61 61
 
62 62
 import java.time.LocalDateTime;
63
-import java.util.Date;
63
+import java.time.ZoneOffset;
64 64
 import java.util.Optional;
65 65
 import java.util.stream.Collectors;
66 66
 
@@ -139,7 +139,7 @@ public class ChannelEventHandler extends EventHandler {
139 139
 
140 140
         final Topic topic = Topic.create(channel.getTopic(),
141 141
                 owner.getUser(getConnection().getUser(channel.getTopicSetter())).orElse(null),
142
-                new Date(1000 * channel.getTopicTime()));
142
+                LocalDateTime.ofEpochSecond(channel.getTopicTime(), 0, ZoneOffset.UTC));
143 143
 
144 144
         if (event.isJoinTopic()) {
145 145
             if (Strings.isNullOrEmpty(channel.getTopic())) {

+ 3
- 3
src/com/dmdirc/Topic.java Просмотреть файл

@@ -26,7 +26,7 @@ import com.dmdirc.interfaces.GroupChatUser;
26 26
 
27 27
 import com.google.auto.value.AutoValue;
28 28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30 30
 import java.util.Optional;
31 31
 
32 32
 /**
@@ -42,11 +42,11 @@ public abstract class Topic {
42 42
     /** Topic client. */
43 43
     public abstract Optional<GroupChatUser> getClient();
44 44
     /** Topic time. */
45
-    public abstract Date getDate();
45
+    public abstract LocalDateTime getDate();
46 46
 
47 47
     public static Topic create(final String topic,
48 48
             final GroupChatUser groupChatUser,
49
-            final Date date) {
49
+            final LocalDateTime date) {
50 50
         return new AutoValue_Topic(topic, Optional.ofNullable(groupChatUser), date);
51 51
     }
52 52
 }

+ 6
- 6
test/com/dmdirc/TopicTest.java Просмотреть файл

@@ -24,7 +24,8 @@ package com.dmdirc;
24 24
 
25 25
 import com.dmdirc.interfaces.GroupChatUser;
26 26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
+import java.time.ZoneOffset;
28 29
 import java.util.Optional;
29 30
 
30 31
 import org.junit.Test;
@@ -37,25 +38,24 @@ import static org.junit.Assert.assertEquals;
37 38
 @RunWith(MockitoJUnitRunner.class)
38 39
 public class TopicTest {
39 40
 
40
-    @Mock
41
-    private GroupChatUser user;
41
+    @Mock private GroupChatUser user;
42 42
 
43 43
     @Test
44 44
     public void testGetClient() {
45
-        final Topic test = Topic.create("abc", user, new Date());
45
+        final Topic test = Topic.create("abc", user, LocalDateTime.now());
46 46
         assertEquals(Optional.of(user), test.getClient());
47 47
     }
48 48
 
49 49
     @Test
50 50
     public void testGetTime() {
51
-        final Date date = new Date(123394432);
51
+        final LocalDateTime date = LocalDateTime.ofEpochSecond(123394432L, 0, ZoneOffset.UTC);
52 52
         final Topic test = Topic.create("abc", user, date);
53 53
         assertEquals(date, test.getDate());
54 54
     }
55 55
 
56 56
     @Test
57 57
     public void testGetTopic() {
58
-        final Topic test = Topic.create("abc", user, new Date());
58
+        final Topic test = Topic.create("abc", user, LocalDateTime.now());
59 59
         assertEquals("abc", test.getTopic());
60 60
     }
61 61
 

Загрузка…
Отмена
Сохранить