X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FAbstractSoneCommandTest.java;h=5c210712e8d490d7c0d5fe1a4b110f178ba88271;hb=ec0589a84453ee2018a5aab6341b90924fde467f;hp=d045be2e1688f29caaa0fc39bb389efc052589e8;hpb=17a1fc74298d28fca1de3a973f1f52c2faeb2708;p=Sone.git diff --git a/src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java index d045be2..5c21071 100644 --- a/src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java +++ b/src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java @@ -17,6 +17,7 @@ package net.pterodactylus.sone.fcp; +import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Optional.of; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; @@ -229,11 +230,17 @@ public class AbstractSoneCommandTest { PostReply postReply = mock(PostReply.class); when(postReply.getId()).thenReturn(randomUUID().toString()); when(postReply.getSone()).thenReturn(sone); - when(postReply.getTime()).thenReturn((long) (Math.random() * Long.MAX_VALUE)); + when(postReply.getTime()).thenReturn(System.currentTimeMillis()); when(postReply.getText()).thenReturn(text); return postReply; } + private PostReply createFuturePostReply(Sone sone, String text) { + PostReply postReply = createPostReply(sone, text); + when(postReply.getTime()).thenReturn(System.currentTimeMillis() + 86400000); + return postReply; + } + @Test public void testEncodingLikes() throws FSParseException { List likes = prepareMultipleSones(); @@ -325,7 +332,7 @@ public class AbstractSoneCommandTest { @Test public void testParsingAPost() throws FcpException { Sone sone = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test", "First", "M.", "Last", (long) (Math.random() * Long.MAX_VALUE)); - Post post = createPost(sone, "Some Text."); + Post post = createPost(sone, null, (long) (Math.random() * Long.MAX_VALUE), "Some Text."); when(database.getPost(eq(post.getId()))).thenReturn(of(post)); SimpleFieldSet postFieldSet = new SimpleFieldSetBuilder().put("Post", post.getId()).get(); Post parsedPost = abstractSoneCommand.getPost(postFieldSet, "Post"); @@ -333,11 +340,12 @@ public class AbstractSoneCommandTest { assertThat(parsedPost, is(post)); } - private Post createPost(Sone sone, String text) { + private Post createPost(Sone sone, String recipient, long time, String text) { Post post = mock(Post.class); when(post.getId()).thenReturn(randomUUID().toString()); when(post.getSone()).thenReturn(sone); - when(post.getRecipientId()).thenReturn(Optional.absent()); + when(post.getRecipientId()).thenReturn(fromNullable(recipient)); + when(post.getTime()).thenReturn(time); when(post.getText()).thenReturn(text); return post; } @@ -345,7 +353,7 @@ public class AbstractSoneCommandTest { @Test(expected = FcpException.class) public void testThatTryingToParseANonExistingPostCausesAnError() throws FcpException { Sone sone = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test", "First", "M.", "Last", (long) (Math.random() * Long.MAX_VALUE)); - Post post = createPost(sone, "Some Text."); + Post post = createPost(sone, null, (long) (Math.random() * Long.MAX_VALUE), "Some Text."); when(database.getPost(Matchers.any())).thenReturn(Optional.absent()); SimpleFieldSet postFieldSet = new SimpleFieldSetBuilder().put("Post", post.getId()).get(); abstractSoneCommand.getPost(postFieldSet, "Post"); @@ -387,4 +395,221 @@ public class AbstractSoneCommandTest { abstractSoneCommand.getReply(replyFieldSet, "Reply"); } + @Test + public void testEncodingAPostWithoutRecipientAndReplies() throws FSParseException { + Sone sone = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test", "First", "M.", "Last", (long) (Math.random() * Long.MAX_VALUE)); + Post post = createPost(sone, null, (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePost(post, "Post."); + assertThat(postFieldSet, notNullValue()); + verifyPost(postFieldSet, "Post.", post); + } + + private void verifyPost(SimpleFieldSet postFieldSet, String prefix, Post post) throws FSParseException { + assertThat(postFieldSet.get(prefix + "ID"), is(post.getId())); + assertThat(postFieldSet.get(prefix + "Sone"), is(post.getSone().getId())); + assertThat(postFieldSet.get(prefix + "Recipient"), is(post.getRecipientId().orNull())); + assertThat(postFieldSet.getLong(prefix + "Time"), is(post.getTime())); + assertThat(postFieldSet.get(prefix + "Text"), is(post.getText())); + } + + @Test + public void testEncodingAPostWithRecipientWithoutReplies() throws FSParseException { + Sone sone = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test", "First", "M.", "Last", (long) (Math.random() * Long.MAX_VALUE)); + Post post = createPost(sone, "KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePost(post, "Post."); + assertThat(postFieldSet, notNullValue()); + verifyPost(postFieldSet, "Post.", post); + } + + @Test + public void testEncodingAPostWithoutRecipientWithReplies() throws FSParseException { + Sone sone = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test", "First", "M.", "Last", (long) (Math.random() * Long.MAX_VALUE)); + Post post = createPost(sone, null, (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + PostReply postReply = createPostReply(sone, "Reply."); + when(post.getReplies()).thenReturn(asList(postReply)); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePostWithReplies(post, "Post."); + assertThat(postFieldSet, notNullValue()); + verifyPost(postFieldSet, "Post.", post); + assertThat(postFieldSet.getInt("Post.Replies.Count"), is(1)); + assertThat(postFieldSet.get("Post.Replies.0.ID"), is(postReply.getId())); + assertThat(postFieldSet.get("Post.Replies.0.Sone"), is(postReply.getSone().getId())); + assertThat(postFieldSet.getLong("Post.Replies.0.Time"), is(postReply.getTime())); + assertThat(postFieldSet.get("Post.Replies.0.Text"), is(postReply.getText())); + } + + @Test + public void testEncodingAPostWithoutRecipientWithFutureReplies() throws FSParseException { + Sone sone = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test", "First", "M.", "Last", (long) (Math.random() * Long.MAX_VALUE)); + Post post = createPost(sone, null, (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + PostReply postReply = createFuturePostReply(sone, "Reply."); + when(post.getReplies()).thenReturn(asList(postReply)); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePostWithReplies(post, "Post."); + assertThat(postFieldSet, notNullValue()); + verifyPost(postFieldSet, "Post.", post); + assertThat(postFieldSet.getInt("Post.Replies.Count"), is(0)); + assertThat(postFieldSet.get("Post.Replies.0.ID"), nullValue()); + assertThat(postFieldSet.get("Post.Replies.0.Sone"), nullValue()); + assertThat(postFieldSet.get("Post.Replies.0.Time"), nullValue()); + assertThat(postFieldSet.get("Post.Replies.0.Text"), nullValue()); + } + + @Test + public void testEncodingAPostWithRecipientAndReplies() throws FSParseException { + Sone sone = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test", "First", "M.", "Last", (long) (Math.random() * Long.MAX_VALUE)); + Post post = createPost(sone, "KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + PostReply postReply = createPostReply(sone, "Reply."); + when(post.getReplies()).thenReturn(asList(postReply)); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePostWithReplies(post, "Post."); + assertThat(postFieldSet, notNullValue()); + verifyPost(postFieldSet, "Post.", post); + assertThat(postFieldSet.getInt("Post.Replies.Count"), is(1)); + assertThat(postFieldSet.get("Post.Replies.0.ID"), is(postReply.getId())); + assertThat(postFieldSet.get("Post.Replies.0.Sone"), is(postReply.getSone().getId())); + assertThat(postFieldSet.getLong("Post.Replies.0.Time"), is(postReply.getTime())); + assertThat(postFieldSet.get("Post.Replies.0.Text"), is(postReply.getText())); + } + + @Test + public void testEncodingPostsWithoutRecipientAndReplies() throws FSParseException { + Sone sone1 = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test1", "Alpha", "A.", "First", (long) (Math.random() * Long.MAX_VALUE)); + Sone sone2 = createSone("KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", "Test2", "Beta", "B.", "Second", (long) (Math.random() * Long.MAX_VALUE)); + Post post1 = createPost(sone1, null, (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + Post post2 = createPost(sone2, null, (long) (Math.random() * Long.MAX_VALUE), "Some other Text."); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePosts(asList(post1, post2), "Posts."); + assertThat(postFieldSet, notNullValue()); + assertThat(postFieldSet.getInt("Posts.Count"), is(2)); + assertThat(postFieldSet.get("Posts.0.ID"), is(post1.getId())); + assertThat(postFieldSet.get("Posts.0.Sone"), is(sone1.getId())); + assertThat(postFieldSet.get("Posts.0.Recipient"), nullValue()); + assertThat(postFieldSet.getLong("Posts.0.Time"), is(post1.getTime())); + assertThat(postFieldSet.get("Posts.0.Text"), is(post1.getText())); + assertThat(postFieldSet.get("Posts.1.ID"), is(post2.getId())); + assertThat(postFieldSet.get("Posts.1.Sone"), is(sone2.getId())); + assertThat(postFieldSet.get("Posts.1.Recipient"), nullValue()); + assertThat(postFieldSet.getLong("Posts.1.Time"), is(post2.getTime())); + assertThat(postFieldSet.get("Posts.1.Text"), is(post2.getText())); + } + + @Test + public void testEncodingPostsWithRecipientWithoutReplies() throws FSParseException { + Sone sone1 = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test1", "Alpha", "A.", "First", (long) (Math.random() * Long.MAX_VALUE)); + Sone sone2 = createSone("KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", "Test2", "Beta", "B.", "Second", (long) (Math.random() * Long.MAX_VALUE)); + Post post1 = createPost(sone1, "KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + Post post2 = createPost(sone2, "jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", (long) (Math.random() * Long.MAX_VALUE), "Some other Text."); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePosts(asList(post1, post2), "Posts."); + assertThat(postFieldSet, notNullValue()); + assertThat(postFieldSet.getInt("Posts.Count"), is(2)); + assertThat(postFieldSet.get("Posts.0.ID"), is(post1.getId())); + assertThat(postFieldSet.get("Posts.0.Sone"), is(sone1.getId())); + assertThat(postFieldSet.get("Posts.0.Recipient"), is("KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg")); + assertThat(postFieldSet.getLong("Posts.0.Time"), is(post1.getTime())); + assertThat(postFieldSet.get("Posts.0.Text"), is(post1.getText())); + assertThat(postFieldSet.get("Posts.1.ID"), is(post2.getId())); + assertThat(postFieldSet.get("Posts.1.Sone"), is(sone2.getId())); + assertThat(postFieldSet.get("Posts.1.Recipient"), is("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E")); + assertThat(postFieldSet.getLong("Posts.1.Time"), is(post2.getTime())); + assertThat(postFieldSet.get("Posts.1.Text"), is(post2.getText())); + } + + @Test + public void testEncodingPostsWithoutRecipientWithReplies() throws FSParseException { + Sone sone1 = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test1", "Alpha", "A.", "First", (long) (Math.random() * Long.MAX_VALUE)); + Sone sone2 = createSone("KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", "Test2", "Beta", "B.", "Second", (long) (Math.random() * Long.MAX_VALUE)); + Post post1 = createPost(sone1, null, (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + Post post2 = createPost(sone2, null, (long) (Math.random() * Long.MAX_VALUE), "Some other Text."); + PostReply postReply1 = createPostReply(sone2, "Reply from 2 to 1"); + PostReply postReply2 = createPostReply(sone1, "Reply from 1 to 2"); + when(post1.getReplies()).thenReturn(asList(postReply1)); + when(post2.getReplies()).thenReturn(asList(postReply2)); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePostsWithReplies(asList(post1, post2), "Posts."); + assertThat(postFieldSet, notNullValue()); + assertThat(postFieldSet.getInt("Posts.Count"), is(2)); + assertThat(postFieldSet.get("Posts.0.ID"), is(post1.getId())); + assertThat(postFieldSet.get("Posts.0.Sone"), is(sone1.getId())); + assertThat(postFieldSet.get("Posts.0.Recipient"), nullValue()); + assertThat(postFieldSet.getLong("Posts.0.Time"), is(post1.getTime())); + assertThat(postFieldSet.get("Posts.0.Text"), is(post1.getText())); + assertThat(postFieldSet.getInt("Posts.0.Replies.Count"), is(1)); + assertThat(postFieldSet.get("Posts.0.Replies.0.ID"), is(postReply1.getId())); + assertThat(postFieldSet.get("Posts.0.Replies.0.Sone"), is(postReply1.getSone().getId())); + assertThat(postFieldSet.getLong("Posts.0.Replies.0.Time"), is(postReply1.getTime())); + assertThat(postFieldSet.get("Posts.0.Replies.0.Text"), is(postReply1.getText())); + assertThat(postFieldSet.get("Posts.1.ID"), is(post2.getId())); + assertThat(postFieldSet.get("Posts.1.Sone"), is(sone2.getId())); + assertThat(postFieldSet.get("Posts.1.Recipient"), nullValue()); + assertThat(postFieldSet.getLong("Posts.1.Time"), is(post2.getTime())); + assertThat(postFieldSet.get("Posts.1.Text"), is(post2.getText())); + assertThat(postFieldSet.getInt("Posts.1.Replies.Count"), is(1)); + assertThat(postFieldSet.get("Posts.1.Replies.0.ID"), is(postReply2.getId())); + assertThat(postFieldSet.get("Posts.1.Replies.0.Sone"), is(postReply2.getSone().getId())); + assertThat(postFieldSet.getLong("Posts.1.Replies.0.Time"), is(postReply2.getTime())); + assertThat(postFieldSet.get("Posts.1.Replies.0.Text"), is(postReply2.getText())); + } + + @Test + public void testEncodingPostsWithRecipientAndReplies() throws FSParseException { + Sone sone1 = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test1", "Alpha", "A.", "First", (long) (Math.random() * Long.MAX_VALUE)); + Sone sone2 = createSone("KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", "Test2", "Beta", "B.", "Second", (long) (Math.random() * Long.MAX_VALUE)); + Post post1 = createPost(sone1, "KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + Post post2 = createPost(sone2, "jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", (long) (Math.random() * Long.MAX_VALUE), "Some other Text."); + PostReply postReply1 = createPostReply(sone2, "Reply from 2 to 1"); + PostReply postReply2 = createPostReply(sone1, "Reply from 1 to 2"); + when(post1.getReplies()).thenReturn(asList(postReply1)); + when(post2.getReplies()).thenReturn(asList(postReply2)); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePostsWithReplies(asList(post1, post2), "Posts."); + assertThat(postFieldSet, notNullValue()); + assertThat(postFieldSet.getInt("Posts.Count"), is(2)); + assertThat(postFieldSet.get("Posts.0.ID"), is(post1.getId())); + assertThat(postFieldSet.get("Posts.0.Sone"), is(sone1.getId())); + assertThat(postFieldSet.get("Posts.0.Recipient"), is("KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg")); + assertThat(postFieldSet.getLong("Posts.0.Time"), is(post1.getTime())); + assertThat(postFieldSet.get("Posts.0.Text"), is(post1.getText())); + assertThat(postFieldSet.getInt("Posts.0.Replies.Count"), is(1)); + assertThat(postFieldSet.get("Posts.0.Replies.0.ID"), is(postReply1.getId())); + assertThat(postFieldSet.get("Posts.0.Replies.0.Sone"), is(postReply1.getSone().getId())); + assertThat(postFieldSet.getLong("Posts.0.Replies.0.Time"), is(postReply1.getTime())); + assertThat(postFieldSet.get("Posts.0.Replies.0.Text"), is(postReply1.getText())); + assertThat(postFieldSet.get("Posts.1.ID"), is(post2.getId())); + assertThat(postFieldSet.get("Posts.1.Sone"), is(sone2.getId())); + assertThat(postFieldSet.get("Posts.1.Recipient"), is("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E")); + assertThat(postFieldSet.getLong("Posts.1.Time"), is(post2.getTime())); + assertThat(postFieldSet.get("Posts.1.Text"), is(post2.getText())); + assertThat(postFieldSet.getInt("Posts.1.Replies.Count"), is(1)); + assertThat(postFieldSet.get("Posts.1.Replies.0.ID"), is(postReply2.getId())); + assertThat(postFieldSet.get("Posts.1.Replies.0.Sone"), is(postReply2.getSone().getId())); + assertThat(postFieldSet.getLong("Posts.1.Replies.0.Time"), is(postReply2.getTime())); + assertThat(postFieldSet.get("Posts.1.Replies.0.Text"), is(postReply2.getText())); + } + + @Test + public void testEncodingPostsWithRecipientAndFutureReplies() throws FSParseException { + Sone sone1 = createSone("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", "Test1", "Alpha", "A.", "First", (long) (Math.random() * Long.MAX_VALUE)); + Sone sone2 = createSone("KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", "Test2", "Beta", "B.", "Second", (long) (Math.random() * Long.MAX_VALUE)); + Post post1 = createPost(sone1, "KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg", (long) (Math.random() * Long.MAX_VALUE), "Some Text."); + Post post2 = createPost(sone2, "jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E", (long) (Math.random() * Long.MAX_VALUE), "Some other Text."); + PostReply postReply1 = createPostReply(sone2, "Reply from 2 to 1"); + PostReply postReply2 = createFuturePostReply(sone1, "Reply from 1 to 2"); + when(post1.getReplies()).thenReturn(asList(postReply1)); + when(post2.getReplies()).thenReturn(asList(postReply2)); + SimpleFieldSet postFieldSet = abstractSoneCommand.encodePostsWithReplies(asList(post1, post2), "Posts."); + assertThat(postFieldSet, notNullValue()); + assertThat(postFieldSet.getInt("Posts.Count"), is(2)); + assertThat(postFieldSet.get("Posts.0.ID"), is(post1.getId())); + assertThat(postFieldSet.get("Posts.0.Sone"), is(sone1.getId())); + assertThat(postFieldSet.get("Posts.0.Recipient"), is("KpoohJSbZGltHHG-YsxKV8ojjS5gwScRv50kl3AkLXg")); + assertThat(postFieldSet.getLong("Posts.0.Time"), is(post1.getTime())); + assertThat(postFieldSet.get("Posts.0.Text"), is(post1.getText())); + assertThat(postFieldSet.getInt("Posts.0.Replies.Count"), is(1)); + assertThat(postFieldSet.get("Posts.0.Replies.0.ID"), is(postReply1.getId())); + assertThat(postFieldSet.get("Posts.0.Replies.0.Sone"), is(postReply1.getSone().getId())); + assertThat(postFieldSet.getLong("Posts.0.Replies.0.Time"), is(postReply1.getTime())); + assertThat(postFieldSet.get("Posts.0.Replies.0.Text"), is(postReply1.getText())); + assertThat(postFieldSet.get("Posts.1.ID"), is(post2.getId())); + assertThat(postFieldSet.get("Posts.1.Sone"), is(sone2.getId())); + assertThat(postFieldSet.get("Posts.1.Recipient"), is("jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E")); + assertThat(postFieldSet.getLong("Posts.1.Time"), is(post2.getTime())); + assertThat(postFieldSet.get("Posts.1.Text"), is(post2.getText())); + assertThat(postFieldSet.getInt("Posts.1.Replies.Count"), is(0)); + } + }