import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Album.Modifier;
import net.pterodactylus.sone.data.Client;
+import net.pterodactylus.sone.data.IdBuilder;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
@Before
public void setupAlbums() {
- when(core.getAlbum(anyString())).thenAnswer(new Answer<Album>() {
+ when(core.getAlbum(anyString())).thenAnswer(new Answer<Optional<Album>>() {
@Override
- public Album answer(InvocationOnMock invocation)
+ public Optional<Album> answer(InvocationOnMock invocation)
throws Throwable {
- return albums.get(invocation.getArguments()[0]);
+ return Optional.fromNullable(albums.get(invocation.getArguments()[0]));
}
});
}
when(imageBuilder.withId(anyString())).thenAnswer(new Answer<ImageBuilder>() {
@Override
public ImageBuilder answer(InvocationOnMock invocation) {
- when(image.getId()).thenReturn(
- (String) invocation.getArguments()[0]);
+ when(image.getId()).thenReturn(new IdBuilder().buildId("identity", (String) invocation.getArguments()[0]));
+ when(image.getInternalId()).thenReturn((String) invocation.getArguments()[0]);
return imageBuilder;
}
});
assertThat(sone.getRootAlbum().getAlbums(), hasSize(1));
assertThat(sone.getRootAlbum().getAlbums().get(0).getImages(), hasSize(1));
Image image = sone.getRootAlbum().getAlbums().get(0).getImages().get(0);
- assertThat(image.getId(), is("image-id"));
+ assertThat(image.getId(), is(new IdBuilder().buildId("identity", "image-id")));
+ assertThat(image.getInternalId(), is("image-id"));
assertThat(image.getCreationTime(), is(1407197508000L));
assertThat(image.getKey(), is("KSK@GPLv3.txt"));
assertThat(image.getTitle(), is("image-title"));