(tomcat) 02/02: Consistent naming

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 366cf482ca3ae7d16de7951886f42b0ccfe1624e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Aug 20 15:04:33 2024 +0100

    Consistent naming
---
 test/org/apache/tomcat/util/http/TestCookieParsing.java |  6 +++---
 test/org/apache/tomcat/util/http/TestCookies.java       | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/org/apache/tomcat/util/http/TestCookieParsing.java 
b/test/org/apache/tomcat/util/http/TestCookieParsing.java
index 7bb636f9f4..eaf4f8cafa 100644
--- a/test/org/apache/tomcat/util/http/TestCookieParsing.java
+++ b/test/org/apache/tomcat/util/http/TestCookieParsing.java
@@ -91,10 +91,10 @@ public class TestCookieParsing extends TomcatBaseTest {
     }
 
 
-    private void doTestRfc6265NoEquals(String cookieNoEquals, String expected) 
throws Exception {
+    private void doTestRfc6265NoEquals(String noEqualsCookie, String expected) 
throws Exception {
         Rfc6265CookieProcessor cookieProcessor = new Rfc6265CookieProcessor();
-        if (cookieNoEquals != null) {
-            cookieProcessor.setNoEqualsCookie(cookieNoEquals);
+        if (noEqualsCookie != null) {
+            cookieProcessor.setNoEqualsCookie(noEqualsCookie);
         }
         TestCookieParsingClient client = new 
TestCookieParsingClient(cookieProcessor, COOKIES_WITH_NAME_OR_VALUE_ONLY,
                 expected);
diff --git a/test/org/apache/tomcat/util/http/TestCookies.java 
b/test/org/apache/tomcat/util/http/TestCookies.java
index c18c579e6f..99788cd352 100644
--- a/test/org/apache/tomcat/util/http/TestCookies.java
+++ b/test/org/apache/tomcat/util/http/TestCookies.java
@@ -128,7 +128,7 @@ public class TestCookies {
     }
 
     @Test
-    public void testEmptyPairsRfc6265CookieNoEqualsName() {
+    public void testEmptyPairsRfc6265NoEqualsCookieName() {
         test("foo;a=b; ;bar", NAME, FOO_EMPTY, A, BAR_EMPTY);
         test("foo;a=b;;bar", NAME, FOO_EMPTY, A, BAR_EMPTY);
         test("foo;a=b; ;;bar=rab", NAME, FOO_EMPTY, A, BAR);
@@ -139,7 +139,7 @@ public class TestCookies {
 
 
     @Test
-    public void testEmptyPairsRfc6265CookieNoEqualsIgnore() {
+    public void testEmptyPairsRfc6265NoEqualsCookieIgnore() {
         test("foo;a=b; ;bar", IGNORE, A);
         test("foo;a=b;;bar", IGNORE, A);
         test("foo;a=b; ;;bar=rab", IGNORE, A, BAR);
@@ -150,7 +150,7 @@ public class TestCookies {
 
 
     @Test
-    public void testEmptyPairsRfc6265CookieNoEqualsDefault() {
+    public void testEmptyPairsRfc6265NoEqualsCookieDefault() {
         test("foo;a=b; ;bar", FOO_EMPTY, A, BAR_EMPTY);
         test("foo;a=b;;bar", FOO_EMPTY, A, BAR_EMPTY);
         test("foo;a=b; ;;bar=rab", FOO_EMPTY, A, BAR);
@@ -360,13 +360,13 @@ public class TestCookies {
     }
 
 
-    private void test(String header, String cookieNoEquals, Cookie... 
expected) {
+    private void test(String header, String noEqualsCookie, Cookie... 
expected) {
 
         MimeHeaders mimeHeaders = new MimeHeaders();
         ServerCookies serverCookies = new ServerCookies(4);
         Rfc6265CookieProcessor cookieProcessor = new Rfc6265CookieProcessor();
-        if (cookieNoEquals != null) {
-            cookieProcessor.setNoEqualsCookie(cookieNoEquals);
+        if (noEqualsCookie != null) {
+            cookieProcessor.setNoEqualsCookie(noEqualsCookie);
         }
         MessageBytes cookieHeaderValue = mimeHeaders.addValue("Cookie");
         byte[] bytes = header.getBytes(StandardCharsets.UTF_8);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org