From 781549041c0043d5243916e24d4ea2661293387b Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 15 Oct 2013 07:19:58 +0200 Subject: [PATCH] Remove image builder. --- .../sone/data/impl/DefaultImageBuilder.java | 48 --------- .../sone/data/impl/DefaultImageBuilderTest.java | 111 --------------------- 2 files changed, 159 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java delete mode 100644 src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java deleted file mode 100644 index 6df9a47..0000000 --- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Sone - MemoryImageBuilder.java - Copyright © 2013 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.sone.data.impl; - -import net.pterodactylus.sone.data.Image; -import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.database.ImageBuilder; -import net.pterodactylus.sone.database.memory.MemoryDatabase; - -/** - * {@link ImageBuilder} implementation that creates {@link DefaultImage}s. - * - * @author David ‘Bombe’ Roden - */ -public class DefaultImageBuilder extends AbstractImageBuilder { - - private final MemoryDatabase memoryDatabase; - private final Sone sone; - private final String albumId; - - public DefaultImageBuilder(MemoryDatabase memoryDatabase, Sone sone, String albumId) { - this.memoryDatabase = memoryDatabase; - this.sone = sone; - this.albumId = albumId; - } - - @Override - public Image build() throws IllegalStateException { - validate(); - return new DefaultImage(memoryDatabase, getId(), sone, albumId, key, getCreationTime(), width, height); - } - -} diff --git a/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java b/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java deleted file mode 100644 index 21c89d8..0000000 --- a/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Sone - ImageBuilderImplTest.java - Copyright © 2013 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.sone.data.impl; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; - -import net.pterodactylus.sone.data.Image; -import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.database.ImageBuilder; -import net.pterodactylus.sone.database.memory.MemoryDatabase; - -import org.hamcrest.CoreMatchers; -import org.junit.Test; - -/** - * TODO - * - * @author David ‘Bombe’ Roden - */ -public class DefaultImageBuilderTest { - - private static final String ID = "12345"; - private static final long CREATION_TIME = 1234; - private static final String KEY = "key"; - private static final int WIDTH = 640; - private static final int HEIGHT = 270; - - private final Sone sone = mock(Sone.class); - private final DefaultAlbum album = mock(DefaultAlbum.class); - private final ImageBuilder imageBuilder = new DefaultImageBuilder(new MemoryDatabase(null), sone, null); - - @Test - public void testImageCreationWithAllExplicitParameters() { - 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)); - assertThat(image.getCreationTime(), is(CREATION_TIME)); - assertThat(image.getKey(), is(KEY)); - assertThat(image.getWidth(), is(WIDTH)); - assertThat(image.getHeight(), is(HEIGHT)); - } - - @Test - public void testImageCreationWithRandomId() { - 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)); - assertThat(image.getCreationTime(), is(CREATION_TIME)); - assertThat(image.getKey(), is(KEY)); - assertThat(image.getWidth(), is(WIDTH)); - assertThat(image.getHeight(), is(HEIGHT)); - } - - @Test - public void testImageCreationWithCurrentTime() { - 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)); - assertThat(image.getCreationTime() > 0, is(true)); - assertThat(image.getKey(), is(KEY)); - assertThat(image.getWidth(), is(WIDTH)); - assertThat(image.getHeight(), is(HEIGHT)); - } - - @Test(expected = IllegalStateException.class) - public void testThatImageCreationWithoutAnIdFails() { - imageBuilder.created(CREATION_TIME).at(KEY).sized(WIDTH, HEIGHT).build(); - } - - @Test(expected = IllegalStateException.class) - public void testThatImageCreationWithoutATimeFails() { - imageBuilder.withId(ID).at(KEY).sized(WIDTH, HEIGHT).build(); - } - - @Test(expected = IllegalStateException.class) - public void testThatImageCreationWithoutASizeFails() { - imageBuilder.withId(ID).createdNow().at(KEY).build(); - } - - @Test(expected = IllegalStateException.class) - public void testThatImageCreationWithoutInvalidWidthFails() { - imageBuilder.withId(ID).createdNow().at(KEY).sized(0, 1).build(); - } - - @Test(expected = IllegalStateException.class) - public void testThatImageCreationWithoutInvalidHeightFails() { - imageBuilder.withId(ID).createdNow().at(KEY).sized(1, 0).build(); - } - -} -- 2.7.4