X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FConfigurationSoneParserTest.java;h=4edc1b77089b7266db9b2cb7a352f470919b9d98;hp=7bbfae838c6b9671c04f21a1170cda25f0af00cf;hb=e482c6e00025f94082362b3805ca8d38773f66e4;hpb=f229fe41f708d2b275c20ceb9aba5993761218a3

diff --git a/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java b/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
index 7bbfae8..4edc1b7 100644
--- a/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
@@ -1,10 +1,10 @@
 package net.pterodactylus.sone.core;
 
 import static com.google.common.base.Optional.of;
-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.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -13,8 +13,8 @@ import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -23,11 +23,6 @@ import java.util.List;
 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.core.ConfigurationSoneParser.InvalidAlbumFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidImageFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFound;
@@ -47,6 +42,11 @@ import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostBuilderFactory;
 import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilderFactory;
+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 com.google.common.base.Optional;
@@ -57,8 +57,6 @@ import org.mockito.stubbing.Answer;
 
 /**
  * Unit test for {@link ConfigurationSoneParser}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class ConfigurationSoneParserTest {
 
@@ -333,15 +331,15 @@ public class ConfigurationSoneParserTest {
 						albumBuilderFactory);
 		assertThat(topLevelAlbums, hasSize(2));
 		Album firstAlbum = topLevelAlbums.get(0);
-		assertThat(firstAlbum, isAlbum("A1", null, "T1", "D1", "I1"));
+		assertThat(firstAlbum, isAlbum("A1", null, "T1", "D1"));
 		assertThat(firstAlbum.getAlbums(), emptyIterable());
 		assertThat(firstAlbum.getImages(), emptyIterable());
 		Album secondAlbum = topLevelAlbums.get(1);
-		assertThat(secondAlbum, isAlbum("A2", null, "T2", "D2", null));
+		assertThat(secondAlbum, isAlbum("A2", null, "T2", "D2"));
 		assertThat(secondAlbum.getAlbums(), hasSize(1));
 		assertThat(secondAlbum.getImages(), emptyIterable());
 		Album thirdAlbum = secondAlbum.getAlbums().get(0);
-		assertThat(thirdAlbum, isAlbum("A3", "A2", "T3", "D3", "I3"));
+		assertThat(thirdAlbum, isAlbum("A3", "A2", "T3", "D3"));
 		assertThat(thirdAlbum.getAlbums(), emptyIterable());
 		assertThat(thirdAlbum.getImages(), emptyIterable());
 	}