Skip to content

Commit 11d9b68

Browse files
cowtowncodercowtowncoder
committed
Fix #19 
1 parent de32372 commit 11d9b68

12 files changed

+61
-15
lines changed

‎smile/release-notes/VERSION

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Project: jackson-dataformat-smile
44
=== Releases ===
55
------------------------------------------------------------------------
66

7+
2.8.0 (not yet released)
8+
9+
#19: Fail to report error for trying to write field name outside Object (root level)
10+
11+
2.7.4 (29-Apr-2016)
712
2.7.3 (16-Mar-2015)
813

914
No changes since 2.7.2

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorInvalidCallsTest.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.fasterxml.jackson.dataformat.smile.gen;
2+
3+
import java.io.ByteArrayOutputStream;
4+
5+
import com.fasterxml.jackson.core.JsonGenerationException;
6+
7+
import com.fasterxml.jackson.dataformat.smile.*;
8+
9+
public class GeneratorInvalidCallsTest extends SmileTestBase
10+
{
11+
final SmileFactory SMILE_F = new SmileFactory();
12+
13+
public void testInvalidFieldNameInRoot() throws Exception
14+
{
15+
ByteArrayOutputStream out = new ByteArrayOutputStream();
16+
SmileGenerator gen = SMILE_F.createGenerator(out);
17+
try {
18+
gen.writeStringField("a", "b");
19+
fail("Should NOT allow writing of FIELD_NAME in root context");
20+
} catch (JsonGenerationException e) {
21+
verifyException(e, "Can not write a field name");
22+
}
23+
gen.close();
24+
}
25+
}

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGenerator.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGenerator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.*;
44
import java.util.HashMap;
@@ -11,7 +11,10 @@
1111
import com.fasterxml.jackson.dataformat.smile.SmileConstants;
1212
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
1313
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
14+
import com.fasterxml.jackson.dataformat.smile.SmileParser;
15+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
1416
import com.fasterxml.jackson.dataformat.smile.SmileUtil;
17+
import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
1518

1619
import static com.fasterxml.jackson.dataformat.smile.SmileConstants.*;
1720

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorBinary.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorBinary.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.*;
44

55
import org.junit.Assert;
66

77
import com.fasterxml.jackson.core.*;
8+
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
9+
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
10+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
811

912
public class TestGeneratorBinary extends SmileTestBase
1013
{

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorBufferRecycle.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorBufferRecycle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.*;
44
import java.util.*;
55

66
import com.fasterxml.jackson.core.*;
7-
87
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
8+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
99

1010
/* Test based on kimchy's issue (see https://gist.github.com/853232);
1111
* exhibits an issue with buffer recycling.

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorLongSharedRefs.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongSharedRefs.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.*;
44

55
import com.fasterxml.jackson.core.*;
6+
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
7+
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
8+
import com.fasterxml.jackson.dataformat.smile.SmileParser;
9+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
10+
import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
611

712
public class TestGeneratorLongSharedRefs extends SmileTestBase
813
{

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorLongStrings.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongStrings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.*;
44
import java.util.*;
55

66
import com.fasterxml.jackson.core.*;
7-
87
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
98
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
9+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
1010

1111
public class TestGeneratorLongStrings extends SmileTestBase
1212
{

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorNumbers.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorNumbers.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.ByteArrayOutputStream;
44

55
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
6+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
67
import com.fasterxml.jackson.dataformat.smile.SmileUtil;
78

89
public class TestGeneratorNumbers

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorSymbols.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorSymbols.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.*;
44

55
import com.fasterxml.jackson.core.*;
6-
76
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
87
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
8+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
9+
import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
910

1011
public class TestGeneratorSymbols extends SmileTestBase
1112
{

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithRawUtf8.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithRawUtf8.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import static org.junit.Assert.assertArrayEquals;
44

@@ -8,10 +8,10 @@
88
import java.util.Random;
99

1010
import com.fasterxml.jackson.core.*;
11-
1211
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
1312
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
1413
import com.fasterxml.jackson.dataformat.smile.SmileParser;
14+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
1515

1616
/**
1717
* Test to verify handling of "raw String value" write methods that by-pass

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithSerializedString.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithSerializedString.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.ByteArrayOutputStream;
44

55
import com.fasterxml.jackson.core.*;
66
import com.fasterxml.jackson.core.io.SerializedString;
7-
87
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
8+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
99

1010
public class TestGeneratorWithSerializedString extends SmileTestBase
1111
{

‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorBinary.java renamed to ‎smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestSmileGeneratorBinary.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
package com.fasterxml.jackson.dataformat.smile;
1+
package com.fasterxml.jackson.dataformat.smile.gen;
22

33
import java.io.*;
44

55
import org.junit.Assert;
66

77
import com.fasterxml.jackson.core.*;
8+
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
9+
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
10+
import com.fasterxml.jackson.dataformat.smile.SmileTestBase;
811
import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
912

1013
public class TestSmileGeneratorBinary extends SmileTestBase

0 commit comments

Comments
 (0)