Complete error reporting improvements (mostly for #240)

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

@@ -1201,7 +1201,9 @@ public String nextFieldName() throws IOException
             // inlined "_decodeFieldName()"
 
             if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
+                if (!loadMore()) {
+                    _eofAsNextToken();
+                }
             }
             final int ch = _inputBuffer[_inputPtr++];
             final int type = ((ch >> 5) & 0x7);
@@ -2560,7 +2562,11 @@ protected byte[] _finishLongContiguousBytes(final int expLen) throws IOException
     protected final JsonToken _decodePropertyName() throws IOException
     {     
         if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
+            // 30-Jan-2021, tatu: To get more specific exception, won't use
+            //   "loadMoreGuaranteed()" but instead:
+            if (!loadMore()) {
+                _eofAsNextToken();
+            }
         }
         final int ch = _inputBuffer[_inputPtr++];
         final int type = ((ch >> 5) & 0x7);

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/parse/ParseIncompleteArray240Test.java

@@ -40,7 +40,6 @@ public void testIncompleteMarkerBasedArray() throws Exception
     }
 
     // And might as well do the same for Objects too
-    /*
     public void testIncompleteFixedSizeObject() throws Exception
     {
         final byte[] input = {  (byte) 0xA3 };
@@ -50,7 +49,6 @@ public void testIncompleteFixedSizeObject() throws Exception
                 p.nextToken();
                 fail("Should NOT pass");
             } catch (StreamReadException e) {
-                e.printStackTrace();
                 verifyException(e, "Unexpected end-of-input in Object value: expected 3 more");
             }
         }
@@ -65,9 +63,9 @@ public void testIncompleteMarkerBasedObject() throws Exception
                 p.nextToken();
                 fail("Should NOT pass");
             } catch (StreamReadException e) {
-                verifyException(e, "Unexpected end-of-input in Object value: expected an element or ");
+                verifyException(e,
+                        "Unexpected end-of-input in Object value: expected a property or close marker");
             }
         }
     }
-*/
 }