Add tests for rating parsing

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/channel/ValidateEntry.java

@@ -12,7 +12,6 @@
 import org.dom4j.Element;
 import org.dom4j.dom.DOMElement;
 import org.xmpp.packet.JID;
-import org.xmpp.packet.PacketError;
 
 public class ValidateEntry {
 
@@ -25,6 +24,8 @@ public class ValidateEntry {
 	public static final String IN_REPLY_TO_MISSING = "missing-in-reply-to";
 	public static final String TARGET_ELEMENT_MISSING = "missing-target";
 	public static final String MISSING_TARGET_ID = "missing-target-id";
+	public static final String RATING_OUT_OF_RANGE = "rating-out-of-range";
+	public static final String INVALID_RATING_VALUE = "invalid-rating";
 	public static final String TARGET_MUST_BE_IN_SAME_THREAD = "target-outside-thread";
 
 	public static final String CONTENT_TEXT = "text";
@@ -51,6 +52,7 @@ public class ValidateEntry {
 	private String errorMessage = "";
 	private String inReplyTo = null;
 	private String targetId = null;
+	private int itemRating = 0;
 	private Element meta;
 	private Element media;
 
@@ -323,6 +325,20 @@ private boolean validateRatingElement(Element rating) {
 			this.errorMessage = TARGET_ELEMENT_MISSING;
 			return false;
 		}
+		try {
+		    double itemRatingFloat = Double.parseDouble(rating.getTextTrim());
+		    if (itemRatingFloat != Math.floor(itemRatingFloat)) {
+		    	throw new NumberFormatException("Non-integer rating provided");
+		    }
+		    itemRating = (int) itemRatingFloat;
+		} catch (NumberFormatException e) {
+			this.errorMessage = INVALID_RATING_VALUE;
+			return false;
+		}
+		if ((itemRating < 1) || (itemRating > 5)) {
+			this.errorMessage = RATING_OUT_OF_RANGE;
+			return false;
+		}
 		return true;
 	}
 }

src/test/java/org/buddycloud/channelserver/channel/ValidateEntryTest.java

@@ -508,6 +508,7 @@ public void missingInReplyToErrorsIfRatingElementPresent() throws Exception {
 	public void missingTargetErrorsIfRatingElementPresent() throws Exception {
 
 		Element entry = (Element) this.ratingEntry.clone();
+		entry.element("target").element("id").setText("1");
 		entry.element("target").detach();
 		validateEntry = getEntryObject(entry);
 
@@ -516,4 +517,42 @@ public void missingTargetErrorsIfRatingElementPresent() throws Exception {
 				validateEntry.getErrorMessage());
 	}
 
+	@Test
+	public void invalidRatingValueReturnsError() throws Exception {
+		
+		Element entry = (Element) this.ratingEntry.clone();
+		entry.element("target").element("id").setText("1");
+		entry.element("rating").setText("awesome");
+		validateEntry = getEntryObject(entry);
+
+		Assert.assertFalse(validateEntry.isValid());
+		Assert.assertEquals(ValidateEntry.INVALID_RATING_VALUE,
+				validateEntry.getErrorMessage());
+	}
+
+	@Test
+	public void outOfRangeRatingReturnsError() throws Exception {
+		
+		Element entry = (Element) this.ratingEntry.clone();
+		entry.element("rating").setText("6.0");
+		entry.element("target").element("id").setText("1");
+		validateEntry = getEntryObject(entry);
+
+		Assert.assertFalse(validateEntry.isValid());
+		Assert.assertEquals(ValidateEntry.RATING_OUT_OF_RANGE,
+				validateEntry.getErrorMessage());
+	}
+	
+	@Test
+	public void nonWholeNumberRatingReturnsError() throws Exception {
+		Element entry = (Element) this.ratingEntry.clone();
+		entry.element("rating").setText("4.1");
+		entry.element("target").element("id").setText("1");
+		validateEntry = getEntryObject(entry);
+
+		Assert.assertFalse(validateEntry.isValid());
+		Assert.assertEquals(ValidateEntry.INVALID_RATING_VALUE,
+				validateEntry.getErrorMessage());
+	}
+
 }