Unit test coverage improvements, to get to 70%/60% level (line/branch) for 2.6

Author: cowtowncoder

release-notes/CREDITS

@@ -57,3 +57,8 @@ Derek Clarkson (drekka@github)
 Masaru Hasegawa (masaruh@github):
   * Reported, contributed fix for#182: Inconsistent TextBuffer#getTextBuffer behavior
    (2.6.0)
+
+Ruediger Moeller (RuedigerMoeller@github)
+  * Requested #195: Add `JsonGenerator.getOutputBuffered()` to find out amount of content buffered,
+     not yet flushed.
+   (2.6.0)

src/main/java/com/fasterxml/jackson/core/util/VersionUtil.java

@@ -19,6 +19,9 @@
  * 2.1 and 2.2; earlier code used file named "VERSION.txt"; but this has serious
  * performance issues on some platforms (Android), so a replacement system
  * was implemented to use class generation and dynamic class loading.
+ *<p>
+ * Note that functionality for reading "VERSION.txt" was removed completely
+ * from Jackson 2.6.
  */
 public class VersionUtil
 {
@@ -64,31 +67,11 @@ protected VersionUtil()
      * First, tries to load version info from a class named
      * "PackageVersion" in the same package as the class.
      *
-     * Next, if that fails, class loader that loaded specified class is
-     * asked to load resource with name "VERSION" from same location
-     * (package) as class itself had.
-     *
      * If no version information is found, {@link Version#unknownVersion()} is returned.
      */
-    @SuppressWarnings("resource")
     public static Version versionFor(Class<?> cls)
     {
-        Version packageVersion = packageVersionFor(cls);
-        if (packageVersion != null) {
-            return packageVersion;
-        }
-        final InputStream in = cls.getResourceAsStream("VERSION.txt");
-        if (in == null) {
-            return Version.unknownVersion();
-        }
-        try {
-            InputStreamReader reader = new InputStreamReader(in, "UTF-8");
-            return doReadVersion(reader);
-        } catch (UnsupportedEncodingException e) {
-            return Version.unknownVersion();
-        } finally {
-            _close(in);
-        }
+        return packageVersionFor(cls);
     }
 
     /**
@@ -109,38 +92,11 @@ public static Version packageVersionFor(Class<?> cls)
             } catch (Exception e) {
                 throw new IllegalArgumentException("Failed to get Versioned out of "+vClass);
             }
-        } catch (Exception e) { // ok to be missing (not good, acceptable)
+        } catch (Exception e) { // ok to be missing (not good but acceptable)
             return null;
         }
     }
 
-    private static Version doReadVersion(final Reader r)
-    {
-        String version = null, group = null, artifact = null;
-
-        final BufferedReader br = new BufferedReader(r);
-        try {
-            version = br.readLine();
-            if (version != null) {
-                group = br.readLine();
-                if (group != null) {
-                    artifact = br.readLine();
-                }
-            }
-        } catch (IOException ignored) {
-        } finally {
-            _close(br);
-        }
-        // We don't trim() version: parseVersion() takes care ot that
-        if (group != null) {
-            group = group.trim();
-        }
-        if (artifact != null) {
-            artifact = artifact.trim();
-        }
-        return parseVersion(version, group, artifact);
-    }
-
     /**
      * Will attempt to load the maven version for the given groupId and
      * artifactId.  Maven puts a pom.properties file in
@@ -151,8 +107,12 @@ private static Version doReadVersion(final Reader r)
      * @param groupId the groupId of the library
      * @param artifactId the artifactId of the library
      * @return The version
+     * 
+     * @deprecated Since 2.6: functionality not used by any official Jackson component, should be
+     *   moved out if anyone needs it
      */
     @SuppressWarnings("resource")
+    @Deprecated // since 2.6
     public static Version mavenVersionFor(ClassLoader cl, String groupId, String artifactId)
     {
         InputStream pomProperties = cl.getResourceAsStream("META-INF/maven/"
@@ -174,6 +134,9 @@ public static Version mavenVersionFor(ClassLoader cl, String groupId, String art
         return Version.unknownVersion();
     }
 
+    /**
+     * Method used by {@link PackageVersion} to decode version injected by Maven build.
+     */
     public static Version parseVersion(String s, String groupId, String artifactId)
     {
         if (s != null && (s = s.trim()).length() > 0) {

src/test/java/com/fasterxml/jackson/core/filter/BasicGeneratorFilteringTest.java

@@ -1,6 +1,8 @@
 package com.fasterxml.jackson.core.filter;
 
 import java.io.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
@@ -128,16 +130,38 @@ public void testSingleMatchFilteringWithPath() throws Exception
         assertEquals(1, gen.getMatchCount());
     }
 
+    public void testSingleMatchFilteringWithPathSkippedArray() throws Exception
+    {
+        StringWriter w = new StringWriter();
+        JsonGenerator origGen = JSON_F.createGenerator(w);
+        NameMatchFilter filter = new NameMatchFilter("value");
+        FilteringGeneratorDelegate gen = new FilteringGeneratorDelegate(origGen,
+                filter,
+                true, // includePath
+                false // multipleMatches
+                );
+
+        // Hmmh. Should we get access to eventual target?
+        assertSame(w, gen.getOutputTarget());
+        assertNotNull(gen.getFilterContext());
+        assertSame(filter, gen.getFilter());
+
+        final String JSON = "{'array':[1,[2,3]],'ob':[{'value':'bar'}],'b':{'foo':[1,'foo']}}";
+        writeJsonDoc(JSON_F, JSON, gen);
+        assertEquals(aposToQuotes("{'ob':[{'value':'bar'}]}"), w.toString());
+        assertEquals(1, gen.getMatchCount());
+    }
+
     // Alternative take, using slightly different calls for FIELD_NAME, START_ARRAY
-    public void testSingleMatchFilteringWithPathAlternate() throws Exception
+    public void testSingleMatchFilteringWithPathAlternate1() throws Exception
     {
         StringWriter w = new StringWriter();
         FilteringGeneratorDelegate gen = new FilteringGeneratorDelegate(JSON_F.createGenerator(w),
                 new NameMatchFilter("value"),
                 true, // includePath
                 false // multipleMatches
                 );
-        //final String JSON = "{'a':123,'array':[1,2],'ob':{'value0':2,'value':3,'value2':'foo'},'b':true}";
+        //final String JSON = "{'a':123,'array':[1,2],'ob':{'value0':2,'value':[3],'value2':'foo'},'b':true}";
 
         gen.writeStartObject();
         gen.writeFieldName(new SerializedString("a"));
@@ -146,14 +170,16 @@ public void testSingleMatchFilteringWithPathAlternate() throws Exception
         gen.writeFieldName("array");
         gen.writeStartArray(2);
         gen.writeNumber("1");
-        gen.writeNumber(2);
+        gen.writeNumber((short) 2);
         gen.writeEndArray();
 
         gen.writeFieldName(new SerializedString("ob"));
         gen.writeStartObject();
         gen.writeNumberField("value0", 2);
         gen.writeFieldName(new SerializedString("value"));
-        gen.writeNumber(3); // just to vary generation method
+        gen.writeStartArray(1);
+        gen.writeString(new SerializedString("x")); // just to vary generation method
+        gen.writeEndArray();
         gen.writeStringField("value2", "foo");
 
         gen.writeEndObject();
@@ -163,7 +189,57 @@ public void testSingleMatchFilteringWithPathAlternate() throws Exception
         gen.writeEndObject();
         gen.close();
 
-        assertEquals(aposToQuotes("{'ob':{'value':3}}"), w.toString());
+        assertEquals(aposToQuotes("{'ob':{'value':['x']}}"), w.toString());
+    }
+
+    public void testSingleMatchFilteringWithPathRawBinary() throws Exception
+    {
+        StringWriter w = new StringWriter();
+        FilteringGeneratorDelegate gen = new FilteringGeneratorDelegate(JSON_F.createGenerator(w),
+                new NameMatchFilter("array"),
+                true, // includePath
+                false // multipleMatches
+                );
+        //final String JSON = "{'header':['ENCODED',raw],'array':['base64stuff',1,2,3,4,5,6.25,7.5],'extra':[1,2,3,4,5,6.25,7.5]}";
+
+        gen.writeStartObject();
+
+        gen.writeFieldName("header");
+        gen.writeStartArray();
+        gen.writeBinary(new byte[] { 1 });
+        gen.writeRawValue(new SerializedString("1"));
+        gen.writeRawValue("2");
+        gen.writeEndArray();
+        
+        gen.writeFieldName("array");
+
+        gen.writeStartArray();
+        gen.writeBinary(new byte[] { 1 });
+        gen.writeNumber((short) 1);
+        gen.writeNumber((int) 2);
+        gen.writeNumber((long) 3);
+        gen.writeNumber(BigInteger.valueOf(4));
+        gen.writeRaw(" ");
+        gen.writeNumber(new BigDecimal("5.0"));
+        gen.writeRaw(new SerializedString(" /*x*/"));
+        gen.writeNumber(6.25f);
+        gen.writeNumber(7.5);
+        gen.writeEndArray();
+
+        gen.writeArrayFieldStart("extra");
+        gen.writeNumber((short) 1);
+        gen.writeNumber((int) 2);
+        gen.writeNumber((long) 3);
+        gen.writeNumber(BigInteger.valueOf(4));
+        gen.writeNumber(new BigDecimal("5.0"));
+        gen.writeNumber(6.25f);
+        gen.writeNumber(7.5);
+        gen.writeEndArray();
+        
+        gen.writeEndObject();
+        gen.close();
+
+        assertEquals(aposToQuotes("{'array':['AQ==',1,2,3,4 ,5.0 /*x*/,6.25,7.5]}"), w.toString());
     }
 
     public void testMultipleMatchFilteringWithPath1() throws Exception

src/test/java/com/fasterxml/jackson/core/json/ParserSequenceTest.java

@@ -0,0 +1,52 @@
+package com.fasterxml.jackson.core.json;
+
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.util.JsonParserSequence;
+
+public class ParserSequenceTest
+    extends com.fasterxml.jackson.core.BaseTest
+{
+    private final JsonFactory JSON_FACTORY = new JsonFactory();
+
+    public void testSimple() throws Exception
+    {
+        JsonParser p1 = JSON_FACTORY.createParser("[ 1 ]");
+        JsonParser p2 = JSON_FACTORY.createParser("[ 2 ]");
+        JsonParserSequence seq = JsonParserSequence.createFlattened(p1, p2);
+        assertEquals(2, seq.containedParsersCount());
+
+        assertFalse(p1.isClosed());
+        assertFalse(p2.isClosed());
+        assertFalse(seq.isClosed());
+        assertToken(JsonToken.START_ARRAY, seq.nextToken());
+        assertToken(JsonToken.VALUE_NUMBER_INT, seq.nextToken());
+        assertEquals(1, seq.getIntValue());
+        assertToken(JsonToken.END_ARRAY, seq.nextToken());
+        assertFalse(p1.isClosed());
+        assertFalse(p2.isClosed());
+        assertFalse(seq.isClosed());
+        assertToken(JsonToken.START_ARRAY, seq.nextToken());
+
+        // first parser ought to be closed now
+        assertTrue(p1.isClosed());
+        assertFalse(p2.isClosed());
+        assertFalse(seq.isClosed());
+
+        assertToken(JsonToken.VALUE_NUMBER_INT, seq.nextToken());
+        assertEquals(2, seq.getIntValue());
+        assertToken(JsonToken.END_ARRAY, seq.nextToken());
+        assertTrue(p1.isClosed());
+        assertFalse(p2.isClosed());
+        assertFalse(seq.isClosed());
+
+        assertNull(seq.nextToken());
+        assertTrue(p1.isClosed());
+        assertTrue(p2.isClosed());
+        assertTrue(seq.isClosed());
+
+        seq.close();
+        // redundant, but call to remove IDE warnings
+        p1.close();
+        p2.close();
+    }
+}

src/test/java/com/fasterxml/jackson/core/type/TypeReferenceTest.java

@@ -0,0 +1,27 @@
+package com.fasterxml.jackson.core.type;
+
+import java.util.List;
+
+import com.fasterxml.jackson.core.BaseTest;
+
+// Not much to test, but exercise to prevent code coverage tool from showing all red for package
+public class TypeReferenceTest extends BaseTest
+{
+    public void testSimple()
+    {
+        TypeReference<?> ref = new TypeReference<List<String>>() { };
+        assertNotNull(ref);
+        ref.equals(null);
+    }
+
+    @SuppressWarnings("rawtypes")
+    public void testInvalid()
+    {
+        try { 
+            new TypeReference() { };
+            fail("Should not pass!");
+        } catch (IllegalArgumentException e) {
+            verifyException(e, "without actual type information");
+        }
+    }
+}

src/test/java/com/fasterxml/jackson/core/util/ByteArrayBuilderTest.java

@@ -0,0 +1,30 @@
+package com.fasterxml.jackson.core.util;
+
+import org.junit.Assert;
+
+public class ByteArrayBuilderTest extends com.fasterxml.jackson.core.BaseTest
+{
+    public void testSimple() throws Exception
+    {
+        ByteArrayBuilder b = new ByteArrayBuilder(null, 20);
+        Assert.assertArrayEquals(new byte[0], b.toByteArray());
+
+        b.write((byte) 0);
+        b.append(1);
+
+        byte[] foo = new byte[98];
+        for (int i = 0; i < foo.length; ++i) {
+            foo[i] = (byte) (2 + i);
+        }
+        b.write(foo);
+
+        byte[] result = b.toByteArray();
+        assertEquals(100, result.length);
+        for (int i = 0; i < 100; ++i) {
+            assertEquals(i, (int) result[i]);
+        }
+        
+        b.release();
+        b.close();
+    }
+}

src/test/java/com/fasterxml/jackson/core/util/TestDefaultPrettyPrinter.java

@@ -84,7 +84,7 @@ public void testTabIndent() throws IOException
 
     public void testRootSeparator() throws IOException
     {
-        PrettyPrinter pp = new DefaultPrettyPrinter()
+        DefaultPrettyPrinter pp = new DefaultPrettyPrinter()
             .withRootSeparator("|");
         final String EXP = "1|2|3";
 
@@ -107,6 +107,27 @@ public void testRootSeparator() throws IOException
         gen.writeNumber(3);
         gen.close();
         assertEquals(EXP, bytes.toString("UTF-8"));
+
+        // Also: let's try removing separator altogether
+        pp = pp.withRootSeparator((String) null)
+                .withArrayIndenter(null)
+                .withObjectIndenter(null)
+                .withoutSpacesInObjectEntries();
+        sw = new StringWriter();
+        gen = JSON_F.createGenerator(sw);
+        gen.setPrettyPrinter(pp);
+
+        gen.writeNumber(1);
+        gen.writeStartArray();
+        gen.writeNumber(2);
+        gen.writeEndArray();
+        gen.writeStartObject();
+        gen.writeFieldName("a");
+        gen.writeNumber(3);
+        gen.writeEndObject();
+        gen.close();
+        // no root separator, nor array, object
+        assertEquals("1[2]{\"a\":3}", sw.toString());
     }
 
     private String _printTestData(PrettyPrinter pp, boolean useBytes) throws IOException