You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/06/18 09:17:47 UTC
[tomcat] branch 9.0.x updated: Fix BZ 65384 - Make test Locale
independent
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 93eabb2 Fix BZ 65384 - Make test Locale independent
93eabb2 is described below
commit 93eabb24463790fad54ef220509f4c5356b21376
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 18 10:16:52 2021 +0100
Fix BZ 65384 - Make test Locale independent
---
test/org/apache/coyote/http2/TestFlowControl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestFlowControl.java b/test/org/apache/coyote/http2/TestFlowControl.java
index 4d08781..e087641 100644
--- a/test/org/apache/coyote/http2/TestFlowControl.java
+++ b/test/org/apache/coyote/http2/TestFlowControl.java
@@ -18,6 +18,7 @@ package org.apache.coyote.http2;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.LogManager;
@@ -93,12 +94,14 @@ public class TestFlowControl extends Http2TestBase {
int start = trace.indexOf("[content-length]-[") + 18;
int end = trace.indexOf("]", start);
String contentLength = trace.substring(start, end);
+ // Language will depend on locale
+ String language = Locale.getDefault().getLanguage();
Assert.assertEquals(
"3-HeadersStart\n" +
"3-Header-[:status]-[404]\n" +
"3-Header-[content-type]-[text/html;charset=utf-8]\n" +
- "3-Header-[content-language]-[en]\n" +
+ "3-Header-[content-language]-[" + language + "]\n" +
"3-Header-[content-length]-[" + contentLength + "]\n" +
"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
"3-HeadersEnd\n" +
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org