X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneParserTest.java;h=3fb2a34496eebe3e94d1f3b4e3d3bca4dec6c11d;hb=00a434a23c9ea1e57c63d8a3c0fc4b09277af431;hp=b6560f41ef1c47d858dd43183bb85864445d6b14;hpb=808a37413dbcd2f8a543f26bef5f639fccba6f4f;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
index b6560f4..3fb2a34 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
@@ -30,6 +30,7 @@ import java.util.Set;
 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;
@@ -114,7 +115,7 @@ public class SoneParserTest {
 		when(core.soneBuilder()).thenAnswer(new Answer<SoneBuilder>() {
 			@Override
 			public SoneBuilder answer(InvocationOnMock invocation) {
-				return new MemorySoneBuilder();
+				return new MemorySoneBuilder(null);
 			}
 		});
 	}
@@ -344,11 +345,11 @@ public class SoneParserTest {
 
 	@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]));
 			}
 		});
 	}
@@ -435,8 +436,8 @@ public class SoneParserTest {
 		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;
 			}
 		});
@@ -818,7 +819,8 @@ public class SoneParserTest {
 		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"));