Merge branch 'release-0.9.6'

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

diff --git a/src/test/java/net/pterodactylus/sone/TestAlbumBuilder.java b/src/test/java/net/pterodactylus/sone/TestAlbumBuilder.java
index 9890a70..ea21118 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/TestAlbumBuilder.java
+++ b/src/test/java/net/pterodactylus/sone/TestAlbumBuilder.java
@@ -1,7 +1,7 @@
 package net.pterodactylus.sone;
 
 import static java.util.UUID.randomUUID;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -46,17 +46,6 @@ public class TestAlbumBuilder implements AlbumBuilder {
                                return description;
                        }
                });
-               when(album.getAlbumImage()).thenAnswer(new Answer<Image>() {
-                       @Override
-                       public Image answer(InvocationOnMock invocation) {
-                               if (imageId == null) {
-                                       return null;
-                               }
-                               Image image = mock(Image.class);
-                               when(image.getId()).thenReturn(imageId);
-                               return image;
-                       }
-               });
                when(album.getAlbums()).thenReturn(albums);
                when(album.getImages()).thenReturn(images);
                doAnswer(new Answer<Void>() {
@@ -101,12 +90,6 @@ public class TestAlbumBuilder implements AlbumBuilder {
                        }
 
                        @Override
-                       public Modifier setAlbumImage(String imageId) {
-                               TestAlbumBuilder.this.imageId = imageId;
-                               return this;
-                       }
-
-                       @Override
                        public Album update() throws IllegalStateException {
                                return album;
                        }