Minor test refactoring

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/core/fuzz/Fuzz51806JsonPointerParse818Test.java renamed to src/test/java/com/fasterxml/jackson/core/jsonptr/Fuzz51806JsonPointerParse818Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.core.fuzz;
+package com.fasterxml.jackson.core.jsonptr;
 
 import com.fasterxml.jackson.core.BaseTest;
 import com.fasterxml.jackson.core.JsonPointer;

src/test/java/com/fasterxml/jackson/core/JsonPointerTest.java renamed to src/test/java/com/fasterxml/jackson/core/jsonptr/JsonPointerTest.java

@@ -1,7 +1,12 @@
-package com.fasterxml.jackson.core;
+package com.fasterxml.jackson.core.jsonptr;
+
+import com.fasterxml.jackson.core.BaseTest;
+import com.fasterxml.jackson.core.JsonPointer;
 
 public class JsonPointerTest extends BaseTest
 {
+    private final JsonPointer EMPTY_PTR = JsonPointer.empty();
+
     public void testSimplePath() throws Exception
     {
         final String INPUT = "/Image/15/name";
@@ -31,7 +36,7 @@ public void testSimplePath() throws Exception
         assertEquals("name", ptr.getMatchingProperty());
         assertEquals("/name", ptr.toString());
         assertEquals("", ptr.head().toString());
-        assertSame(JsonPointer.EMPTY, ptr.head());
+        assertSame(EMPTY_PTR, ptr.head());
 
         // done!
         ptr = ptr.tail();
@@ -100,16 +105,14 @@ public void testLast()
 
     public void testEmptyPointer()
     {
-        assertSame(JsonPointer.EMPTY, JsonPointer.empty());
-        assertSame(JsonPointer.EMPTY, JsonPointer.compile(""));
-        final JsonPointer empty = JsonPointer.empty();
-        assertEquals("", empty.toString());
+        assertSame(EMPTY_PTR, JsonPointer.compile(""));
+        assertEquals("", EMPTY_PTR.toString());
 
         // As per [core#788], should NOT match Property with "empty String"
-        assertFalse(empty.mayMatchProperty());
-        assertFalse(empty.mayMatchElement());
-        assertEquals(-1, empty.getMatchingIndex());
-        assertNull(empty.getMatchingProperty());
+        assertFalse(EMPTY_PTR.mayMatchProperty());
+        assertFalse(EMPTY_PTR.mayMatchElement());
+        assertEquals(-1, EMPTY_PTR.getMatchingIndex());
+        assertNull(EMPTY_PTR.getMatchingProperty());
     }
 
     public void testPointerWithEmptyPropertyName()
@@ -118,7 +121,7 @@ public void testPointerWithEmptyPropertyName()
         // and NOT same as what empty point, "", is.
         JsonPointer ptr = JsonPointer.compile("/");
         assertNotNull(ptr);
-        assertNotSame(JsonPointer.EMPTY, ptr);
+        assertNotSame(EMPTY_PTR, ptr);
 
         assertEquals("/", ptr.toString());
         assertTrue(ptr.mayMatchProperty());

src/test/java/com/fasterxml/jackson/core/PointerFromContextTest.java renamed to src/test/java/com/fasterxml/jackson/core/jsonptr/PointerFromContextTest.java

@@ -1,7 +1,14 @@
-package com.fasterxml.jackson.core;
+package com.fasterxml.jackson.core.jsonptr;
 
 import java.io.StringWriter;
 
+import com.fasterxml.jackson.core.BaseTest;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonPointer;
+import com.fasterxml.jackson.core.JsonToken;
+
 public class PointerFromContextTest extends BaseTest
 {
     /*
@@ -12,18 +19,20 @@ public class PointerFromContextTest extends BaseTest
 
     private final JsonFactory JSON_F = new JsonFactory();
 
+    private final JsonPointer EMPTY_PTR = JsonPointer.empty();
+    
     public void testViaParser() throws Exception
     {
         final String SIMPLE = a2q("{'a':123,'array':[1,2,[3],5,{'obInArray':4}],"
                 +"'ob':{'first':[false,true],'second':{'sub':37}},'b':true}");
         JsonParser p = JSON_F.createParser(SIMPLE);
 
         // by default should just get "empty"
-        assertSame(JsonPointer.EMPTY, p.getParsingContext().pathAsPointer());
+        assertSame(EMPTY_PTR, p.getParsingContext().pathAsPointer());
 
         // let's just traverse, then:
         assertToken(JsonToken.START_OBJECT, p.nextToken());
-        assertSame(JsonPointer.EMPTY, p.getParsingContext().pathAsPointer());
+        assertSame(EMPTY_PTR, p.getParsingContext().pathAsPointer());
 
         assertToken(JsonToken.FIELD_NAME, p.nextToken()); // a
         assertEquals("/a", p.getParsingContext().pathAsPointer().toString());
@@ -91,7 +100,7 @@ public void testViaParser() throws Exception
         assertEquals("/b", p.getParsingContext().pathAsPointer().toString());
 
         assertToken(JsonToken.END_OBJECT, p.nextToken());
-        assertSame(JsonPointer.EMPTY, p.getParsingContext().pathAsPointer());
+        assertSame(EMPTY_PTR, p.getParsingContext().pathAsPointer());
 
         assertNull(p.nextToken());
         p.close();
@@ -101,11 +110,11 @@ public void testViaGenerator() throws Exception
     {
         StringWriter w = new StringWriter();
         JsonGenerator g = JSON_F.createGenerator(w);
-        assertSame(JsonPointer.EMPTY, g.getOutputContext().pathAsPointer());
+        assertSame(EMPTY_PTR, g.getOutputContext().pathAsPointer());
 
         g.writeStartArray();
         // no path yet
-        assertSame(JsonPointer.EMPTY, g.getOutputContext().pathAsPointer());
+        assertSame(EMPTY_PTR, g.getOutputContext().pathAsPointer());
         g.writeBoolean(true);
         assertEquals("/0", g.getOutputContext().pathAsPointer().toString());
 
@@ -130,7 +139,7 @@ public void testViaGenerator() throws Exception
         assertEquals("/1", g.getOutputContext().pathAsPointer().toString());
 
         g.writeEndArray();
-        assertSame(JsonPointer.EMPTY, g.getOutputContext().pathAsPointer());
+        assertSame(EMPTY_PTR, g.getOutputContext().pathAsPointer());
         g.close();
         w.close();
     }
@@ -147,7 +156,7 @@ public void testParserWithRoot() throws Exception
                 +"{'a':5,'c':[1,2]}\n[1,2]\n");
         JsonParser p = JSON_F.createParser(JSON);
         // before pointing to anything, we have no path to point to
-        assertSame(JsonPointer.EMPTY, p.getParsingContext().pathAsPointer(true));
+        assertSame(EMPTY_PTR, p.getParsingContext().pathAsPointer(true));
 
         // but immediately after advancing we do
         assertToken(JsonToken.START_OBJECT, p.nextToken());
@@ -208,7 +217,7 @@ public void testGeneratorWithRoot() throws Exception
     {
         StringWriter w = new StringWriter();
         JsonGenerator g = JSON_F.createGenerator(w);
-        assertSame(JsonPointer.EMPTY, g.getOutputContext().pathAsPointer(true));
+        assertSame(EMPTY_PTR, g.getOutputContext().pathAsPointer(true));
 
         g.writeStartArray();
         assertEquals("/0", g.getOutputContext().pathAsPointer(true).toString());