🔀 Merge branch “release-80”

[Sone.git] / src / test / java / net / pterodactylus / sone / core / SoneParserTest.java

diff --git a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
index b6560f4..400b9ae 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
@@ -11,9 +11,9 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -36,6 +36,7 @@ import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.database.AlbumBuilder;
+import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.ImageBuilder;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilder;
@@ -59,30 +60,28 @@ import org.mockito.stubbing.Answer;
 
 /**
  * Unit test for {@link SoneParser}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class SoneParserTest {
 
-       private final Core core = mock(Core.class);
-       private final SoneParser soneParser = new SoneParser(core);
+       private final Database database = mock(Database.class);
+       private final SoneParser soneParser = new SoneParser(database);
        private final Sone sone = mock(Sone.class);
        private FreenetURI requestUri = mock(FreenetURI.class);
        private final PostBuilder postBuilder = mock(PostBuilder.class);
-       private final List<Post> createdPosts = new ArrayList<Post>();
+       private final List<Post> createdPosts = new ArrayList<>();
        private Post post = mock(Post.class);
        private final PostReplyBuilder postReplyBuilder = mock(PostReplyBuilder.class);
-       private final Set<PostReply> createdPostReplies = new HashSet<PostReply>();
+       private final Set<PostReply> createdPostReplies = new HashSet<>();
        private PostReply postReply = mock(PostReply.class);
        private final AlbumBuilder albumBuilder = mock(AlbumBuilder.class);
        private final ListMultimap<Album, Album>
                        nestedAlbums = ArrayListMultimap.create();
        private final ListMultimap<Album, Image> albumImages = ArrayListMultimap.create();
        private Album album = mock(Album.class);
-       private final Map<String, Album> albums = new HashMap<String, Album>();
+       private final Map<String, Album> albums = new HashMap<>();
        private final ImageBuilder imageBuilder = mock(ImageBuilder.class);
        private Image image = mock(Image.class);
-       private final Map<String, Image> images = new HashMap<String, Image>();
+       private final Map<String, Image> images = new HashMap<>();
 
        @Before
        public void setupSone() {
@@ -111,10 +110,10 @@ public class SoneParserTest {
 
        @Before
        public void setupSoneBuilder() {
-               when(core.soneBuilder()).thenAnswer(new Answer<SoneBuilder>() {
+               when(database.newSoneBuilder()).thenAnswer(new Answer<SoneBuilder>() {
                        @Override
                        public SoneBuilder answer(InvocationOnMock invocation) {
-                               return new MemorySoneBuilder();
+                               return new MemorySoneBuilder(null);
                        }
                });
        }
@@ -173,7 +172,7 @@ public class SoneParserTest {
                                return post;
                        }
                });
-               when(core.postBuilder()).thenReturn(postBuilder);
+               when(database.newPostBuilder()).thenReturn(postBuilder);
        }
 
        @Before
@@ -237,13 +236,12 @@ public class SoneParserTest {
                                return postReply;
                        }
                });
-               when(core.postReplyBuilder()).thenReturn(postReplyBuilder);
+               when(database.newPostReplyBuilder()).thenReturn(postReplyBuilder);
        }
 
        @Before
        public void setupAlbum() {
                final Album album = SoneParserTest.this.album;
-               when(album.getAlbumImage()).thenReturn(mock(Image.class));
                doAnswer(new Answer<Void>() {
                        @Override
                        public Void answer(InvocationOnMock invocation) {
@@ -273,7 +271,6 @@ public class SoneParserTest {
                final Modifier albumModifier = new Modifier() {
                        private String title = album.getTitle();
                        private String description = album.getDescription();
-                       private String imageId = album.getAlbumImage().getId();
 
                        @Override
                        public Modifier setTitle(String title) {
@@ -288,18 +285,9 @@ public class SoneParserTest {
                        }
 
                        @Override
-                       public Modifier setAlbumImage(String imageId) {
-                               this.imageId = imageId;
-                               return this;
-                       }
-
-                       @Override
                        public Album update() throws IllegalStateException {
                                when(album.getTitle()).thenReturn(title);
                                when(album.getDescription()).thenReturn(description);
-                               Image image = mock(Image.class);
-                               when(image.getId()).thenReturn(imageId);
-                               when(album.getAlbumImage()).thenReturn(image);
                                return album;
                        }
                };
@@ -339,12 +327,12 @@ public class SoneParserTest {
                                return album;
                        }
                });
-               when(core.albumBuilder()).thenReturn(albumBuilder);
+               when(database.newAlbumBuilder()).thenReturn(albumBuilder);
        }
 
        @Before
        public void setupAlbums() {
-               when(core.getAlbum(anyString())).thenAnswer(new Answer<Album>() {
+               when(database.getAlbum(anyString())).thenAnswer(new Answer<Album>() {
                        @Override
                        public Album answer(InvocationOnMock invocation)
                        throws Throwable {
@@ -450,12 +438,12 @@ public class SoneParserTest {
                                return image;
                        }
                });
-               when(core.imageBuilder()).thenReturn(imageBuilder);
+               when(database.newImageBuilder()).thenReturn(imageBuilder);
        }
 
        @Before
        public void setupImages() {
-               when(core.getImage(anyString())).thenAnswer(new Answer<Image>() {
+               when(database.getImage(anyString())).thenAnswer(new Answer<Image>() {
                        @Override
                        public Image answer(InvocationOnMock invocation)
                        throws Throwable {