X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneParserTest.java;h=400b9ae284cdaf8d30ae29c7db1513a3ff9c0fff;hb=03cec6a6772c2d836d94864adddaf544cbe9d72f;hp=da5ca507906d429f5cb21ebf745f08f9aa0d6e05;hpb=d338aacec01efa636f96c5f8aab11b2345147691;p=Sone.git
diff --git a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
index da5ca50..400b9ae 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
@@ -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 David âBombeâ Roden
*/
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 createdPosts = new ArrayList();
+ private final List createdPosts = new ArrayList<>();
private Post post = mock(Post.class);
private final PostReplyBuilder postReplyBuilder = mock(PostReplyBuilder.class);
- private final Set createdPostReplies = new HashSet();
+ private final Set createdPostReplies = new HashSet<>();
private PostReply postReply = mock(PostReply.class);
private final AlbumBuilder albumBuilder = mock(AlbumBuilder.class);
private final ListMultimap
nestedAlbums = ArrayListMultimap.create();
private final ListMultimap albumImages = ArrayListMultimap.create();
private Album album = mock(Album.class);
- private final Map albums = new HashMap();
+ private final Map albums = new HashMap<>();
private final ImageBuilder imageBuilder = mock(ImageBuilder.class);
private Image image = mock(Image.class);
- private final Map images = new HashMap();
+ private final Map images = new HashMap<>();
@Before
public void setupSone() {
@@ -111,7 +110,7 @@ public class SoneParserTest {
@Before
public void setupSoneBuilder() {
- when(core.soneBuilder()).thenAnswer(new Answer() {
+ when(database.newSoneBuilder()).thenAnswer(new Answer() {
@Override
public SoneBuilder answer(InvocationOnMock invocation) {
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,7 +236,7 @@ public class SoneParserTest {
return postReply;
}
});
- when(core.postReplyBuilder()).thenReturn(postReplyBuilder);
+ when(database.newPostReplyBuilder()).thenReturn(postReplyBuilder);
}
@Before
@@ -328,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() {
+ when(database.getAlbum(anyString())).thenAnswer(new Answer() {
@Override
public Album answer(InvocationOnMock invocation)
throws Throwable {
@@ -439,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() {
+ when(database.getImage(anyString())).thenAnswer(new Answer() {
@Override
public Image answer(InvocationOnMock invocation)
throws Throwable {