Don’t set the request URI anymore, either.
[Sone.git] / src / test / java / net / pterodactylus / sone / core / SoneDownloaderTest.java
index 31e83f7..127837a 100644 (file)
@@ -1,6 +1,10 @@
 package net.pterodactylus.sone.core;
 
 import static com.google.common.base.Optional.of;
+import static freenet.keys.InsertableClientSSK.createRandom;
+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;
@@ -12,10 +16,10 @@ 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;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -33,29 +37,36 @@ import java.util.Map;
 import java.util.Set;
 
 import net.pterodactylus.sone.core.FreenetInterface.Fetched;
-import net.pterodactylus.sone.core.SoneDownloader.FetchSone;
-import net.pterodactylus.sone.core.SoneDownloader.FetchSoneWithUri;
 import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.AlbumImpl;
+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.database.SoneBuilder;
+import net.pterodactylus.sone.database.memory.MemorySoneBuilder;
 import net.pterodactylus.sone.freenet.wot.Identity;
 
 import freenet.client.ClientMetadata;
 import freenet.client.FetchResult;
+import freenet.client.async.USKCallback;
+import freenet.crypt.DummyRandomSource;
+import freenet.keys.ClientSSK;
 import freenet.keys.FreenetURI;
+import freenet.keys.InsertableClientSSK;
 import freenet.support.api.Bucket;
 
 import com.google.common.base.Optional;
+import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ListMultimap;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -63,7 +74,7 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 /**
- * Unit test for {@link SoneDownloader} and its subclasses.
+ * Unit test for {@link SoneDownloaderImpl} and its subclasses.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
@@ -71,33 +82,56 @@ public class SoneDownloaderTest {
 
        private final Core core = mock(Core.class);
        private final FreenetInterface freenetInterface = mock(FreenetInterface.class);
-       private final SoneDownloader soneDownloader = new SoneDownloader(core, freenetInterface);
-       private final FreenetURI requestUri = mock(FreenetURI.class);
-       private final Sone sone = mock(Sone.class);
+       private final SoneDownloaderImpl soneDownloader = new SoneDownloaderImpl(core, freenetInterface);
+       private FreenetURI requestUri = mock(FreenetURI.class);
+       private Sone sone = mock(Sone.class);
        private final PostBuilder postBuilder = mock(PostBuilder.class);
        private final List<Post> createdPosts = new ArrayList<Post>();
        private Post post = mock(Post.class);
        private final PostReplyBuilder postReplyBuilder = mock(PostReplyBuilder.class);
        private final Set<PostReply> createdPostReplies = new HashSet<PostReply>();
        private PostReply postReply = mock(PostReply.class);
+       private final AlbumBuilder albumBuilder = mock(AlbumBuilder.class);
+       private final ListMultimap<Album, Album> nestedAlbums = ArrayListMultimap.create();
+       private final ListMultimap<Album, Image> albumImages = ArrayListMultimap.create();
+       private Album album = mock(Album.class);
        private final Map<String, Album> albums = new HashMap<String, Album>();
+       private final ImageBuilder imageBuilder = mock(ImageBuilder.class);
+       private Image image = mock(Image.class);
+       private final Map<String, Image> images = new HashMap<String, Image>();
 
        @Before
        public void setupSone() {
+               Sone sone = SoneDownloaderTest.this.sone;
                Identity identity = mock(Identity.class);
+               InsertableClientSSK clientSSK = createRandom(new DummyRandomSource(), "WoT");
+               when(identity.getRequestUri()).thenReturn(clientSSK.getURI().toString());
                when(identity.getId()).thenReturn("identity");
                when(sone.getId()).thenReturn("identity");
                when(sone.getIdentity()).thenReturn(identity);
-               when(sone.getRequestUri()).thenReturn(requestUri);
+               requestUri = clientSSK.getURI().setKeyType("USK").setDocName("Sone");
+               when(sone.getRequestUri()).thenAnswer(new Answer<FreenetURI>() {
+                       @Override
+                       public FreenetURI answer(InvocationOnMock invocation)
+                       throws Throwable {
+                               return requestUri;
+                       }
+               });
+               when(sone.getTime()).thenReturn(currentTimeMillis() - DAYS.toMillis(1));
+       }
+
+       private void setupSoneAsUnknown() {
+               when(sone.getTime()).thenReturn(0L);
        }
 
        @Before
-       public void setupRequestUri() {
-               when(requestUri.setKeyType(anyString())).thenReturn(requestUri);
-               when(requestUri.sskForUSK()).thenReturn(requestUri);
-               when(requestUri.setDocName(anyString())).thenReturn(requestUri);
-               when(requestUri.setMetaString(any(String[].class))).thenReturn(requestUri);
-               when(requestUri.getKeyType()).thenReturn("USK");
+       public void setupSoneBuilder() {
+               when(core.soneBuilder()).thenAnswer(new Answer<SoneBuilder>() {
+                       @Override
+                       public SoneBuilder answer(InvocationOnMock invocation) {
+                               return new MemorySoneBuilder();
+                       }
+               });
        }
 
        @Before
@@ -166,30 +200,42 @@ public class SoneDownloaderTest {
                                return postReplyBuilder;
                        }
                });
-               when(postReplyBuilder.from(anyString())).thenAnswer(new Answer<PostReplyBuilder>() {
-                       @Override
-                       public PostReplyBuilder answer(InvocationOnMock invocation) throws Throwable {
-                               Sone sone = when(mock(Sone.class).getId()).thenReturn((String) invocation.getArguments()[0]).getMock();
-                               when(postReply.getSone()).thenReturn(sone);
-                               return postReplyBuilder;
-                       }
-               });
-               when(postReplyBuilder.to(anyString())).thenAnswer(new Answer<PostReplyBuilder>() {
-                       @Override
-                       public PostReplyBuilder answer(InvocationOnMock invocation) throws Throwable {
-                               when(postReply.getPostId()).thenReturn((String) invocation.getArguments()[0]);
-                               Post post = when(mock(Post.class).getId()).thenReturn((String) invocation.getArguments()[0]).getMock();
-                               when(postReply.getPost()).thenReturn(of(post));
-                               return postReplyBuilder;
-                       }
-               });
-               when(postReplyBuilder.withTime(anyLong())).thenAnswer(new Answer<PostReplyBuilder>() {
-                       @Override
-                       public PostReplyBuilder answer(InvocationOnMock invocation) throws Throwable {
-                               when(postReply.getTime()).thenReturn((Long) invocation.getArguments()[0]);
-                               return postReplyBuilder;
-                       }
-               });
+               when(postReplyBuilder.from(anyString())).thenAnswer(
+                               new Answer<PostReplyBuilder>() {
+                                       @Override
+                                       public PostReplyBuilder answer(
+                                                       InvocationOnMock invocation) throws Throwable {
+                                               Sone sone = when(mock(Sone.class).getId()).thenReturn(
+                                                               (String) invocation.getArguments()[0])
+                                                               .getMock();
+                                               when(postReply.getSone()).thenReturn(sone);
+                                               return postReplyBuilder;
+                                       }
+                               });
+               when(postReplyBuilder.to(anyString())).thenAnswer(
+                               new Answer<PostReplyBuilder>() {
+                                       @Override
+                                       public PostReplyBuilder answer(
+                                                       InvocationOnMock invocation) throws Throwable {
+                                               when(postReply.getPostId()).thenReturn(
+                                                               (String) invocation.getArguments()[0]);
+                                               Post post = when(mock(Post.class).getId()).thenReturn(
+                                                               (String) invocation.getArguments()[0])
+                                                               .getMock();
+                                               when(postReply.getPost()).thenReturn(of(post));
+                                               return postReplyBuilder;
+                                       }
+                               });
+               when(postReplyBuilder.withTime(anyLong())).thenAnswer(
+                               new Answer<PostReplyBuilder>() {
+                                       @Override
+                                       public PostReplyBuilder answer(
+                                                       InvocationOnMock invocation) throws Throwable {
+                                               when(postReply.getTime()).thenReturn(
+                                                               (Long) invocation.getArguments()[0]);
+                                               return postReplyBuilder;
+                                       }
+                               });
                when(postReplyBuilder.withText(anyString())).thenAnswer(new Answer<PostReplyBuilder>() {
                        @Override
                        public PostReplyBuilder answer(InvocationOnMock invocation) throws Throwable {
@@ -210,34 +256,234 @@ public class SoneDownloaderTest {
        }
 
        @Before
+       public void setupAlbum() {
+               final Album album = SoneDownloaderTest.this.album;
+               when(album.getAlbumImage()).thenReturn(mock(Image.class));
+               doAnswer(new Answer<Void>() {
+                       @Override
+                       public Void answer(InvocationOnMock invocation) {
+                               nestedAlbums.put(album, (Album) invocation.getArguments()[0]);
+                               return null;
+                       }
+               }).when(album).addAlbum(any(Album.class));
+               doAnswer(new Answer<Void>() {
+                       @Override
+                       public Void answer(InvocationOnMock invocation) {
+                               albumImages.put(album, (Image) invocation.getArguments()[0]);
+                               return null;
+                       }
+               }).when(album).addImage(any(Image.class));
+               when(album.getAlbums()).thenAnswer(new Answer<List<Album>>() {
+                       @Override
+                       public List<Album> answer(InvocationOnMock invocation) {
+                               return nestedAlbums.get(album);
+                       }
+               });
+               when(album.getImages()).thenAnswer(new Answer<List<Image>>() {
+                       @Override
+                       public List<Image> answer(InvocationOnMock invocation) {
+                               return albumImages.get(album);
+                       }
+               });
+               final Modifier albumModifier = new Modifier() {
+                       private String title = album.getTitle();
+                       private String description = album.getDescription();
+                       private String imageId = album.getAlbumImage().getId();
+
+                       @Override
+                       public Modifier setTitle(String title) {
+                               this.title = title;
+                               return this;
+                       }
+
+                       @Override
+                       public Modifier setDescription(String description) {
+                               this.description = description;
+                               return this;
+                       }
+
+                       @Override
+                       public Modifier setAlbumImage(String imageId) {
+                               this.imageId = imageId;
+                               return this;
+                       }
+
+                       @Override
+                       public Album update() throws IllegalStateException {
+                               when(album.getTitle()).thenReturn(title);
+                               when(album.getDescription()).thenReturn(description);
+                               Image image = mock(Image.class);
+                               when(image.getId()).thenReturn(imageId);
+                               when(album.getAlbumImage()).thenReturn(image);
+                               return album;
+                       }
+               };
+               when(album.modify()).thenReturn(albumModifier);
+       }
+
+       @Before
+       public void setupAlbumBuilder() {
+               when(albumBuilder.withId(anyString())).thenAnswer(new Answer<AlbumBuilder>() {
+                       @Override
+                       public AlbumBuilder answer(InvocationOnMock invocation) {
+                               when(album.getId()).thenReturn((String) invocation.getArguments()[0]);
+                               return albumBuilder;
+                       }
+               });
+               when(albumBuilder.randomId()).thenAnswer(new Answer<AlbumBuilder>() {
+                       @Override
+                       public AlbumBuilder answer(InvocationOnMock invocation) {
+                               when(album.getId()).thenReturn(randomUUID().toString());
+                               return albumBuilder;
+                       }
+               });
+               when(albumBuilder.by(any(Sone.class))).thenAnswer(new Answer<AlbumBuilder>() {
+                       @Override
+                       public AlbumBuilder answer(InvocationOnMock invocation) {
+                               when(album.getSone()).thenReturn((Sone) invocation.getArguments()[0]);
+                               return albumBuilder;
+                       }
+               });
+               when(albumBuilder.build()).thenAnswer(new Answer<Album>() {
+                       @Override
+                       public Album answer(InvocationOnMock invocation) {
+                               Album album = SoneDownloaderTest.this.album;
+                               albums.put(album.getId(), album);
+                               SoneDownloaderTest.this.album = mock(Album.class);
+                               setupAlbum();
+                               return album;
+                       }
+               });
+               when(core.albumBuilder()).thenReturn(albumBuilder);
+       }
+
+       @Before
        public void setupAlbums() {
-               albums.put("album-id-1", new AlbumImpl("album-id-1"));
-               albums.put("album-id-2", new AlbumImpl("album-id-2"));
                when(core.getAlbum(anyString())).thenAnswer(new Answer<Album>() {
                        @Override
-                       public Album answer(InvocationOnMock invocation) throws Throwable {
+                       public Album answer(InvocationOnMock invocation)
+                       throws Throwable {
                                return albums.get(invocation.getArguments()[0]);
                        }
                });
-               when(core.getAlbum(anyString(), anyBoolean())).thenAnswer(new Answer<Album>() {
+       }
+
+       @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 Album answer(InvocationOnMock invocation) throws Throwable {
-                               return albums.get(invocation.getArguments()[0]);
+                       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<ImageBuilder>() {
+                       @Override
+                       public ImageBuilder answer(InvocationOnMock invocation) {
+                               when(image.getId()).thenReturn(randomUUID().toString());
+                               return imageBuilder;
                        }
                });
+               when(imageBuilder.withId(anyString())).thenAnswer(new Answer<ImageBuilder>() {
+                       @Override
+                       public ImageBuilder answer(InvocationOnMock invocation) {
+                               when(image.getId()).thenReturn(
+                                               (String) invocation.getArguments()[0]);
+                               return imageBuilder;
+                       }
+               });
+               when(imageBuilder.build()).thenAnswer(new Answer<Image>() {
+                       @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<Image>() {
+                       @Override
+                       public Image answer(InvocationOnMock invocation)
+                       throws Throwable {
+                               return images.get(invocation.getArguments()[0]);
+                       }
+               });
        }
 
        @Test
        public void addingASoneWillRegisterItsKey() {
                soneDownloader.addSone(sone);
-               verify(freenetInterface).registerUsk(sone, soneDownloader);
+               verify(freenetInterface).registerActiveUsk(eq(sone.getRequestUri()), any(
+                               USKCallback.class));
                verify(freenetInterface, never()).unregisterUsk(sone);
        }
 
@@ -245,7 +491,8 @@ public class SoneDownloaderTest {
        public void addingASoneTwiceWillAlsoDeregisterItsKey() {
                soneDownloader.addSone(sone);
                soneDownloader.addSone(sone);
-               verify(freenetInterface, times(2)).registerUsk(sone, soneDownloader);
+               verify(freenetInterface, times(2)).registerActiveUsk(eq(
+                               sone.getRequestUri()), any(USKCallback.class));
                verify(freenetInterface).unregisterUsk(sone);
        }
 
@@ -306,13 +553,15 @@ public class SoneDownloaderTest {
        @Test
        public void parsingASoneSucceedsWithoutPayload() throws SoneException {
                InputStream inputStream = getClass().getResourceAsStream("sone-parser-no-payload.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream).getTime(), is(1407197508000L));
+               assertThat(soneDownloader.parseSone(sone, inputStream).getTime(), is(
+                               1407197508000L));
        }
 
        @Test
        public void parsingASoneSucceedsWithoutProtocolVersion() throws SoneException {
                InputStream inputStream = getClass().getResourceAsStream("sone-parser-missing-protocol-version.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream), not(nullValue()));
+               assertThat(soneDownloader.parseSone(sone, inputStream), not(
+                               nullValue()));
        }
 
        @Test
@@ -334,30 +583,6 @@ public class SoneDownloaderTest {
        }
 
        @Test
-       public void parsingASoneSucceedsWithRequestUri() throws SoneException, MalformedURLException {
-               InputStream inputStream = getClass().getResourceAsStream("sone-parser-with-request-uri.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream).getRequestUri().toString(), is("USK@w~RyTGmv12Lg9oO91q1Untupi7my9qczT1RheGkEkVE,E8ElVfUgukSCPHxIEJp-gHMiR80wpM7sID3Jo5O7w1s,AQACAAE/Sone/0"));
-       }
-
-       @Test
-       public void parsingASoneFailsWithInvalidRequestUri() throws SoneException, MalformedURLException {
-               InputStream inputStream = getClass().getResourceAsStream("sone-parser-with-invalid-request-uri.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream), nullValue());
-       }
-
-       @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();
@@ -419,7 +644,8 @@ public class SoneDownloaderTest {
                assertThat(posts.get(0).getSone().getId(), is(sone.getId()));
                assertThat(posts.get(0).getId(), is("post-id"));
                assertThat(posts.get(0).getTime(), is(1407197508000L));
-               assertThat(posts.get(0).getRecipientId(), is(of("1234567890123456789012345678901234567890123")));
+               assertThat(posts.get(0).getRecipientId(), is(of(
+                               "1234567890123456789012345678901234567890123")));
                assertThat(posts.get(0).getText(), is("text"));
        }
 
@@ -482,31 +708,36 @@ public class SoneDownloaderTest {
        @Test
        public void parsingASoneSucceedsWithoutLikedPostIds() throws SoneException, MalformedURLException {
                InputStream inputStream = getClass().getResourceAsStream("sone-parser-without-liked-post-ids.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream), not(nullValue()));
+               assertThat(soneDownloader.parseSone(sone, inputStream), not(
+                               nullValue()));
        }
 
        @Test
        public void parsingASoneSucceedsWithLikedPostIds() throws SoneException, MalformedURLException {
                InputStream inputStream = getClass().getResourceAsStream("sone-parser-with-liked-post-ids.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream).getLikedPostIds(), is((Set<String>) ImmutableSet.of("liked-post-id")));
+               assertThat(soneDownloader.parseSone(sone, inputStream).getLikedPostIds(), is(
+                               (Set<String>) ImmutableSet.of("liked-post-id")));
        }
 
        @Test
        public void parsingASoneSucceedsWithoutLikedPostReplyIds() throws SoneException, MalformedURLException {
                InputStream inputStream = getClass().getResourceAsStream("sone-parser-without-liked-post-reply-ids.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream), not(nullValue()));
+               assertThat(soneDownloader.parseSone(sone, inputStream), not(
+                               nullValue()));
        }
 
        @Test
        public void parsingASoneSucceedsWithLikedPostReplyIds() throws SoneException, MalformedURLException {
                InputStream inputStream = getClass().getResourceAsStream("sone-parser-with-liked-post-reply-ids.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream).getLikedReplyIds(), is((Set<String>) ImmutableSet.of("liked-post-reply-id")));
+               assertThat(soneDownloader.parseSone(sone, inputStream).getLikedReplyIds(), is(
+                               (Set<String>) ImmutableSet.of("liked-post-reply-id")));
        }
 
        @Test
        public void parsingASoneSucceedsWithoutAlbums() throws SoneException, MalformedURLException {
                InputStream inputStream = getClass().getResourceAsStream("sone-parser-without-albums.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream), not(nullValue()));
+               assertThat(soneDownloader.parseSone(sone, inputStream), not(
+                               nullValue()));
        }
 
        @Test
@@ -548,7 +779,8 @@ public class SoneDownloaderTest {
        @Test
        public void parsingASoneSucceedsWithoutImages() throws SoneException, MalformedURLException {
                InputStream inputStream = getClass().getResourceAsStream("sone-parser-without-images.xml");
-               assertThat(soneDownloader.parseSone(sone, inputStream), not(nullValue()));
+               assertThat(soneDownloader.parseSone(sone, inputStream), not(
+                               nullValue()));
        }
 
        @Test
@@ -625,29 +857,12 @@ public class SoneDownloaderTest {
        }
 
        @Test
-       public void fetchSoneWithUriDownloadsSoneWithUri() {
-               SoneDownloader soneDownloader = mock(SoneDownloader.class);
-               Sone sone = mock(Sone.class);
-               FreenetURI soneUri = mock(FreenetURI.class);
-               when(sone.getRequestUri()).thenReturn(soneUri);
-               FetchSoneWithUri fetchSoneWithUri = soneDownloader.new FetchSoneWithUri(sone);
-               fetchSoneWithUri.run();
-               verify(soneDownloader).fetchSone(eq(sone), eq(soneUri));
-       }
-
-       @Test
-       public void fetchSoneDownloadsSone() {
-               SoneDownloader soneDownloader = mock(SoneDownloader.class);
-               Sone sone = mock(Sone.class);
-               FetchSone fetchSone = soneDownloader.new FetchSone(sone);
-               fetchSone.run();
-               verify(soneDownloader).fetchSone(eq(sone));
-       }
-
-       @Test
        public void notBeingAbleToFetchAnUnknownSoneDoesNotUpdateCore() {
-               soneDownloader.fetchSone(sone);
-               verify(freenetInterface).fetchUri(requestUri);
+               FreenetURI finalRequestUri = requestUri.sskForUSK()
+                               .setMetaString(new String[] { "sone.xml" });
+               setupSoneAsUnknown();
+               soneDownloader.fetchSoneAction(sone).run();
+               verify(freenetInterface).fetchUri(finalRequestUri);
                verifyThatSoneStatusWasChangedToDownloadingAndBackTo(unknown);
                verify(core, never()).updateSone(any(Sone.class));
        }
@@ -661,20 +876,24 @@ public class SoneDownloaderTest {
 
        @Test
        public void notBeingAbleToFetchAKnownSoneDoesNotUpdateCore() {
-               when(sone.getTime()).thenReturn(1000L);
-               soneDownloader.fetchSone(sone);
-               verify(freenetInterface).fetchUri(requestUri);
+               FreenetURI finalRequestUri = requestUri.sskForUSK()
+                               .setMetaString(new String[] { "sone.xml" });
+               soneDownloader.fetchSoneAction(sone).run();
+               verify(freenetInterface).fetchUri(finalRequestUri);
                verifyThatSoneStatusWasChangedToDownloadingAndBackTo(idle);
                verify(core, never()).updateSone(any(Sone.class));
        }
 
        @Test(expected = NullPointerException.class)
        public void exceptionWhileFetchingAnUnknownSoneDoesNotUpdateCore() {
-               when(freenetInterface.fetchUri(requestUri)).thenThrow(NullPointerException.class);
+               FreenetURI finalRequestUri = requestUri.sskForUSK()
+                               .setMetaString(new String[] { "sone.xml" });
+               setupSoneAsUnknown();
+               when(freenetInterface.fetchUri(finalRequestUri)).thenThrow(NullPointerException.class);
                try {
-                       soneDownloader.fetchSone(sone);
+                       soneDownloader.fetchSoneAction(sone).run();
                } finally {
-                       verify(freenetInterface).fetchUri(requestUri);
+                       verify(freenetInterface).fetchUri(finalRequestUri);
                        verifyThatSoneStatusWasChangedToDownloadingAndBackTo(unknown);
                        verify(core, never()).updateSone(any(Sone.class));
                }
@@ -682,12 +901,13 @@ public class SoneDownloaderTest {
 
        @Test(expected = NullPointerException.class)
        public void exceptionWhileFetchingAKnownSoneDoesNotUpdateCore() {
-               when(sone.getTime()).thenReturn(1000L);
-               when(freenetInterface.fetchUri(requestUri)).thenThrow(NullPointerException.class);
+               FreenetURI finalRequestUri = requestUri.sskForUSK()
+                               .setMetaString(new String[] { "sone.xml" });
+               when(freenetInterface.fetchUri(finalRequestUri)).thenThrow( NullPointerException.class);
                try {
-                       soneDownloader.fetchSone(sone);
+                       soneDownloader.fetchSoneAction(sone).run();
                } finally {
-                       verify(freenetInterface).fetchUri(requestUri);
+                       verify(freenetInterface).fetchUri(finalRequestUri);
                        verifyThatSoneStatusWasChangedToDownloadingAndBackTo(idle);
                        verify(core, never()).updateSone(any(Sone.class));
                }
@@ -695,9 +915,12 @@ public class SoneDownloaderTest {
 
        @Test
        public void successfulFetchingOfSoneWithUskRequestUriUpdatesTheCoreWithASone() throws IOException {
-               final Fetched fetchResult = createFetchResult(requestUri, getClass().getResourceAsStream("sone-parser-no-payload.xml"));
-               when(freenetInterface.fetchUri(requestUri)).thenReturn(fetchResult);
-               soneDownloader.fetchSone(sone);
+               FreenetURI finalRequestUri = requestUri.sskForUSK()
+                               .setMetaString(new String[] { "sone.xml" });
+               final Fetched fetchResult = createFetchResult(finalRequestUri,
+                               getClass().getResourceAsStream("sone-parser-no-payload.xml"));
+               when(freenetInterface.fetchUri(finalRequestUri)).thenReturn(fetchResult);
+               soneDownloader.fetchSoneAction(sone).run();
                verifyThatParsedSoneHasTheSameIdAsTheOriginalSone();
        }
 
@@ -708,37 +931,19 @@ public class SoneDownloaderTest {
        }
 
        @Test
-       public void successfulFetchingOfSoneWithSskRequestUriUpdatesTheCoreWithASone() throws IOException {
-               when(requestUri.getKeyType()).thenReturn("SSK");
-               final Fetched fetchResult = createFetchResult(requestUri, getClass().getResourceAsStream("sone-parser-no-payload.xml"));
-               when(freenetInterface.fetchUri(requestUri)).thenReturn(fetchResult);
-               soneDownloader.fetchSone(sone);
-               verifyThatParsedSoneHasTheSameIdAsTheOriginalSone();
-       }
-
-       @Test
-       public void successfulFetchingAnUnknownSoneWithSskRequestUriUpdatesTheCoreWithASone() throws IOException {
-               when(requestUri.getKeyType()).thenReturn("SSK");
-               final Fetched fetchResult = createFetchResult(requestUri, getClass().getResourceAsStream("sone-parser-with-zero-time.xml"));
-               when(freenetInterface.fetchUri(requestUri)).thenReturn(fetchResult);
-               soneDownloader.fetchSone(sone);
-               verifyThatParsedSoneHasTheSameIdAsTheOriginalSone();
-       }
-
-       @Test
        public void fetchingSoneWithInvalidXmlWillNotUpdateTheCore() throws IOException {
                final Fetched fetchResult = createFetchResult(requestUri, getClass().getResourceAsStream("sone-parser-not-xml.xml"));
                when(freenetInterface.fetchUri(requestUri)).thenReturn(fetchResult);
-               soneDownloader.fetchSone(sone);
+               soneDownloader.fetchSoneAction(sone).run();
                verify(core, never()).updateSone(any(Sone.class));
        }
 
        @Test
        public void exceptionWhileFetchingSoneWillNotUpdateTheCore() throws IOException {
                final Fetched fetchResult = createFetchResult(requestUri, getClass().getResourceAsStream("sone-parser-no-payload.xml"));
-               when(sone.getId()).thenThrow(NullPointerException.class);
+               when(core.soneBuilder()).thenReturn(null);
                when(freenetInterface.fetchUri(requestUri)).thenReturn(fetchResult);
-               soneDownloader.fetchSone(sone);
+               soneDownloader.fetchSoneAction(sone).run();
                verify(core, never()).updateSone(any(Sone.class));
        }
 
@@ -748,7 +953,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 {