X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloaderTest.java;h=c910233bc08186621380364810b292515dc7b37d;hp=24a1ac91ad4a970d64d65f0eead117f8fbed020b;hb=2b47186b72e30460a6710f95a76e4a99c305909a;hpb=40a1ac4c90c1480936c9c782727209cf23acd5e5 diff --git a/src/test/java/net/pterodactylus/sone/core/SoneDownloaderTest.java b/src/test/java/net/pterodactylus/sone/core/SoneDownloaderTest.java index 24a1ac9..c910233 100644 --- a/src/test/java/net/pterodactylus/sone/core/SoneDownloaderTest.java +++ b/src/test/java/net/pterodactylus/sone/core/SoneDownloaderTest.java @@ -1,7 +1,9 @@ package net.pterodactylus.sone.core; import static com.google.common.base.Optional.of; +import static java.lang.System.currentTimeMillis; import static java.util.UUID.randomUUID; +import static java.util.concurrent.TimeUnit.DAYS; import static net.pterodactylus.sone.data.Sone.SoneStatus.downloading; import static net.pterodactylus.sone.data.Sone.SoneStatus.idle; import static net.pterodactylus.sone.data.Sone.SoneStatus.unknown; @@ -13,7 +15,6 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.mockito.ArgumentCaptor.forClass; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -39,19 +40,20 @@ import net.pterodactylus.sone.data.Album; import net.pterodactylus.sone.data.Album.Modifier; import net.pterodactylus.sone.data.Client; import net.pterodactylus.sone.data.Image; -import net.pterodactylus.sone.data.ImageImpl; import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.data.Profile; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.data.Sone.SoneStatus; import net.pterodactylus.sone.database.AlbumBuilder; +import net.pterodactylus.sone.database.ImageBuilder; import net.pterodactylus.sone.database.PostBuilder; import net.pterodactylus.sone.database.PostReplyBuilder; import net.pterodactylus.sone.freenet.wot.Identity; import freenet.client.ClientMetadata; import freenet.client.FetchResult; +import freenet.client.async.USKCallback; import freenet.keys.FreenetURI; import freenet.support.api.Bucket; @@ -75,7 +77,6 @@ public class SoneDownloaderTest { private final Core core = mock(Core.class); private final FreenetInterface freenetInterface = mock(FreenetInterface.class); private final SoneDownloaderImpl soneDownloader = new SoneDownloaderImpl(core, freenetInterface); - private final SoneUpdater soneUpdater = mock(SoneUpdater.class); private final FreenetURI requestUri = mock(FreenetURI.class); private final Sone sone = mock(Sone.class); private final PostBuilder postBuilder = mock(PostBuilder.class); @@ -89,6 +90,9 @@ public class SoneDownloaderTest { private final ListMultimap albumImages = ArrayListMultimap.create(); private Album album = mock(Album.class); private final Map albums = new HashMap(); + private final ImageBuilder imageBuilder = mock(ImageBuilder.class); + private Image image = mock(Image.class); + private final Map images = new HashMap(); @Before public void setupSone() { @@ -97,6 +101,11 @@ public class SoneDownloaderTest { when(sone.getId()).thenReturn("identity"); when(sone.getIdentity()).thenReturn(identity); when(sone.getRequestUri()).thenReturn(requestUri); + when(sone.getTime()).thenReturn(currentTimeMillis() - DAYS.toMillis(1)); + } + + private void setupSoneAsUnknown() { + when(sone.getTime()).thenReturn(0L); } @Before @@ -219,10 +228,7 @@ public class SoneDownloaderTest { @Before public void setupAlbum() { - setupAlbum(album); - } - - private void setupAlbum(final Album album) { + final Album album = SoneDownloaderTest.this.album; when(album.getAlbumImage()).thenReturn(mock(Image.class)); doAnswer(new Answer() { @Override @@ -315,7 +321,7 @@ public class SoneDownloaderTest { Album album = SoneDownloaderTest.this.album; albums.put(album.getId(), album); SoneDownloaderTest.this.album = mock(Album.class); - setupAlbum(SoneDownloaderTest.this.album); + setupAlbum(); return album; } }); @@ -333,16 +339,121 @@ public class SoneDownloaderTest { } @Before + public void setupImage() { + final Image image = SoneDownloaderTest.this.image; + Image.Modifier modifier = new Image.Modifier() { + private Sone sone = image.getSone(); + private long creationTime = image.getCreationTime(); + private String key = image.getKey(); + private String title = image.getTitle(); + private String description = image.getDescription(); + private int width = image.getWidth(); + private int height = image.getHeight(); + + @Override + public Image.Modifier setSone(Sone sone) { + this.sone = sone; + return this; + } + + @Override + public Image.Modifier setCreationTime(long creationTime) { + this.creationTime = creationTime; + return this; + } + + @Override + public Image.Modifier setKey(String key) { + this.key = key; + return this; + } + + @Override + public Image.Modifier setTitle(String title) { + this.title = title; + return this; + } + + @Override + public Image.Modifier setDescription(String description) { + this.description = description; + return this; + } + + @Override + public Image.Modifier setWidth(int width) { + this.width = width; + return this; + } + + @Override + public Image.Modifier setHeight(int height) { + this.height = height; + return this; + } + + @Override + public Image update() throws IllegalStateException { + when(image.getSone()).thenReturn(sone); + when(image.getCreationTime()).thenReturn(creationTime); + when(image.getKey()).thenReturn(key); + when(image.getTitle()).thenReturn(title); + when(image.getDescription()).thenReturn(description); + when(image.getWidth()).thenReturn(width); + when(image.getHeight()).thenReturn(height); + return image; + } + }; + when(image.getSone()).thenReturn(sone); + when(image.modify()).thenReturn(modifier); + } + + @Before + public void setupImageBuilder() { + when(imageBuilder.randomId()).thenAnswer(new Answer() { + @Override + public ImageBuilder answer(InvocationOnMock invocation) { + when(image.getId()).thenReturn(randomUUID().toString()); + return imageBuilder; + } + }); + when(imageBuilder.withId(anyString())).thenAnswer(new Answer() { + @Override + public ImageBuilder answer(InvocationOnMock invocation) { + when(image.getId()).thenReturn( + (String) invocation.getArguments()[0]); + return imageBuilder; + } + }); + when(imageBuilder.build()).thenAnswer(new Answer() { + @Override + public Image answer(InvocationOnMock invocation) { + Image image = SoneDownloaderTest.this.image; + images.put(image.getId(), image); + SoneDownloaderTest.this.image = mock(Image.class); + setupImage(); + return image; + } + }); + when(core.imageBuilder()).thenReturn(imageBuilder); + } + + @Before public void setupImages() { - Image image = new ImageImpl("image-id"); - when(core.getImage("image-id")).thenReturn(image); - when(core.getImage(eq("image-id"), anyBoolean())).thenReturn(image); + when(core.getImage(anyString())).thenAnswer(new Answer() { + @Override + public Image answer(InvocationOnMock invocation) + throws Throwable { + return images.get(invocation.getArguments()[0]); + } + }); } @Test public void addingASoneWillRegisterItsKey() { soneDownloader.addSone(sone); - verify(freenetInterface).registerUsk(eq(sone), any(SoneUpdater.class)); + verify(freenetInterface).registerActiveUsk(eq(sone.getRequestUri()), any( + USKCallback.class)); verify(freenetInterface, never()).unregisterUsk(sone); } @@ -350,7 +461,8 @@ public class SoneDownloaderTest { public void addingASoneTwiceWillAlsoDeregisterItsKey() { soneDownloader.addSone(sone); soneDownloader.addSone(sone); - verify(freenetInterface, times(2)).registerUsk(eq(sone), any(SoneUpdater.class)); + verify(freenetInterface, times(2)).registerActiveUsk(eq( + sone.getRequestUri()), any(USKCallback.class)); verify(freenetInterface).unregisterUsk(sone); } @@ -451,18 +563,6 @@ public class SoneDownloaderTest { } @Test - public void soneInsertUriIsCopiedToNewSone() throws SoneException { - InputStream inputStream = getClass().getResourceAsStream("sone-parser-no-payload.xml"); - FreenetURI insertUri = mock(FreenetURI.class); - when(insertUri.setKeyType(anyString())).thenReturn(insertUri); - when(insertUri.setDocName(anyString())).thenReturn(insertUri); - when(insertUri.setMetaString(any(String[].class))).thenReturn(insertUri); - when(insertUri.setSuggestedEdition(anyLong())).thenReturn(insertUri); - when(sone.getInsertUri()).thenReturn(insertUri); - assertThat(soneDownloader.parseSone(sone, inputStream).getInsertUri(), is(insertUri)); - } - - @Test public void parsingASoneSucceedsWithProfile() throws SoneException, MalformedURLException { InputStream inputStream = getClass().getResourceAsStream("sone-parser-with-profile.xml"); final Profile profile = soneDownloader.parseSone(sone, inputStream).getProfile(); @@ -731,6 +831,7 @@ public class SoneDownloaderTest { @Test public void notBeingAbleToFetchAnUnknownSoneDoesNotUpdateCore() { + setupSoneAsUnknown(); soneDownloader.fetchSoneAction(sone).run(); verify(freenetInterface).fetchUri(requestUri); verifyThatSoneStatusWasChangedToDownloadingAndBackTo(unknown); @@ -746,7 +847,6 @@ public class SoneDownloaderTest { @Test public void notBeingAbleToFetchAKnownSoneDoesNotUpdateCore() { - when(sone.getTime()).thenReturn(1000L); soneDownloader.fetchSoneAction(sone).run(); verify(freenetInterface).fetchUri(requestUri); verifyThatSoneStatusWasChangedToDownloadingAndBackTo(idle); @@ -755,6 +855,7 @@ public class SoneDownloaderTest { @Test(expected = NullPointerException.class) public void exceptionWhileFetchingAnUnknownSoneDoesNotUpdateCore() { + setupSoneAsUnknown(); when(freenetInterface.fetchUri(requestUri)).thenThrow(NullPointerException.class); try { soneDownloader.fetchSoneAction(sone).run(); @@ -767,7 +868,6 @@ public class SoneDownloaderTest { @Test(expected = NullPointerException.class) public void exceptionWhileFetchingAKnownSoneDoesNotUpdateCore() { - when(sone.getTime()).thenReturn(1000L); when(freenetInterface.fetchUri(requestUri)).thenThrow(NullPointerException.class); try { soneDownloader.fetchSoneAction(sone).run(); @@ -833,7 +933,7 @@ public class SoneDownloaderTest { when(freenetInterface.fetchUri(requestUri)).thenReturn(fetchResult); soneDownloader.fetchSone(sone, sone.getRequestUri(), true); verify(core, never()).updateSone(any(Sone.class)); - verifyThatSoneStatusWasChangedToDownloadingAndBackTo(unknown); + verifyThatSoneStatusWasChangedToDownloadingAndBackTo(idle); } private Fetched createFetchResult(FreenetURI uri, InputStream inputStream) throws IOException {