X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloaderTest.java;h=28879bf50e58cbc418ef749eafaba0f43bc6282e;hb=210684b4bc499e298a0d0abeddd4008cdeb406bc;hp=6095027f863703159d2f75e9dd7ff433e90ff14b;hpb=82a0b83edaff17a60003fbe1051b53dcf32e28f8;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/core/SoneDownloaderTest.java b/src/test/java/net/pterodactylus/sone/core/SoneDownloaderTest.java
index 6095027..28879bf 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneDownloaderTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneDownloaderTest.java
@@ -49,6 +49,8 @@ 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;
@@ -78,7 +80,7 @@ public class SoneDownloaderTest {
 	private final FreenetInterface freenetInterface = mock(FreenetInterface.class);
 	private final SoneDownloaderImpl soneDownloader = new SoneDownloaderImpl(core, freenetInterface);
 	private final FreenetURI requestUri = mock(FreenetURI.class);
-	private final Sone sone = mock(Sone.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);
@@ -96,6 +98,7 @@ public class SoneDownloaderTest {
 
 	@Before
 	public void setupSone() {
+		Sone sone = SoneDownloaderTest.this.sone;
 		Identity identity = mock(Identity.class);
 		when(identity.getId()).thenReturn("identity");
 		when(sone.getId()).thenReturn("identity");
@@ -118,6 +121,16 @@ public class SoneDownloaderTest {
 	}
 
 	@Before
+	public void setupSoneBuilder() {
+		when(core.soneBuilder()).thenAnswer(new Answer<SoneBuilder>() {
+			@Override
+			public SoneBuilder answer(InvocationOnMock invocation) {
+				return new MemorySoneBuilder();
+			}
+		});
+	}
+
+	@Before
 	public void setupPost() {
 		when(post.getRecipientId()).thenReturn(Optional.<String>absent());
 	}
@@ -563,18 +576,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();
@@ -933,7 +934,7 @@ public class SoneDownloaderTest {
 	@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.fetchSoneAction(sone).run();
 		verify(core, never()).updateSone(any(Sone.class));