Fix #19

FasterXML · May 13, 2016 · 11d9b68 · 11d9b68
1 parent de32372
commit 11d9b68
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 15 deletions.
diff --git a/smile/release-notes/VERSION b/smile/release-notes/VERSION
@@ -4,6 +4,11 @@ Project: jackson-dataformat-smile
 === Releases ===
 ------------------------------------------------------------------------
 
+2.8.0 (not yet released)
+
+#19: Fail to report error for trying to write field name outside Object (root level)
+
+2.7.4 (29-Apr-2016)
 2.7.3 (16-Mar-2015)
 
 No changes since 2.7.2

diff --git a/...e/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorInvalidCallsTest.java b/...e/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorInvalidCallsTest.java
@@ -0,0 +1,25 @@
+package com.fasterxml.jackson.dataformat.smile.gen;
+
+import java.io.ByteArrayOutputStream;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+
+import com.fasterxml.jackson.dataformat.smile.*;
+
+public class GeneratorInvalidCallsTest extends SmileTestBase
+{
+    final SmileFactory SMILE_F = new SmileFactory();
+
+    public void testInvalidFieldNameInRoot() throws Exception
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        SmileGenerator gen = SMILE_F.createGenerator(out);
+        try {
+            gen.writeStringField("a", "b");
+            fail("Should NOT allow writing of FIELD_NAME in root context");
+        } catch (JsonGenerationException e) {
+            verifyException(e, "Can not write a field name");
+        }
+        gen.close();
+    }
+}
diff --git a/...ckson/dataformat/smile/TestGenerator.java → ...n/dataformat/smile/gen/TestGenerator.java b/...ckson/dataformat/smile/TestGenerator.java → ...n/dataformat/smile/gen/TestGenerator.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.*;
 import java.util.HashMap;
@@ -11,7 +11,10 @@
 import com.fasterxml.jackson.dataformat.smile.SmileConstants;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
+import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
 import com.fasterxml.jackson.dataformat.smile.SmileUtil;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
 
 import static com.fasterxml.jackson.dataformat.smile.SmileConstants.*;
 

diff --git a/...dataformat/smile/TestGeneratorBinary.java → ...format/smile/gen/TestGeneratorBinary.java b/...dataformat/smile/TestGeneratorBinary.java → ...format/smile/gen/TestGeneratorBinary.java
@@ -1,10 +1,13 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.*;
 
 import org.junit.Assert;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
 
 public class TestGeneratorBinary extends SmileTestBase
 {

diff --git a/...mat/smile/TestGeneratorBufferRecycle.java → ...smile/gen/TestGeneratorBufferRecycle.java b/...mat/smile/TestGeneratorBufferRecycle.java → ...smile/gen/TestGeneratorBufferRecycle.java
@@ -1,11 +1,11 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.*;
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
 
 /* Test based on kimchy's issue (see https://gist.github.com/853232);
  * exhibits an issue with buffer recycling.

diff --git a/...at/smile/TestGeneratorLongSharedRefs.java → ...mile/gen/TestGeneratorLongSharedRefs.java b/...at/smile/TestGeneratorLongSharedRefs.java → ...mile/gen/TestGeneratorLongSharedRefs.java
@@ -1,8 +1,13 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
+import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
 
 public class TestGeneratorLongSharedRefs extends SmileTestBase
 {

diff --git a/...ormat/smile/TestGeneratorLongStrings.java → ...t/smile/gen/TestGeneratorLongStrings.java b/...ormat/smile/TestGeneratorLongStrings.java → ...t/smile/gen/TestGeneratorLongStrings.java
@@ -1,12 +1,12 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.*;
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
 
 public class TestGeneratorLongStrings extends SmileTestBase
 {

diff --git a/...ataformat/smile/TestGeneratorNumbers.java → ...ormat/smile/gen/TestGeneratorNumbers.java b/...ataformat/smile/TestGeneratorNumbers.java → ...ormat/smile/gen/TestGeneratorNumbers.java
@@ -1,8 +1,9 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.ByteArrayOutputStream;
 
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
 import com.fasterxml.jackson.dataformat.smile.SmileUtil;
 
 public class TestGeneratorNumbers

diff --git a/...ataformat/smile/TestGeneratorSymbols.java → ...ormat/smile/gen/TestGeneratorSymbols.java b/...ataformat/smile/TestGeneratorSymbols.java → ...ormat/smile/gen/TestGeneratorSymbols.java
@@ -1,11 +1,12 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
 
 public class TestGeneratorSymbols extends SmileTestBase
 {

diff --git a/...ormat/smile/TestGeneratorWithRawUtf8.java → ...t/smile/gen/TestGeneratorWithRawUtf8.java b/...ormat/smile/TestGeneratorWithRawUtf8.java → ...t/smile/gen/TestGeneratorWithRawUtf8.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -8,10 +8,10 @@
 import java.util.Random;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
 import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
 
 /**
  * Test to verify handling of "raw String value" write methods that by-pass

diff --git a/...le/TestGeneratorWithSerializedString.java → ...en/TestGeneratorWithSerializedString.java b/...le/TestGeneratorWithSerializedString.java → ...en/TestGeneratorWithSerializedString.java
@@ -1,11 +1,11 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.ByteArrayOutputStream;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.SerializedString;
-
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
 
 public class TestGeneratorWithSerializedString extends SmileTestBase
 {

diff --git a/...ormat/smile/TestSmileGeneratorBinary.java → ...t/smile/gen/TestSmileGeneratorBinary.java b/...ormat/smile/TestSmileGeneratorBinary.java → ...t/smile/gen/TestSmileGeneratorBinary.java
@@ -1,10 +1,13 @@
-package com.fasterxml.jackson.dataformat.smile;
+package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.*;
 
 import org.junit.Assert;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
+import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
 
 public class TestSmileGeneratorBinary extends SmileTestBase