(tomcat) 02/02: Consistent naming

[markt]

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

commit 3d0d320f256ffafeaeea2e9f6d88df6690ece666
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 cd50bf3470..a9640cfb83 100644
--- a/test/org/apache/tomcat/util/http/TestCookieParsing.java
+++ b/test/org/apache/tomcat/util/http/TestCookieParsing.java
@@ -152,10 +152,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 af9b0c418b..e6611bfc09 100644
--- a/test/org/apache/tomcat/util/http/TestCookies.java
+++ b/test/org/apache/tomcat/util/http/TestCookies.java
@@ -168,7 +168,7 @@ public class TestCookies {
     }
 
     @Test
-    public void testEmptyPairsRfc6265CookieNoEqualsName() {
+    public void testEmptyPairsRfc6265NoEqualsCookieName() {
         test(true, "foo;a=b; ;bar", NAME, FOO_EMPTY, A, BAR_EMPTY);
         test(true, "foo;a=b;;bar", NAME, FOO_EMPTY, A, BAR_EMPTY);
         test(true, "foo;a=b; ;;bar=rab", NAME, FOO_EMPTY, A, BAR);
@@ -179,7 +179,7 @@ public class TestCookies {
 
 
     @Test
-    public void testEmptyPairsRfc6265CookieNoEqualsIgnore() {
+    public void testEmptyPairsRfc6265NoEqualsCookieIgnore() {
         test(true, "foo;a=b; ;bar", IGNORE, A);
         test(true, "foo;a=b;;bar", IGNORE, A);
         test(true, "foo;a=b; ;;bar=rab", IGNORE, A, BAR);
@@ -190,7 +190,7 @@ public class TestCookies {
 
 
     @Test
-    public void testEmptyPairsRfc6265CookieNoEqualsDefault() {
+    public void testEmptyPairsRfc6265NoEqualsCookieDefault() {
         test(true, "foo;a=b; ;bar", FOO_EMPTY, A, BAR_EMPTY);
         test(true, "foo;a=b;;bar", FOO_EMPTY, A, BAR_EMPTY);
         test(true, "foo;a=b; ;;bar=rab", FOO_EMPTY, A, BAR);
@@ -573,15 +573,15 @@ public class TestCookies {
     }
 
 
-    private void test(boolean useRfc6265, String header, String 
cookieNoEquals, Cookie... expected) {
+    private void test(boolean useRfc6265, String header, String 
noEqualsCookie, Cookie... expected) {
         MimeHeaders mimeHeaders = new MimeHeaders();
         ServerCookies serverCookies = new ServerCookies(4);
         CookieProcessor cookieProcessor;
 
         if (useRfc6265) {
             cookieProcessor = new Rfc6265CookieProcessor();
-            if (cookieNoEquals != null) {
-                ((Rfc6265CookieProcessor) 
cookieProcessor).setNoEqualsCookie(cookieNoEquals);
+            if (noEqualsCookie != null) {
+                ((Rfc6265CookieProcessor) 
cookieProcessor).setNoEqualsCookie(noEqualsCookie);
             }
         } else {
             cookieProcessor = new LegacyCookieProcessor();


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