/*
- * Sone - MemoryDatabaseTest.java - Copyright © 2013–2015 David Roden
+ * Sone - MemoryDatabaseTest.java - Copyright © 2013–2016 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
import static com.google.common.base.Optional.of;
import static java.util.Arrays.asList;
import static java.util.UUID.randomUUID;
-import static net.pterodactylus.sone.Matchers.isAlbum;
-import static net.pterodactylus.sone.Matchers.isImage;
-import static net.pterodactylus.sone.Matchers.isPost;
-import static net.pterodactylus.sone.Matchers.isPostReply;
+import static net.pterodactylus.sone.test.Matchers.isAlbum;
+import static net.pterodactylus.sone.test.Matchers.isImage;
+import static net.pterodactylus.sone.test.Matchers.isPost;
+import static net.pterodactylus.sone.test.Matchers.isPostReply;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.emptyIterable;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import java.util.Map;
import java.util.Set;
-import net.pterodactylus.sone.TestAlbumBuilder;
-import net.pterodactylus.sone.TestImageBuilder;
-import net.pterodactylus.sone.TestPostBuilder;
-import net.pterodactylus.sone.TestPostReplyBuilder;
-import net.pterodactylus.sone.TestValue;
import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.impl.AlbumImpl;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.impl.AlbumImpl;
+import net.pterodactylus.sone.test.TestAlbumBuilder;
+import net.pterodactylus.sone.test.TestImageBuilder;
+import net.pterodactylus.sone.test.TestPostBuilder;
+import net.pterodactylus.sone.test.TestPostReplyBuilder;
+import net.pterodactylus.sone.test.TestValue;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.Value;
.update();
Album secondAlbum = new TestAlbumBuilder().withId("album2").by(
sone).build().modify().setTitle("album2").setDescription(
- "album-description2").setAlbumImage("image1").update();
+ "album-description2").update();
Album thirdAlbum = new TestAlbumBuilder().withId("album3").by(
sone).build().modify().setTitle("album3").setDescription(
"album-description3").update();
assertThat(memoryDatabase.getPostReply("reply4").isPresent(),
is(false));
assertThat(memoryDatabase.getAlbum("album1").get(),
- isAlbum("album1", null, "album1", "album-description1",
- null));
+ isAlbum("album1", null, "album1", "album-description1"));
assertThat(memoryDatabase.getAlbum("album2").get(),
- isAlbum("album2", null, "album2", "album-description2",
- "image1"));
+ isAlbum("album2", null, "album2", "album-description2"));
assertThat(memoryDatabase.getAlbum("album3").get(),
- isAlbum("album3", "album1", "album3", "album-description3",
- null));
+ isAlbum("album3", "album1", "album3", "album-description3"));
assertThat(memoryDatabase.getAlbum("album4").isPresent(), is(false));
assertThat(memoryDatabase.getImage("image1").get(),
isImage("image1", 1000L, "KSK@image1", "image1",