change DEFAULT_GENERATE_FEATURE

wenshao · wenshao · commit 219587f5ea20 · 2013-01-11T22:51:44.000+08:00
diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java
@@ -71,8 +71,8 @@ public abstract class JSON implements JSONStreamAware, JSONAware {
         features |= com.alibaba.fastjson.serializer.SerializerFeature.SkipTransientField.getMask();
         features |= com.alibaba.fastjson.serializer.SerializerFeature.WriteEnumUsingToString.getMask();
         features |= com.alibaba.fastjson.serializer.SerializerFeature.SortField.getMask();
-        // features |= com.alibaba.fastjson.serializer.SerializerFeature.WriteTabAsSpecial.getMask();
-        features |= com.alibaba.fastjson.serializer.SerializerFeature.WriteSlashAsSpecial.getMask();
+         features |= com.alibaba.fastjson.serializer.SerializerFeature.WriteTabAsSpecial.getMask();
+//        features |= com.alibaba.fastjson.serializer.SerializerFeature.WriteSlashAsSpecial.getMask();
         DEFAULT_GENERATE_FEATURE = features;
     }
 
@@ -601,5 +601,5 @@ public static final <T> T toJavaObject(JSON json, Class<T> clazz) {
         return TypeUtils.cast(json, clazz, ParserConfig.getGlobalInstance());
     }
     
-    public final static String VERSION = "1.1.27";
+    public final static String VERSION = "1.1.28";
 }
diff --git a/src/test/java/com/alibaba/json/bvt/LexerTest.java b/src/test/java/com/alibaba/json/bvt/LexerTest.java
@@ -70,7 +70,7 @@ public void test_string() throws Exception {
 
         String stringVal = lexer.stringVal();
 
-        Assert.assertEquals("\"\\\\/\\b\\f\\n\\r\t中\"", JSON.toJSONString(stringVal));
+        Assert.assertEquals("\"\\\\/\\b\\f\\n\\r\\t中\"", JSON.toJSONString(stringVal));
 
     }
 
diff --git a/src/test/java/com/alibaba/json/bvt/TabCharTest.java b/src/test/java/com/alibaba/json/bvt/TabCharTest.java
@@ -5,15 +5,16 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializeConfig;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 
 public class TabCharTest extends TestCase {
 
     public void test_0() throws Exception {
         JSONObject json = new JSONObject();
         json.put("hello\t", "World\t!");
-        Assert.assertEquals("{\"hello\t\":\"World\t!\"}", JSON.toJSONString(json));
-        Assert.assertEquals("{\"hello\\t\":\"World\\t!\"}", JSON.toJSONString(json, SerializerFeature.WriteTabAsSpecial));
+        Assert.assertEquals("{\"hello\\t\":\"World\\t!\"}", JSON.toJSONString(json));
+        Assert.assertEquals("{\"hello\t\":\"World\t!\"}", JSON.toJSONStringZ(json, SerializeConfig.getGlobalInstance(), SerializerFeature.QuoteFieldNames));
         Assert.assertEquals("{'hello\\t':'World\\t!'}", JSON.toJSONString(json, SerializerFeature.WriteTabAsSpecial, SerializerFeature.UseSingleQuotes));
     }
 
diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_singQuoteString.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_singQuoteString.java
@@ -48,7 +48,7 @@ public void test_string() throws Exception {
 
         String stringVal = lexer.stringVal();
 
-        Assert.assertEquals("\"\\\\/\\b\\f\\n\\r\t中\"", JSON.toJSONString(stringVal));
+        Assert.assertEquals("\"\\\\/\\b\\f\\n\\r\\t中\"", JSON.toJSONString(stringVal));
 
         JSON.toJSONString(stringVal);
     }

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ public abstract class JSON implements JSONStreamAware, JSONAware {`
`71`	`71`	`features \|= com.alibaba.fastjson.serializer.SerializerFeature.SkipTransientField.getMask();`
`72`	`72`	`features \|= com.alibaba.fastjson.serializer.SerializerFeature.WriteEnumUsingToString.getMask();`
`73`	`73`	`features \|= com.alibaba.fastjson.serializer.SerializerFeature.SortField.getMask();`
`74`		`- // features \|= com.alibaba.fastjson.serializer.SerializerFeature.WriteTabAsSpecial.getMask();`
`75`		`- features \|= com.alibaba.fastjson.serializer.SerializerFeature.WriteSlashAsSpecial.getMask();`
	`74`	`+ features \|= com.alibaba.fastjson.serializer.SerializerFeature.WriteTabAsSpecial.getMask();`
	`75`	`+// features \|= com.alibaba.fastjson.serializer.SerializerFeature.WriteSlashAsSpecial.getMask();`
`76`	`76`	`DEFAULT_GENERATE_FEATURE = features;`
`77`	`77`	`}`
`78`	`78`
`@@ -601,5 +601,5 @@ public static final <T> T toJavaObject(JSON json, Class<T> clazz) {`
`601`	`601`	`return TypeUtils.cast(json, clazz, ParserConfig.getGlobalInstance());`
`602`	`602`	`}`
`603`	`603`
`604`		`- public final static String VERSION = "1.1.27";`
	`604`	`+ public final static String VERSION = "1.1.28";`
`605`	`605`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void test_string() throws Exception {`
`70`	`70`
`71`	`71`	`String stringVal = lexer.stringVal();`
`72`	`72`
`73`		`- Assert.assertEquals("\"\\\\/\\b\\f\\n\\r\t中\"", JSON.toJSONString(stringVal));`
	`73`	`+ Assert.assertEquals("\"\\\\/\\b\\f\\n\\r\\t中\"", JSON.toJSONString(stringVal));`
`74`	`74`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public void test_string() throws Exception {`
`48`	`48`
`49`	`49`	`String stringVal = lexer.stringVal();`
`50`	`50`
`51`		`- Assert.assertEquals("\"\\\\/\\b\\f\\n\\r\t中\"", JSON.toJSONString(stringVal));`
	`51`	`+ Assert.assertEquals("\"\\\\/\\b\\f\\n\\r\\t中\"", JSON.toJSONString(stringVal));`
`52`	`52`
`53`	`53`	`JSON.toJSONString(stringVal);`
`54`	`54`	`}`