Store DefaultAlbum in DefaultImage.

[Sone.git] / src / test / java / net / pterodactylus / sone / data / impl / DefaultImageBuilderTest.java

diff --git a/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java b/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java
index 38b50fa..2f00735 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java
+++ b/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java
@@ -22,7 +22,6 @@ import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
-import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.database.ImageBuilder;
@@ -44,12 +43,12 @@ public class DefaultImageBuilderTest {
        private static final int HEIGHT = 270;
 
        private final Sone sone = mock(Sone.class);
-       private final Album album = mock(Album.class);
-       private final ImageBuilder imageBuilder = new DefaultImageBuilder(album);
+       private final DefaultAlbum album = mock(DefaultAlbum.class);
+       private final ImageBuilder imageBuilder = new DefaultImageBuilder(sone, album);
 
        @Test
        public void testImageCreationWithAllExplicitParameters() {
-               Image image = imageBuilder.withId(ID).by(sone).created(CREATION_TIME).at(KEY).sized(WIDTH, HEIGHT).build();
+               Image image = imageBuilder.withId(ID).created(CREATION_TIME).at(KEY).sized(WIDTH, HEIGHT).build();
                assertThat(image, CoreMatchers.notNullValue());
                assertThat(image.getId(), is(ID));
                assertThat(image.getSone(), is(sone));
@@ -61,8 +60,7 @@ public class DefaultImageBuilderTest {
 
        @Test
        public void testImageCreationWithRandomId() {
-               Sone sone = mock(Sone.class);
-               Image image = imageBuilder.randomId().by(sone).created(CREATION_TIME).at(KEY).sized(WIDTH, HEIGHT).build();
+               Image image = imageBuilder.randomId().created(CREATION_TIME).at(KEY).sized(WIDTH, HEIGHT).build();
                assertThat(image, CoreMatchers.notNullValue());
                assertThat(image.getId(), notNullValue());
                assertThat(image.getSone(), is(sone));
@@ -74,7 +72,7 @@ public class DefaultImageBuilderTest {
 
        @Test
        public void testImageCreationWithCurrentTime() {
-               Image image = imageBuilder.withId(ID).by(sone).createdNow().at(KEY).sized(WIDTH, HEIGHT).build();
+               Image image = imageBuilder.withId(ID).createdNow().at(KEY).sized(WIDTH, HEIGHT).build();
                assertThat(image, CoreMatchers.notNullValue());
                assertThat(image.getId(), is(ID));
                assertThat(image.getSone(), is(sone));
@@ -86,32 +84,27 @@ public class DefaultImageBuilderTest {
 
        @Test(expected = IllegalStateException.class)
        public void testThatImageCreationWithoutAnIdFails() {
-               imageBuilder.by(sone).created(CREATION_TIME).at(KEY).sized(WIDTH, HEIGHT).build();
-       }
-
-       @Test(expected = IllegalStateException.class)
-       public void testThatImageCreationWithoutASoneFails() {
-               imageBuilder.withId(ID).created(CREATION_TIME).at(KEY).sized(WIDTH, HEIGHT).build();
+               imageBuilder.created(CREATION_TIME).at(KEY).sized(WIDTH, HEIGHT).build();
        }
 
        @Test(expected = IllegalStateException.class)
        public void testThatImageCreationWithoutATimeFails() {
-               imageBuilder.withId(ID).by(sone).at(KEY).sized(WIDTH, HEIGHT).build();
+               imageBuilder.withId(ID).at(KEY).sized(WIDTH, HEIGHT).build();
        }
 
        @Test(expected = IllegalStateException.class)
        public void testThatImageCreationWithoutASizeFails() {
-               imageBuilder.withId(ID).by(sone).createdNow().at(KEY).build();
+               imageBuilder.withId(ID).createdNow().at(KEY).build();
        }
 
        @Test(expected = IllegalStateException.class)
        public void testThatImageCreationWithoutInvalidWidthFails() {
-               imageBuilder.withId(ID).by(sone).createdNow().at(KEY).sized(0, 1).build();
+               imageBuilder.withId(ID).createdNow().at(KEY).sized(0, 1).build();
        }
 
        @Test(expected = IllegalStateException.class)
        public void testThatImageCreationWithoutInvalidHeightFails() {
-               imageBuilder.withId(ID).by(sone).createdNow().at(KEY).sized(1, 0).build();
+               imageBuilder.withId(ID).createdNow().at(KEY).sized(1, 0).build();
        }
 
 }