From: David ‘Bombe’ Roden Date: Fri, 25 Oct 2013 04:50:47 +0000 (+0200) Subject: Verify that an image with invalid dimensions causes an error. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=fc4d30ff863bda9f36ca4991ad571e9f43f86e7f;p=Sone.git Verify that an image with invalid dimensions 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 2056c32..9b960b0 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneParser.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneParser.java @@ -289,7 +289,7 @@ public class SoneParser { int imageHeight = Numbers.safeParseInteger(imageHeightString, 0); if ((imageWidth < 1) || (imageHeight < 1)) { logger.log(Level.WARNING, String.format("Downloaded Sone %s contains image %s with invalid dimensions (%s, %s)!", sone, imageId, imageWidthString, imageHeightString)); - return null; + throw new MalformedDimension(); } Image image = album.newImageBuilder().withId(imageId).at(imageKey).created(creationTime).sized(imageWidth, imageHeight).build(Optional.absent()); image = image.modify().setTitle(imageTitle).setDescription(imageDescription).update(); @@ -368,4 +368,8 @@ public class SoneParser { } + public static class MalformedDimension 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 9ae54a2..4d9c3a1 100644 --- a/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java +++ b/src/test/java/net/pterodactylus/sone/core/SoneParserTest.java @@ -21,6 +21,7 @@ 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.MalformedDimension; import net.pterodactylus.sone.core.SoneParser.MalformedTime; import net.pterodactylus.sone.core.SoneParser.MalformedXml; import net.pterodactylus.sone.data.Client; @@ -171,6 +172,11 @@ public class SoneParserTest { soneParser.parseSone(database, originalSone, getXml("invalid-image")); } + @Test(expected = MalformedDimension.class) + public void verifyThatInvalidImageDimensionsCauseAnError() { + soneParser.parseSone(database, originalSone, getXml("invalid-image-dimensions")); + } + @Test public void verifyThatAnEmptyProfileIsParsedWithoutError() { Sone sone = soneParser.parseSone(database, originalSone, getXml("empty-profile")); diff --git a/src/test/resources/sone-parser/invalid-image-dimensions.xml b/src/test/resources/sone-parser/invalid-image-dimensions.xml new file mode 100644 index 0000000..cbdc853 --- /dev/null +++ b/src/test/resources/sone-parser/invalid-image-dimensions.xml @@ -0,0 +1,136 @@ + + + + + 0 + + + Sone + 0.8.7 + + + + First + M. + Last + 22 + 10 + 2013 + 96431abe-3add-11e3-8a46-67047503bf6d + + + Field1 + Value1 + + + Field2 + Value2 + + + + + + + bbb7ebf0-3adb-11e3-8a0b-630cd8f21cf3 + + + Hello, World! + + + d8c9586e-3adb-11e3-bb31-171fc040e645 + 0rpD4gL8mszav2trndhIdKIxvKUCNAe2kjA3dLV8CVU + + Hello, User! + + + + + + f09fa448-3adb-11e3-a783-ab54a11aacc4 + bbb7ebf0-3adb-11e3-8a0b-630cd8f21cf3 + + Talking to myself. + + + 0a376440-3adc-11e3-8f45-c7cc157436a5 + 11ebe86e-3adc-11e3-b7b9-7f2c88018a33 + + Talking to somebody I can't see. + + + + + bbb7ebf0-3adb-11e3-8a0b-630cd8f21cf3 + 305d85e6-3adc-11e3-be45-8b53dd91f0af + + + + f09fa448-3adb-11e3-a783-ab54a11aacc4 + 3ba28960-3adc-11e3-93c7-6713d170f44c + + + + + 6a73c6e6-3adc-11e3-b091-577b10a725ad + Album1 + First album with stuff. + e3707102-3adc-11e3-b828-9f4de99f0bc4 + + + 8966f69a-3adc-11e3-802d-0f57b63c8809 + 1382420473000 + SSK@JvW9oZ8AriNGbwBosJD1gyMdiMHc5AgSmhNBU1CmAb8,na1IPpMcYiZLaWSv9EWq9NcDPPGplQBw8kJsLobXIG4,AQACAAE/8966f69a-3adc-11e3-802d-0f57b63c8809.jpg + Stuff + Yes, it's stuff! + -47 + 480 + + + e3707102-3adc-11e3-b828-9f4de99f0bc4 + 1382420624000 + SSK@dM1er7A9tG242bG-Xxy0kmprD7YkqEDE9mrZ98C~L3E,Np3iWiaGyd~er86edP9ndpH3pPKk2owDmAT2TQZNBA0,AQACAAE/e3707102-3adc-11e3-b828-9f4de99f0bc4.jpg + More Stuff + Yes, it's more stuff! + 640 + 360 + + + + + 1e73b52a-3add-11e3-ba45-cb0c28da9c2a + 6a73c6e6-3adc-11e3-b091-577b10a725ad + Nested Album + Nested album with stuff. + 312182ba-3add-11e3-bd76-13e7278f0161 + + + 312182ba-3add-11e3-bd76-13e7278f0161 + 1382420756000 + SSK@0rpD4gL8mszav2trndhIdKIxvKUCNAe2kjA3dLV8CVU,2KP8WDSaQvyJ16pXBHQrE1vj~fAaYPIsk35lM-ec4B0,AQACAAE/312182ba-3add-11e3-bd76-13e7278f0161.jpg + Other Stuff + Yes, it's other stuff! + 640 + 272 + + + + + 8a04b5fa-3add-11e3-afe2-676e721c04bd + Avatars + The avatar collection. + 96431abe-3add-11e3-8a46-67047503bf6d + + + 96431abe-3add-11e3-8a46-67047503bf6d + 1382420923000 + SSK@v6Js3ZJBMB23IB0JvdgiPynHQBYEvkFSi3~D8RDdj3s,FfLhjRC4bqYLHVexT33Pv6agXl6Ft~TDhX1jIM5w2n4,AQACAAE/96431abe-3add-11e3-8a46-67047503bf6d.png + Avatar 1 + The first avatar. + 64 + 64 + + + + + +