Fixes wrt [core#1378]

FasterXML · Jan 3, 2025 · 4c407bc · 4c407bc
1 parent 211594a
commit 4c407bc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/cbor/src/test/java/tools/jackson/jaxrs/cbor/JaxrsTestBase.java b/cbor/src/test/java/tools/jackson/jaxrs/cbor/JaxrsTestBase.java
@@ -64,18 +64,18 @@ protected void _verifyBytes(byte[] actBytes, byte... expBytes)
      * available methods, and ensures results are consistent, before
      * returning them
      */
-    protected String getAndVerifyText(JsonParser jp)
+    protected String getAndVerifyText(JsonParser p)
     {
         // Ok, let's verify other accessors
-        int actLen = jp.getTextLength();
-        char[] ch = jp.getTextCharacters();
-        String str2 = new String(ch, jp.getTextOffset(), actLen);
-        String str = jp.getText();
+        int actLen = p.getStringLength();
+        char[] ch = p.getStringCharacters();
+        String str2 = new String(ch, p.getStringOffset(), actLen);
+        String str = p.getString();
 
         if (str.length() !=  actLen) {
-            fail("Internal problem (jp.token == "+jp.currentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen);
+            fail("Internal problem (p.token == "+p.currentToken()+"): p.getString().length() ['"+str+"'] == "+str.length()+"; p.getStringLength() == "+actLen);
         }
-        assertEquals("String access via getText(), getTextXxx() must be the same", str, str2);
+        assertEquals("String access via getString(), getStringXxx() must be the same", str, str2);
 
         return str;
     }
@@ -86,11 +86,11 @@ protected String getAndVerifyText(JsonParser jp)
     /**********************************************************
      */
 
-    public String quote(String str) {
+    public String q(String str) {
         return '"'+str+'"';
     }
 
-    protected String aposToQuotes(String json) {
+    protected String a2q(String json) {
         return json.replace("'", "\"");
     }
 

diff --git a/smile/src/test/java/tools/jackson/jaxrs/smile/JaxrsTestBase.java b/smile/src/test/java/tools/jackson/jaxrs/smile/JaxrsTestBase.java
@@ -64,18 +64,18 @@ protected void _verifyBytes(byte[] actBytes, byte... expBytes)
      * available methods, and ensures results are consistent, before
      * returning them
      */
-    protected String getAndVerifyText(JsonParser jp)
+    protected String getAndVerifyText(JsonParser p)
     {
         // Ok, let's verify other accessors
-        int actLen = jp.getTextLength();
-        char[] ch = jp.getTextCharacters();
-        String str2 = new String(ch, jp.getTextOffset(), actLen);
-        String str = jp.getText();
+        int actLen = p.getStringLength();
+        char[] ch = p.getStringCharacters();
+        String str2 = new String(ch, p.getStringOffset(), actLen);
+        String str = p.getString();
 
         if (str.length() !=  actLen) {
-            fail("Internal problem (jp.token == "+jp.currentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen);
+            fail("Internal problem (p.token == "+p.currentToken()+"): p.getString().length() ['"+str+"'] == "+str.length()+"; p.getStringLength() == "+actLen);
         }
-        assertEquals("String access via getText(), getTextXxx() must be the same", str, str2);
+        assertEquals("String access via getString(), getStringXxx() must be the same", str, str2);
 
         return str;
     }
@@ -86,11 +86,11 @@ protected String getAndVerifyText(JsonParser jp)
     /**********************************************************
      */
 
-    public String quote(String str) {
+    public String q(String str) {
         return '"'+str+'"';
     }
 
-    protected String aposToQuotes(String json) {
+    protected String a2q(String json) {
         return json.replace("'", "\"");
     }
 

diff --git a/yaml/src/test/java/tools/jackson/jaxrs/yaml/JaxrsTestBase.java b/yaml/src/test/java/tools/jackson/jaxrs/yaml/JaxrsTestBase.java
@@ -7,7 +7,6 @@
 
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
-import tools.jackson.jaxrs.yaml.YAMLMediaTypes;
 
 import org.junit.Assert;
 
@@ -70,18 +69,18 @@ protected void _verifyBytes(byte[] actBytes, byte... expBytes)
      * available methods, and ensures results are consistent, before
      * returning them
      */
-    protected String getAndVerifyText(JsonParser jp)
+    protected String getAndVerifyText(JsonParser p)
     {
         // Ok, let's verify other accessors
-        int actLen = jp.getTextLength();
-        char[] ch = jp.getTextCharacters();
-        String str2 = new String(ch, jp.getTextOffset(), actLen);
-        String str = jp.getText();
+        int actLen = p.getStringLength();
+        char[] ch = p.getStringCharacters();
+        String str2 = new String(ch, p.getStringOffset(), actLen);
+        String str = p.getString();
 
         if (str.length() !=  actLen) {
-            fail("Internal problem (jp.token == "+jp.currentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen);
+            fail("Internal problem (p.token == "+p.currentToken()+"): jp.getString().length() ['"+str+"'] == "+str.length()+"; p.getStringLength() == "+actLen);
         }
-        assertEquals("String access via getText(), getTextXxx() must be the same", str, str2);
+        assertEquals("String access via getString(), getStringXxx() must be the same", str, str2);
 
         return str;
     }