From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 25 Oct 2013 04:47:09 +0000 (+0200)
Subject: Verify that an invalid image causes an error.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=45f452c0098821ba37b28888ffc75bccae80216d;p=Sone.git

Verify that an invalid image causes an error.
---

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneParser.java b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
index 512da1b..2056c32 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneParser.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
@@ -282,7 +282,7 @@ public class SoneParser {
 						String imageHeightString = imageXml.getValue("height", null);
 						if ((imageId == null) || (imageCreationTimeString == null) || (imageKey == null) || (imageTitle == null) || (imageWidthString == null) || (imageHeightString == null)) {
 							logger.log(Level.WARNING, String.format("Downloaded Sone %s contains invalid images!", sone));
-							return null;
+							throw new MalformedXml();
 						}
 						long creationTime = Numbers.safeParseLong(imageCreationTimeString, 0L);
 						int imageWidth = Numbers.safeParseInteger(imageWidthString, 0);
diff --git a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
index 0e8de25..9ae54a2 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java
@@ -166,6 +166,11 @@ public class SoneParserTest {
 		soneParser.parseSone(database, originalSone, getXml("invalid-parent-album"));
 	}
 
+	@Test(expected = MalformedXml.class)
+	public void verifyThatAnInvalidImageCausesAnError() {
+		soneParser.parseSone(database, originalSone, getXml("invalid-image"));
+	}
+
 	@Test
 	public void verifyThatAnEmptyProfileIsParsedWithoutError() {
 		Sone sone = soneParser.parseSone(database, originalSone, getXml("empty-profile"));
diff --git a/src/test/resources/sone-parser/invalid-image.xml b/src/test/resources/sone-parser/invalid-image.xml
new file mode 100644
index 0000000..8725d81
--- /dev/null
+++ b/src/test/resources/sone-parser/invalid-image.xml
@@ -0,0 +1,86 @@
+<?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>6a73c6e6-3adc-11e3-b091-577b10a725ad</id>
+			<title>Album1</title>
+			<description>First album with stuff.</description>
+			<album-image>e3707102-3adc-11e3-b828-9f4de99f0bc4</album-image>
+			<images>
+				<image>
+					<foo>bar</foo>
+				</image>
+			</images>
+		</album>
+	</albums>
+
+</sone>