From a56d9c3bc7315ce5655d71946ba38c51e8161b41 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Fri, 25 Oct 2013 06:44:50 +0200
Subject: [PATCH] Verify that an invalid parent album causes an error.

---
 .../net/pterodactylus/sone/core/SoneParser.java    |  7 +-
 .../pterodactylus/sone/core/SoneParserTest.java    |  6 ++
 .../resources/sone-parser/invalid-parent-album.xml | 93 ++++++++++++++++++++++
 3 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 src/test/resources/sone-parser/invalid-parent-album.xml

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneParser.java b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
index de11ab1..512da1b 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneParser.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
@@ -265,7 +265,7 @@ public class SoneParser {
 					parent = albums.get(parentId);
 					if (parent == null) {
 						logger.log(Level.WARNING, String.format("Downloaded Sone %s has album with invalid parent!", sone));
-						return null;
+						throw new InvalidParentAlbum();
 					}
 				}
 				Album album = parent.newAlbumBuilder().withId(id).build().modify().setTitle(title).setDescription(description).update();
@@ -363,4 +363,9 @@ public class SoneParser {
 	public static class MalformedTime extends RuntimeException {
 
 	}
+
+	public static class InvalidParentAlbum extends RuntimeException {
+
+	}
+
 }
diff --git a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
index 87f6600..0e8de25 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
@@ -18,6 +18,7 @@ import java.io.InputStream;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.SoneParser.DuplicateField;
+import net.pterodactylus.sone.core.SoneParser.InvalidParentAlbum;
 import net.pterodactylus.sone.core.SoneParser.InvalidProtocolVersion;
 import net.pterodactylus.sone.core.SoneParser.InvalidXml;
 import net.pterodactylus.sone.core.SoneParser.MalformedTime;
@@ -160,6 +161,11 @@ public class SoneParserTest {
 		soneParser.parseSone(database, originalSone, getXml("invalid-album"));
 	}
 
+	@Test(expected = InvalidParentAlbum.class)
+	public void verifyThatAnInvalidParentAlbumCausesAnError() {
+		soneParser.parseSone(database, originalSone, getXml("invalid-parent-album"));
+	}
+
 	@Test
 	public void verifyThatAnEmptyProfileIsParsedWithoutError() {
 		Sone sone = soneParser.parseSone(database, originalSone, getXml("empty-profile"));
diff --git a/src/test/resources/sone-parser/invalid-parent-album.xml b/src/test/resources/sone-parser/invalid-parent-album.xml
new file mode 100644
index 0000000..d72d880
--- /dev/null
+++ b/src/test/resources/sone-parser/invalid-parent-album.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<sone>
+
+	<time>1382419919000</time>
+	<protocol-version>0</protocol-version>
+
+	<client>
+		<name>Sone</name>
+		<version>0.8.7</version>
+	</client>
+
+	<profile>
+		<first-name>First</first-name>
+		<middle-name>M.</middle-name>
+		<last-name>Last</last-name>
+		<birth-day>22</birth-day>
+		<birth-month>10</birth-month>
+		<birth-year>2013</birth-year>
+		<avatar>96431abe-3add-11e3-8a46-67047503bf6d</avatar>
+		<fields>
+			<field>
+				<field-name>Field1</field-name>
+				<field-value>Value1</field-value>
+			</field>
+			<field>
+				<field-name>Field2</field-name>
+				<field-value>Value2</field-value>
+			</field>
+		</fields>
+	</profile>
+
+	<posts>
+		<post>
+			<id>bbb7ebf0-3adb-11e3-8a0b-630cd8f21cf3</id>
+			<recipient></recipient>
+			<time>1382420140000</time>
+			<text>Hello, World!</text>
+		</post>
+		<post>
+			<id>d8c9586e-3adb-11e3-bb31-171fc040e645</id>
+			<recipient>0rpD4gL8mszav2trndhIdKIxvKUCNAe2kjA3dLV8CVU</recipient>
+			<time>1382420181000</time>
+			<text>Hello, User!</text>
+		</post>
+	</posts>
+
+	<replies>
+		<reply>
+			<id>f09fa448-3adb-11e3-a783-ab54a11aacc4</id>
+			<post-id>bbb7ebf0-3adb-11e3-8a0b-630cd8f21cf3</post-id>
+			<time>1382420224000</time>
+			<text>Talking to myself.</text>
+		</reply>
+		<reply>
+			<id>0a376440-3adc-11e3-8f45-c7cc157436a5</id>
+			<post-id>11ebe86e-3adc-11e3-b7b9-7f2c88018a33</post-id>
+			<time>1382420271000</time>
+			<text>Talking to somebody I can't see.</text>
+		</reply>
+	</replies>
+
+	<post-likes>
+		<post-like>bbb7ebf0-3adb-11e3-8a0b-630cd8f21cf3</post-like>
+		<post-like>305d85e6-3adc-11e3-be45-8b53dd91f0af</post-like>
+	</post-likes>
+
+	<reply-likes>
+		<reply-like>f09fa448-3adb-11e3-a783-ab54a11aacc4</reply-like>
+		<reply-like>3ba28960-3adc-11e3-93c7-6713d170f44c</reply-like>
+	</reply-likes>
+
+	<albums>
+		<album>
+			<id>1e73b52a-3add-11e3-ba45-cb0c28da9c2a</id>
+			<parent>6a73c6e6-3adc-11e3-b091-577b10a725ad</parent>
+			<title>Nested Album</title>
+			<description>Nested album with stuff.</description>
+			<album-image>312182ba-3add-11e3-bd76-13e7278f0161</album-image>
+			<images>
+				<image>
+					<id>312182ba-3add-11e3-bd76-13e7278f0161</id>
+					<creation-time>1382420756000</creation-time>
+					<key>SSK@0rpD4gL8mszav2trndhIdKIxvKUCNAe2kjA3dLV8CVU,2KP8WDSaQvyJ16pXBHQrE1vj~fAaYPIsk35lM-ec4B0,AQACAAE/312182ba-3add-11e3-bd76-13e7278f0161.jpg</key>
+					<title>Other Stuff</title>
+					<description>Yes, it's other stuff!</description>
+					<width>640</width>
+					<height>272</height>
+				</image>
+			</images>
+		</album>
+	</albums>
+
+</sone>
-- 
2.7.4