Add HttpRange tests, set Accept-Range header, polish

Issue: SPR-10805

spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java

@@ -36,6 +36,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
+ * Unit tests for {@link org.springframework.http.HttpHeaders}.
  * @author Arjen Poutsma
  */
 public class HttpHeadersTests {
@@ -266,16 +267,4 @@ public class HttpHeadersTests {
 		assertThat(headers.getAllow(), Matchers.emptyCollectionOf(HttpMethod.class));
 	}
 
-	@Test
-	public void range() {
-		List<HttpRange> ranges = new ArrayList<>();
-		ranges.add(HttpRange.createByteRange(0, 499));
-		ranges.add(HttpRange.createByteRange(9500));
-		ranges.add(HttpRange.createSuffixRange(500));
-
-		headers.setRange(ranges);
-		assertEquals("Invalid Range header", ranges, headers.getRange());
-		assertEquals("Invalid Range header", "bytes=0-499, 9500-, -500", headers.getFirst("Range"));
-	}
-
 }

spring-web/src/test/java/org/springframework/http/HttpRangeTests.java

@@ -0,0 +1,103 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.http;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link org.springframework.http.HttpRange}.
+ * @author Rossen Stoyanchev
+ */
+public class HttpRangeTests {
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidFirstPosition() throws Exception {
+		HttpRange.createByteRange(-1);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidLastLessThanFirst() throws Exception {
+		HttpRange.createByteRange(10, 9);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidSuffixLength() throws Exception {
+		HttpRange.createSuffixRange(-1);
+	}
+
+	@Test
+	public void byteRange() throws Exception {
+		HttpRange range = HttpRange.createByteRange(0, 499);
+		assertEquals(0, range.getRangeStart(1000));
+		assertEquals(499, range.getRangeEnd(1000));
+	}
+
+	@Test
+	public void byteRangeWithoutLastPosition() throws Exception {
+		HttpRange range = HttpRange.createByteRange(9500);
+		assertEquals(9500, range.getRangeStart(10000));
+		assertEquals(9999, range.getRangeEnd(10000));
+	}
+
+	@Test
+	public void byteRangeOfZeroLength() throws Exception {
+		HttpRange range = HttpRange.createByteRange(9500, 9500);
+		assertEquals(9500, range.getRangeStart(10000));
+		assertEquals(9500, range.getRangeEnd(10000));
+	}
+
+	@Test
+	public void suffixRange() throws Exception {
+		HttpRange range = HttpRange.createSuffixRange(500);
+		assertEquals(500, range.getRangeStart(1000));
+		assertEquals(999, range.getRangeEnd(1000));
+	}
+
+	@Test
+	public void suffixRangeShorterThanRepresentation() throws Exception {
+		HttpRange range = HttpRange.createSuffixRange(500);
+		assertEquals(0, range.getRangeStart(350));
+		assertEquals(349, range.getRangeEnd(350));
+	}
+
+	@Test
+	public void parseRanges() throws Exception {
+		List<HttpRange> ranges = HttpRange.parseRanges("bytes=0-0,500-,-1");
+		assertEquals(3, ranges.size());
+		assertEquals(0, ranges.get(0).getRangeStart(1000));
+		assertEquals(0, ranges.get(0).getRangeEnd(1000));
+		assertEquals(500, ranges.get(1).getRangeStart(1000));
+		assertEquals(999, ranges.get(1).getRangeEnd(1000));
+		assertEquals(999, ranges.get(2).getRangeStart(1000));
+		assertEquals(999, ranges.get(2).getRangeEnd(1000));
+	}
+
+	@Test
+	public void rangeToString() {
+		List<HttpRange> ranges = new ArrayList<>();
+		ranges.add(HttpRange.createByteRange(0, 499));
+		ranges.add(HttpRange.createByteRange(9500));
+		ranges.add(HttpRange.createSuffixRange(500));
+		assertEquals("Invalid Range header", "bytes=0-499, 9500-, -500", HttpRange.toString(ranges));
+	}
+
+}