This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c848a3a Fix test for running onm platforms with different line endings
c848a3a is described below
commit c848a3ab65e48725d1dcb63ec3a90de0f116cfe6
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 25 19:21:19 2019 +0100
Fix test for running onm platforms with different line endings
---
.../servlets/TestDefaultServletRangeRequests.java | 45 ++++++++++++----------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
b/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
index 14675b1..c25a037 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
@@ -41,35 +41,40 @@ public class TestDefaultServletRangeRequests extends
TomcatBaseTest {
@Parameterized.Parameters(name = "{index} rangeHeader [{0}]")
public static Collection<Object[]> parameters() {
- // Note: The index page used by this test has a content-length of 934
bytes
+ // Get the length of the file used for this test
+ // It varies by platform due to line-endings
+ File index = new File("test/webapp/index.html");
+ long len = index.length();
+ String strLen = Long.toString(len);
+
List<Object[]> parameterSets = new ArrayList<>();
- parameterSets.add(new Object[] { "", Integer.valueOf(200), "934", ""
});
+ parameterSets.add(new Object[] { "", Integer.valueOf(200), strLen, ""
});
// Invalid
- parameterSets.add(new Object[] { "bytes", Integer.valueOf(416), "",
"*/934" });
- parameterSets.add(new Object[] { "bytes=", Integer.valueOf(416), "",
"*/934" });
+ parameterSets.add(new Object[] { "bytes", Integer.valueOf(416), "",
"*/" + len });
+ parameterSets.add(new Object[] { "bytes=", Integer.valueOf(416), "",
"*/" + len });
// Invalid with unknown type
- parameterSets.add(new Object[] { "unknown", Integer.valueOf(416), "",
"*/934" });
- parameterSets.add(new Object[] { "unknown=", Integer.valueOf(416), "",
"*/934" });
+ parameterSets.add(new Object[] { "unknown", Integer.valueOf(416), "",
"*/" + len });
+ parameterSets.add(new Object[] { "unknown=", Integer.valueOf(416), "",
"*/" + len });
// Invalid ranges
- parameterSets.add(new Object[] { "bytes=-", Integer.valueOf(416), "",
"*/934" });
- parameterSets.add(new Object[] { "bytes=10-b", Integer.valueOf(416),
"", "*/934" });
- parameterSets.add(new Object[] { "bytes=b-10", Integer.valueOf(416),
"", "*/934" });
+ parameterSets.add(new Object[] { "bytes=-", Integer.valueOf(416), "",
"*/" + len });
+ parameterSets.add(new Object[] { "bytes=10-b", Integer.valueOf(416),
"", "*/" + len });
+ parameterSets.add(new Object[] { "bytes=b-10", Integer.valueOf(416),
"", "*/" + len });
// Invalid no equals
- parameterSets.add(new Object[] { "bytes 1-10", Integer.valueOf(416),
"", "*/934" });
- parameterSets.add(new Object[] { "bytes1-10", Integer.valueOf(416),
"", "*/934" });
- parameterSets.add(new Object[] { "bytes10-", Integer.valueOf(416), "",
"*/934" });
- parameterSets.add(new Object[] { "bytes-10", Integer.valueOf(416), "",
"*/934" });
+ parameterSets.add(new Object[] { "bytes 1-10", Integer.valueOf(416),
"", "*/" + len });
+ parameterSets.add(new Object[] { "bytes1-10", Integer.valueOf(416),
"", "*/" + len });
+ parameterSets.add(new Object[] { "bytes10-", Integer.valueOf(416), "",
"*/" + len });
+ parameterSets.add(new Object[] { "bytes-10", Integer.valueOf(416), "",
"*/" + len });
// Unknown types
- parameterSets.add(new Object[] { "unknown=1-2", Integer.valueOf(416),
"", "*/934" });
- parameterSets.add(new Object[] { "bytesX=1-2", Integer.valueOf(416),
"", "*/934" });
+ parameterSets.add(new Object[] { "unknown=1-2", Integer.valueOf(416),
"", "*/" + len });
+ parameterSets.add(new Object[] { "bytesX=1-2", Integer.valueOf(416),
"", "*/" + len });
// Valid range
- parameterSets.add(new Object[] { "bytes=0-9", Integer.valueOf(206),
"10", "0-9/934" });
- parameterSets.add(new Object[] { "bytes=-100", Integer.valueOf(206),
"100", "834-933/934" });
- parameterSets.add(new Object[] { "bytes=100-", Integer.valueOf(206),
"834", "100-933/934" });
+ parameterSets.add(new Object[] { "bytes=0-9", Integer.valueOf(206),
"10", "0-9/" + len });
+ parameterSets.add(new Object[] { "bytes=-100", Integer.valueOf(206),
"100", "834-" + (len - 1) + "/" + len });
+ parameterSets.add(new Object[] { "bytes=100-", Integer.valueOf(206),
"" + (len - 100), "100-" + (len - 1) + "/" + len });
// Valid range (too much)
- parameterSets.add(new Object[] { "bytes=0-1000", Integer.valueOf(206),
"934", "0-933/934" });
- parameterSets.add(new Object[] { "bytes=-1000", Integer.valueOf(206),
"934", "0-933/934" });
+ parameterSets.add(new Object[] { "bytes=0-1000", Integer.valueOf(206),
strLen, "0-" + (len - 1) + "/" + len });
+ parameterSets.add(new Object[] { "bytes=-1000", Integer.valueOf(206),
strLen, "0-" + (len - 1) + "/" + len });
return parameterSets;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
