From 1d614edd1e6731c6e6ed2df7231e003e293bf62c Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 23 Jun 2013 18:27:09 +0800 Subject: [PATCH] fixed testcase --- .../alibaba/fastjson/parser/JSONLexer.java | 104 +++++++++--------- .../fastjson/parser/JSONReaderScanner.java | 12 +- .../alibaba/fastjson/parser/JSONScanner.java | 59 +++++++--- .../AbstractDateDeserializer.java | 1 + .../parser/deserializer/DateDeserializer.java | 8 +- .../deserializer/SqlDateDeserializer.java | 27 +++-- .../parser/deserializer/TimeDeserializer.java | 1 + .../fastjson/serializer/DoubleSerializer.java | 32 ++++-- .../java/com/alibaba/json/ArrayRefTest2.java | 2 +- .../com/alibaba/json/bvt/AnnotationTest.java | 2 +- .../com/alibaba/json/bvt/AnnotationTest2.java | 2 +- .../com/alibaba/json/bvt/AnnotationTest3.java | 2 +- .../alibaba/json/bvt/AppendableFieldTest.java | 2 +- .../java/com/alibaba/json/bvt/ArmoryTest.java | 2 +- .../alibaba/json/bvt/ArrayListFieldTest.java | 2 +- .../json/bvt/ArrayListFloatFieldTest.java | 2 +- .../com/alibaba/json/bvt/ArrayRefTest.java | 2 +- .../json/bvt/AtomicIntegerArrayFieldTest.java | 2 +- .../json/bvt/AtomicLongArrayFieldTest.java | 2 +- .../java/com/alibaba/json/bvt/Base64Test.java | 2 +- .../alibaba/json/bvt/BigDecimalFieldTest.java | 2 +- .../alibaba/json/bvt/BigIntegerFieldTest.java | 2 +- .../json/bvt/BooleanArrayFieldTest.java | 2 +- .../bvt/BooleanArrayFieldTest_primitive.java | 2 +- .../com/alibaba/json/bvt/BuilderTest.java | 2 +- .../json/bvt/ByteArrayFieldTest_1.java | 2 +- .../json/bvt/ByteArrayFieldTest_2.java | 2 +- .../json/bvt/ByteArrayFieldTest_3.java | 2 +- .../com/alibaba/json/bvt/ByteFieldTest.java | 2 +- .../java/com/alibaba/json/bvt/CastTest.java | 2 +- .../java/com/alibaba/json/bvt/CastTest2.java | 2 +- .../alibaba/json/bvt/CharsetFieldTest.java | 2 +- .../com/alibaba/json/bvt/ClassFieldTest.java | 2 +- .../java/com/alibaba/json/bvt/ColorTest.java | 2 +- .../java/com/alibaba/json/bvt/ColorTest2.java | 2 +- .../com/alibaba/json/bvt/DateFieldTest.java | 2 +- .../com/alibaba/json/bvt/DateFieldTest2.java | 2 +- .../com/alibaba/json/bvt/DateFieldTest3.java | 2 +- .../com/alibaba/json/bvt/DateFieldTest4.java | 2 +- .../com/alibaba/json/bvt/DateFieldTest5.java | 2 +- .../com/alibaba/json/bvt/DateFieldTest6.java | 2 +- .../com/alibaba/json/bvt/DateFieldTest7.java | 2 +- .../json/bvt/DefaultJSONParserTest.java | 2 +- .../bvt/DoubleArrayFieldTest_primitive.java | 2 +- .../alibaba/json/bvt/DoubleFieldTest_A.java | 2 +- .../com/alibaba/json/bvt/EmptyObjectTest.java | 2 +- .../com/alibaba/json/bvt/EnumerationTest.java | 2 +- .../com/alibaba/json/bvt/FeaturesTest.java | 2 +- .../com/alibaba/json/bvt/FeaturesTest2.java | 2 +- .../com/alibaba/json/bvt/FeaturesTest3.java | 2 +- .../com/alibaba/json/bvt/FeaturesTest4.java | 2 +- .../com/alibaba/json/bvt/FeaturesTest5.java | 2 +- .../com/alibaba/json/bvt/FeaturesTest6.java | 2 +- .../com/alibaba/json/bvt/FeaturesTest7.java | 2 +- .../com/alibaba/json/bvt/FileFieldTest.java | 2 +- .../bvt/FloatArrayFieldTest_primitive.java | 2 +- .../com/alibaba/json/bvt/FloatFieldTest.java | 2 +- .../alibaba/json/bvt/FloatFieldTest_A.java | 2 +- .../java/com/alibaba/json/bvt/FontTest.java | 2 +- .../java/com/alibaba/json/bvt/FontTest2.java | 2 +- .../java/com/alibaba/json/bvt/GroovyTest.java | 2 +- .../json/bvt/InetAddressFieldTest.java | 2 +- .../json/bvt/InetSocketAddressFieldTest.java | 2 +- .../json/bvt/IntArrayFieldTest_primitive.java | 2 +- .../json/bvt/IntegerArrayFieldTest.java | 2 +- .../com/alibaba/json/bvt/JSONArrayTest.java | 2 +- .../com/alibaba/json/bvt/JSONArrayTest2.java | 2 +- .../json/bvt/JSONArrayTest_hashCode.java | 2 +- .../alibaba/json/bvt/JSONExceptionTest.java | 2 +- .../alibaba/json/bvt/JSONFromObjectTest.java | 2 +- .../com/alibaba/json/bvt/JSONObjectTest.java | 2 +- .../com/alibaba/json/bvt/JSONObjectTest2.java | 2 +- .../com/alibaba/json/bvt/JSONObjectTest3.java | 2 +- .../json/bvt/JSONObjectTest_hashCode.java | 2 +- .../java/com/alibaba/json/bvt/JSONTest.java | 2 +- .../com/alibaba/json/bvt/JSONTest_Bytes.java | 2 +- .../com/alibaba/json/bvt/JSONTest_null.java | 2 +- .../alibaba/json/bvt/JSONTest_overflow.java | 2 +- .../com/alibaba/json/bvt/JSONTokenTest.java | 2 +- .../com/alibaba/json/bvt/JSONTypeTest.java | 2 +- .../com/alibaba/json/bvt/JSONTypeTest1.java | 2 +- .../com/alibaba/json/bvt/JSONWriterTest.java | 2 +- .../json/bvt/JSON_toJSONStringTest.java | 2 +- .../json/bvt/JSON_toJavaObject_test.java | 2 +- .../com/alibaba/json/bvt/JavaBeanTest.java | 2 +- .../com/alibaba/json/bvt/JsonValueTest.java | 2 +- .../java/com/alibaba/json/bvt/LexerTest.java | 2 +- .../alibaba/json/bvt/LinkedListFieldTest.java | 2 +- .../com/alibaba/json/bvt/ListFieldTest.java | 2 +- .../com/alibaba/json/bvt/ListFieldTest2.java | 2 +- .../alibaba/json/bvt/ListFloatFieldTest.java | 2 +- .../com/alibaba/json/bvt/LocaleFieldTest.java | 2 +- .../alibaba/json/bvt/LongArrayFieldTest.java | 2 +- .../bvt/LongArrayFieldTest_primitive.java | 2 +- .../com/alibaba/json/bvt/LongFieldTest.java | 2 +- .../json/bvt/LongFieldTest_primitive.java | 2 +- .../java/com/alibaba/json/bvt/MapRefTest.java | 2 +- .../com/alibaba/json/bvt/MapRefTest1.java | 2 +- .../com/alibaba/json/bvt/MapRefTest2.java | 2 +- .../com/alibaba/json/bvt/MapRefTest3.java | 2 +- .../java/com/alibaba/json/bvt/MapTest.java | 2 +- .../java/com/alibaba/json/bvt/MapTest2.java | 2 +- .../json/bvt/MaterializedInterfaceTest.java | 2 +- .../json/bvt/MaterializedInterfaceTest2.java | 2 +- .../json/bvt/NotWriteRootClassNameTest.java | 2 +- .../com/alibaba/json/bvt/NumberFieldTest.java | 2 +- .../java/com/alibaba/json/bvt/OOMTest.java | 2 +- .../json/bvt/ObjectArrayFieldTest.java | 2 +- .../com/alibaba/json/bvt/ObjectFieldTest.java | 2 +- .../com/alibaba/json/bvt/ParseArrayTest.java | 2 +- .../alibaba/json/bvt/PatternFieldTest.java | 2 +- .../java/com/alibaba/json/bvt/PointTest.java | 2 +- .../java/com/alibaba/json/bvt/PointTest2.java | 2 +- .../json/bvt/PublicFieldDoubleTest.java | 2 +- .../json/bvt/PublicFieldFloatTest.java | 2 +- .../alibaba/json/bvt/PublicFieldLongTest.java | 2 +- .../json/bvt/PublicFieldStringTest.java | 2 +- .../com/alibaba/json/bvt/RectangleTest.java | 2 +- .../alibaba/json/bvt/SerializeWriterTest.java | 2 +- .../com/alibaba/json/bvt/SetFieldTest.java | 2 +- .../bvt/ShortArrayFieldTest_primitive.java | 2 +- .../java/com/alibaba/json/bvt/SlashTest.java | 2 +- .../com/alibaba/json/bvt/SpecialKeyTest.java | 2 +- .../json/bvt/StringDeserializerTest.java | 2 +- .../com/alibaba/json/bvt/StringFieldTest.java | 2 +- .../com/alibaba/json/bvt/SymbolTableTest.java | 2 +- .../com/alibaba/json/bvt/TestExternal3.java | 2 +- .../com/alibaba/json/bvt/TestExternal4.java | 2 +- .../com/alibaba/json/bvt/TestExternal5.java | 2 +- .../com/alibaba/json/bvt/TestExternal6.java | 2 +- .../com/alibaba/json/bvt/TestForEmoji.java | 2 +- .../alibaba/json/bvt/TestForPascalStyle.java | 2 +- .../com/alibaba/json/bvt/TestNullKeyMap.java | 2 +- .../com/alibaba/json/bvt/TestTimeUnit.java | 2 +- .../alibaba/json/bvt/TimeZoneFieldTest.java | 2 +- .../com/alibaba/json/bvt/TimestampTest.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest2.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest3.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest4.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest5.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest6.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest7.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest8.java | 2 +- .../alibaba/json/bvt/TypeReferenceTest9.java | 2 +- .../com/alibaba/json/bvt/URIFieldTest.java | 2 +- .../com/alibaba/json/bvt/URLFieldTest.java | 2 +- .../com/alibaba/json/bvt/UUIDFieldTest.java | 2 +- .../alibaba/json/bvt/WriteClassNameTest.java | 2 +- .../alibaba/json/bvt/WriteClassNameTest2.java | 2 +- .../JSONTypejsonType_alphabetic_Test.java | 2 +- .../alibaba/json/bvt/asm/ASMDeserTest.java | 2 +- .../alibaba/json/bvt/asm/ASMDeserTest2.java | 2 +- .../alibaba/json/bvt/asm/ASMUtilsTest.java | 2 +- .../java/com/alibaba/json/bvt/asm/Case0.java | 2 +- .../alibaba/json/bvt/asm/JSONASMUtilTest.java | 2 +- .../com/alibaba/json/bvt/asm/LoopTest.java | 2 +- .../alibaba/json/bvt/asm/SortFieldTest.java | 2 +- .../com/alibaba/json/bvt/asm/TestList.java | 2 +- .../com/alibaba/json/bvt/asm/TestNonASM.java | 2 +- .../com/alibaba/json/bvt/asm/TestType.java | 2 +- .../java/com/alibaba/json/bvt/bug/Bug2.java | 2 +- .../bvt/bug/Bug_101_for_rongganlin_case2.java | 2 +- .../bvt/bug/Bug_101_for_rongganlin_case3.java | 2 +- .../java/com/alibaba/json/bvt/bug/Bug_8.java | 2 +- .../json/bvt/bug/Bug_for_80108116.java | 2 +- .../json/bvt/bug/Bug_for_ArrayMember.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_Johnny.java | 2 +- .../json/bvt/bug/Bug_for_agapple_2.java | 2 +- .../json/bvt/bug/Bug_for_ascii_0_31.java | 2 +- .../com/alibaba/json/bvt/bug/Bug_for_bbl.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_cduym.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_cnhans.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_dubbo.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_dubbo1.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_dubbo3.java | 2 +- .../json/bvt/bug/Bug_for_dubbo_long.java | 2 +- .../json/bvt/bug/Bug_for_franklee77.java | 2 +- .../json/bvt/bug/Bug_for_jiangwei1.java | 2 +- .../json/bvt/bug/Bug_for_jinghui70.java | 2 +- .../json/bvt/bug/Bug_for_jinguwei.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_lenolix.java | 2 +- .../json/bvt/bug/Bug_for_lenolix_10.java | 2 +- .../json/bvt/bug/Bug_for_lenolix_11.java | 2 +- .../json/bvt/bug/Bug_for_lenolix_9.java | 2 +- .../json/bvt/bug/Bug_for_leupom_2.java | 2 +- .../json/bvt/bug/Bug_for_leupom_3.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_melin.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_rendong.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat2.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat3.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat4.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat5.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat6.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat7.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat8.java | 2 +- .../json/bvt/bug/Bug_for_smoothrat9.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_stv_liu.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_wangran.java | 2 +- .../json/bvt/bug/Bug_for_wangran1.java | 2 +- .../json/bvt/bug/Bug_for_wangran2.java | 2 +- .../json/bvt/bug/Bug_for_wuyexiong.java | 2 +- .../json/bvt/bug/Bug_for_wuzhengmao.java | 2 +- .../json/bvt/bug/Bug_for_xiayucai2012.java | 2 +- .../json/bvt/bug/Bug_for_yannywang.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_zhaoyao.java | 2 +- .../alibaba/json/bvt/bug/Bug_for_zhuel.java | 2 +- .../json/bvt/bug/StackTraceElementTest.java | 2 +- .../com/alibaba/json/bvt/cglib/TestCglib.java | 2 +- .../compatible/jsonlib/CompatibleTest0.java | 2 +- .../jsonlib/CompatibleTest_noasm.java | 2 +- .../alibaba/json/bvt/dubbo/TestForDubbo.java | 2 +- .../alibaba/json/bvt/fullSer/LongTest.java | 2 +- .../json/bvt/parser/AsmParserTest0.java | 2 +- .../json/bvt/parser/AsmParserTest1.java | 2 +- .../alibaba/json/bvt/parser/ClassTest.java | 2 +- .../json/bvt/parser/DateParserTest.java | 2 +- .../json/bvt/parser/DateParserTest_sql.java | 2 +- .../parser/DateParserTest_sql_timestamp.java | 2 +- .../com/alibaba/json/bvt/parser/DateTest.java | 2 +- .../bvt/parser/DefaultExtJSONParserTest.java | 2 +- .../parser/DefaultExtJSONParserTest_0.java | 2 +- .../parser/DefaultExtJSONParserTest_1.java | 2 +- .../parser/DefaultExtJSONParserTest_2.java | 2 +- .../parser/DefaultExtJSONParserTest_3.java | 2 +- .../parser/DefaultExtJSONParserTest_4.java | 2 +- .../parser/DefaultExtJSONParserTest_5.java | 2 +- .../parser/DefaultExtJSONParserTest_6.java | 2 +- .../DefaultExtJSONParser_parseArray.java | 2 +- .../DefaultExtJSONParser_parseArray_2.java | 2 +- .../bvt/parser/DefaultJSONParserTest2.java | 2 +- .../DefaultJSONParserTest_charArray.java | 2 +- .../parser/DefaultJSONParserTest_comma.java | 2 +- .../parser/DefaultJSONParserTest_date.java | 2 +- .../parser/DefaultJSONParserTest_error.java | 2 +- .../json/bvt/parser/EnumParserTest.java | 2 +- .../json/bvt/parser/FastMatchCheckTest.java | 2 +- .../json/bvt/parser/FeatureParserTest.java | 2 +- .../alibaba/json/bvt/parser/FeatureTest.java | 2 +- .../alibaba/json/bvt/parser/GenericTest.java | 2 +- .../alibaba/json/bvt/parser/IOUtilsTest.java | 2 +- .../bvt/parser/InetSocketAddressTest.java | 2 +- .../json/bvt/parser/JSONArrayParseTest.java | 2 +- .../bvt/parser/JSONCreatorFactoryTest.java | 2 +- .../json/bvt/parser/JSONCreatorTest.java | 2 +- ...JSONReaderScannerTest__entity_boolean.java | 2 +- .../JSONReaderScannerTest__entity_double.java | 2 +- .../JSONReaderScannerTest__entity_enum.java | 2 +- .../JSONReaderScannerTest__entity_float.java | 2 +- .../JSONReaderScannerTest__entity_int.java | 2 +- .../JSONReaderScannerTest__entity_long.java | 2 +- .../JSONReaderScannerTest__entity_string.java | 2 +- ...NReaderScannerTest__entity_stringList.java | 2 +- .../JSONReaderScannerTest__map_string.java | 3 +- .../JSONReaderScannerTest_array_string.java | 2 +- .../parser/JSONReaderScannerTest_decimal.java | 2 +- .../bvt/parser/JSONReaderScannerTest_int.java | 2 +- .../parser/JSONReaderScannerTest_long.java | 2 +- .../bvt/parser/JSONScannerTest_ISO8601.java | 2 +- .../parser/JSONScannerTest__nextToken.java | 2 +- .../json/bvt/parser/JSONScannerTest__x.java | 2 +- .../bvt/parser/JSONScannerTest_colon.java | 2 +- .../bvt/parser/JSONScannerTest_false.java | 2 +- .../bvt/parser/JSONScannerTest_ident.java | 2 +- .../json/bvt/parser/JSONScannerTest_int.java | 2 +- .../bvt/parser/JSONScannerTest_isEOF.java | 2 +- .../json/bvt/parser/JSONScannerTest_long.java | 2 +- .../json/bvt/parser/JSONScannerTest_new.java | 2 +- .../json/bvt/parser/JSONScannerTest_null.java | 2 +- .../JSONScannerTest_scanFieldBoolean.java | 2 +- ...NScannerTest_scanFieldBoolean_unquote.java | 2 +- .../JSONScannerTest_scanFieldDouble.java | 2 +- .../JSONScannerTest_scanFieldFloat.java | 2 +- .../parser/JSONScannerTest_scanFieldInt.java | 2 +- .../parser/JSONScannerTest_scanFieldLong.java | 2 +- .../JSONScannerTest_scanFieldString.java | 2 +- .../JSONScannerTest_scanFieldStringArray.java | 2 +- ...JSONScannerTest_scanFieldString_error.java | 2 +- .../parser/JSONScannerTest_scanSymbol.java | 2 +- .../JSONScannerTest_singQuoteString.java | 2 +- .../bvt/parser/JSONScannerTest_symbol.java | 2 +- .../json/bvt/parser/JSONScannerTest_true.java | 2 +- .../json/bvt/parser/NullCheckTest.java | 2 +- .../json/bvt/parser/ParseRestTest.java | 2 +- .../bvt/parser/ParserSpecialCharTest.java | 95 ++++++++++++++++ .../bvt/parser/ParserSpecialCharTest_map.java | 82 ++++++++++++++ ...ParserSpecialCharTest_map_singleQuote.java | 82 ++++++++++++++ .../parser/TestInitStringFieldAsEmpty.java | 2 +- .../parser/TestInitStringFieldAsEmpty2.java | 2 +- .../com/alibaba/json/bvt/parser/TestUTF8.java | 2 +- .../alibaba/json/bvt/parser/TestUTF8_2.java | 2 +- .../alibaba/json/bvt/parser/TestUTF8_3.java | 2 +- .../alibaba/json/bvt/parser/TestUTF8_4.java | 2 +- .../json/bvt/parser/TypeReferenceTest.java | 2 +- .../json/bvt/parser/TypeUtilsTest2.java | 2 +- .../json/bvt/parser/TypeUtilsTest3.java | 2 +- .../json/bvt/parser/TypeUtilsTest4.java | 2 +- .../json/bvt/parser/TypeUtilsToJSONTest.java | 2 +- .../com/alibaba/json/bvt/parser/bug/Bug0.java | 2 +- .../com/alibaba/json/bvt/parser/bug/Bug2.java | 2 +- .../parser/deser/ArrayDeserializerTest.java | 2 +- .../deser/ArrayLisMapDeserializerTest.java | 2 +- .../ArrayListEnumFieldDeserializerTest.java | 2 +- .../ArrayListStringDeserializerTest.java | 2 +- .../deser/ArrayListTypeDeserializerTest.java | 2 +- .../parser/deser/ArrayListTypeFieldTest.java | 2 +- .../deser/BigDecimalDeserializerTest.java | 2 +- .../json/bvt/parser/deser/BigDecimalTest.java | 2 +- .../deser/BigIntegerDeserializerTest.java | 2 +- .../parser/deser/BooleanDeserializerTest.java | 2 +- .../deser/BooleanFieldDeserializerTest.java | 2 +- .../deser/CharArrayDeserializerTest.java | 2 +- .../json/bvt/parser/deser/ClassTest.java | 2 +- .../deser/CollectionDeserializerTest.java | 2 +- .../bvt/parser/deser/CollectionFieldTest.java | 2 +- .../parser/deser/ColorDeserializerTest.java | 2 +- .../ConcurrentHashMapDeserializerTest.java | 2 +- .../parser/deser/DateDeserializerTest.java | 2 +- .../json/bvt/parser/deser/DateParseTest1.java | 2 +- .../json/bvt/parser/deser/DateParseTest2.java | 2 +- .../json/bvt/parser/deser/DateParseTest3.java | 2 +- .../json/bvt/parser/deser/DateParseTest4.java | 2 +- .../json/bvt/parser/deser/DateParseTest5.java | 2 +- .../json/bvt/parser/deser/DateParseTest6.java | 2 +- .../json/bvt/parser/deser/DateParseTest7.java | 2 +- .../json/bvt/parser/deser/DateParseTest8.java | 2 +- .../json/bvt/parser/deser/DateParseTest9.java | 2 +- .../deser/DefaultObjectDeserializerTest.java | 2 +- .../deser/DefaultObjectDeserializerTest1.java | 2 +- .../deser/DefaultObjectDeserializerTest2.java | 2 +- ...aultObjectDeserializerTest_collection.java | 2 +- .../parser/deser/DoubleDeserializerTest.java | 2 +- .../json/bvt/parser/deser/EnumTest.java | 2 +- .../json/bvt/parser/deser/FactoryTest.java | 2 +- .../parser/deser/FieldDeserializerTest.java | 2 +- .../parser/deser/FieldDeserializerTest1.java | 2 +- .../parser/deser/FieldDeserializerTest2.java | 2 +- .../parser/deser/FieldDeserializerTest3.java | 2 +- .../parser/deser/FieldDeserializerTest4.java | 2 +- .../parser/deser/FieldDeserializerTest5.java | 2 +- .../bvt/parser/deser/FieldSerializerTest.java | 2 +- .../parser/deser/FieldSerializerTest2.java | 2 +- .../parser/deser/FieldSerializerTest3.java | 2 +- .../parser/deser/FloatDeserializerTest.java | 2 +- .../parser/deser/FontDeserializerTest.java | 2 +- .../parser/deser/GetOnlyCollectionTest.java | 2 +- .../deser/InetAddressDeserializerTest.java | 2 +- .../parser/deser/IntegerDeserializerTest.java | 2 +- .../deser/IntegerFieldDeserializerTest.java | 2 +- .../bvt/parser/deser/IntegerParseTest.java | 2 +- .../bvt/parser/deser/InterfaceParseTest.java | 2 +- .../json/bvt/parser/deser/LocaleTest.java | 2 +- .../parser/deser/LongDeserializerTest.java | 2 +- .../deser/LongFieldDeserializerTest.java | 2 +- .../json/bvt/parser/deser/MapTest.java | 2 +- .../json/bvt/parser/deser/MultiArrayTest.java | 2 +- .../parser/deser/NumberDeserializerTest.java | 2 +- .../parser/deser/PatternDeserializerTest.java | 2 +- .../parser/deser/PointDeserializerTest.java | 2 +- .../deser/RectangleDeserializerTest.java | 2 +- .../parser/deser/SqlDateDeserializerTest.java | 2 +- .../deser/SqlDateDeserializerTest2.java | 2 +- .../StackTraceElementDeserializerTest.java | 2 +- .../json/bvt/parser/deser/TestASM2.java | 2 +- .../bvt/parser/deser/TestASM_BigDecimal.java | 2 +- .../json/bvt/parser/deser/TestASM_Byte_0.java | 2 +- .../json/bvt/parser/deser/TestASM_Date.java | 2 +- .../bvt/parser/deser/TestASM_Integer.java | 2 +- .../json/bvt/parser/deser/TestASM_Long_0.java | 2 +- .../bvt/parser/deser/TestASM_Short_0.java | 2 +- .../bvt/parser/deser/TestASM_boolean.java | 2 +- .../json/bvt/parser/deser/TestASM_byte.java | 2 +- .../json/bvt/parser/deser/TestASM_char.java | 2 +- .../json/bvt/parser/deser/TestASM_double.java | 2 +- .../json/bvt/parser/deser/TestASM_float.java | 2 +- .../json/bvt/parser/deser/TestASM_int.java | 2 +- .../json/bvt/parser/deser/TestASM_long.java | 2 +- .../json/bvt/parser/deser/TestASM_null.java | 2 +- .../json/bvt/parser/deser/TestASM_object.java | 2 +- .../json/bvt/parser/deser/TestASM_short.java | 2 +- .../json/bvt/parser/deser/TestEnum.java | 2 +- .../json/bvt/parser/deser/TestNull.java | 2 +- .../deser/ThrowableDeserializerTest.java | 2 +- .../parser/deser/TimeDeserializerTest.java | 2 +- .../parser/deser/TimeDeserializerTest2.java | 2 +- .../deser/TimeZoneDeserializerTest.java | 2 +- .../parser/deser/TreeMapDeserializerTest.java | 2 +- .../bvt/parser/deser/URIDeserializerTest.java | 2 +- .../bvt/parser/deser/URLDeserializerTest.java | 2 +- .../parser/deser/UUIDDeserializerTest.java | 2 +- .../com/alibaba/json/bvt/ref/TestRef.java | 2 +- .../com/alibaba/json/bvt/ref/TestRef2.java | 2 +- .../com/alibaba/json/bvt/ref/TestRef3.java | 2 +- .../com/alibaba/json/bvt/ref/TestRef6.java | 2 +- .../com/alibaba/json/bvt/ref/TestRef7.java | 2 +- .../json/bvt/serializer/AppendableTest.java | 2 +- .../alibaba/json/bvt/serializer/BugTest0.java | 2 +- .../alibaba/json/bvt/serializer/BugTest1.java | 2 +- .../ByteArrayFieldSerializerTest.java | 2 +- .../json/bvt/serializer/ByteArrayTest.java | 2 +- .../serializer/CharArraySerializerTest.java | 2 +- .../alibaba/json/bvt/serializer/CharTest.java | 2 +- .../json/bvt/serializer/CharsetTest.java | 2 +- .../serializer/CircularReferencesTest.java | 2 +- .../serializer/CollectionSerializerTest.java | 2 +- .../bvt/serializer/ColorSerializerTest.java | 2 +- .../alibaba/json/bvt/serializer/DateTest.java | 2 +- .../json/bvt/serializer/DateTest2.java | 2 +- .../json/bvt/serializer/DoubleTest.java | 7 +- .../alibaba/json/bvt/serializer/EnumTest.java | 2 +- .../json/bvt/serializer/EnumTest2.java | 2 +- .../json/bvt/serializer/ExtendsTest.java | 2 +- .../alibaba/json/bvt/serializer/FileTest.java | 2 +- .../json/bvt/serializer/FloatTest.java | 2 +- .../bvt/serializer/FontSerializerTest.java | 2 +- .../json/bvt/serializer/InetAddressTest.java | 2 +- .../bvt/serializer/InetSocketAddressTest.java | 2 +- .../bvt/serializer/IntArrayEncodeTest.java | 2 +- .../serializer/IntegerArrayEncodeTest.java | 2 +- .../IntegerArrayFieldSerializerTest.java | 2 +- .../bvt/serializer/IntegerSerializerTest.java | 2 +- .../json/bvt/serializer/InterfaceTest.java | 2 +- .../json/bvt/serializer/JSONFieldTest.java | 2 +- .../json/bvt/serializer/JSONFieldTest2.java | 2 +- .../serializer/JSONSerializerContextTest.java | 2 +- .../serializer/JSONSerializerFeatureTest.java | 2 +- .../bvt/serializer/JSONSerializerMapTest.java | 2 +- .../bvt/serializer/JSONSerializerTest.java | 2 +- .../bvt/serializer/JSONSerializerTest1.java | 2 +- .../bvt/serializer/JSONSerializerTest2.java | 2 +- .../serializer/JavaBeanSerializerTest.java | 2 +- .../bvt/serializer/ListSerializerTest.java | 2 +- .../bvt/serializer/ListSerializerTest2.java | 2 +- .../alibaba/json/bvt/serializer/ListTest.java | 2 +- .../json/bvt/serializer/LocalTest.java | 2 +- .../bvt/serializer/MapSerializerTest.java | 2 +- .../alibaba/json/bvt/serializer/MapTest.java | 2 +- .../json/bvt/serializer/NameFilterTest.java | 2 +- .../serializer/NameFilterTest_boolean.java | 2 +- .../bvt/serializer/NameFilterTest_byte.java | 2 +- .../bvt/serializer/NameFilterTest_char.java | 2 +- .../bvt/serializer/NameFilterTest_double.java | 2 +- .../bvt/serializer/NameFilterTest_float.java | 2 +- .../bvt/serializer/NameFilterTest_long.java | 2 +- .../bvt/serializer/NameFilterTest_short.java | 2 +- .../bvt/serializer/PascalNameFilterTest.java | 2 +- .../json/bvt/serializer/PatternTest.java | 2 +- .../bvt/serializer/PointSerializerTest.java | 2 +- .../json/bvt/serializer/PrettyFormatTest.java | 2 +- .../bvt/serializer/PropertyFilterTest.java | 2 +- .../bvt/serializer/PropertyFilter_byte.java | 2 +- .../bvt/serializer/PropertyFilter_char.java | 2 +- .../bvt/serializer/PropertyFilter_double.java | 2 +- .../bvt/serializer/PropertyFilter_float.java | 2 +- .../bvt/serializer/PropertyFilter_long.java | 2 +- .../bvt/serializer/PropertyFilter_short.java | 2 +- .../json/bvt/serializer/PropertyPathTest.java | 2 +- .../bvt/serializer/PropertyPathTest2.java | 2 +- .../serializer/RectangleSerializerTest.java | 2 +- .../bvt/serializer/SerialContextTest.java | 2 +- .../SerialWriterStringEncoderTest.java | 2 +- .../SerialWriterStringEncoderTest2.java | 2 +- .../bvt/serializer/SerializeConfigTest.java | 2 +- .../bvt/serializer/SerializeWriterTest.java | 2 +- .../bvt/serializer/SerializeWriterTest_1.java | 2 +- .../bvt/serializer/SerializeWriterTest_3.java | 2 +- .../bvt/serializer/SerializeWriterTest_5.java | 2 +- .../bvt/serializer/SerializeWriterTest_6.java | 2 +- .../bvt/serializer/SerializeWriterTest_7.java | 2 +- .../bvt/serializer/SerializerFeatureTest.java | 2 +- .../bvt/serializer/ShortSerializerTest.java | 2 +- .../SimpleDataFormatSerializerTest.java | 2 +- .../SimplePropertyPreFilterTest.java | 2 +- .../bvt/serializer/SpecicalStringTest.java | 2 +- .../bvt/serializer/StringSerializerTest.java | 2 +- .../json/bvt/serializer/TestInnerClass.java | 2 +- .../json/bvt/serializer/TestInnerClass1.java | 2 +- .../json/bvt/serializer/TestInnerClass2.java | 2 +- .../bvt/serializer/TestPivateStaticClass.java | 2 +- .../json/bvt/serializer/TestSortField.java | 2 +- .../bvt/serializer/TestSpecial_entity.java | 20 ++++ .../json/bvt/serializer/TestSpecial_map.java | 10 ++ .../json/bvt/serializer/TimeZoneTest.java | 2 +- .../json/bvt/serializer/TransientTest.java | 2 +- .../json/bvt/serializer/TreeSetTest.java | 2 +- .../alibaba/json/bvt/serializer/URITest.java | 2 +- .../alibaba/json/bvt/serializer/URLTest.java | 2 +- .../alibaba/json/bvt/serializer/UUIDTest.java | 2 +- .../json/bvt/serializer/ValueFilterTest.java | 2 +- .../serializer/WriteNullListAsEmptyTest.java | 2 +- .../serializer/WriteSlashAsSpecialTest.java | 2 +- .../exception/RuntimeExceptionTest.java | 2 +- .../prettyFormat/ArrayListTest.java | 2 +- .../stream/StreamWriterTest_writeArray.java | 2 +- .../stream/StreamWriterTest_writeArray2.java | 2 +- .../stream/StreamWriterTest_writeBytes.java | 2 +- .../stream/StreamWriterTest_writeBytes1.java | 2 +- .../stream/StreamWriterTest_writeChar.java | 2 +- .../stream/StreamWriterTest_writeChar1.java | 2 +- .../StreamWriterTest_writeFieldValue.java | 2 +- .../StreamWriterTest_writeFieldValue_int.java | 2 +- ...treamWriterTest_writeFieldValue_int_1.java | 2 +- ...StreamWriterTest_writeFieldValue_long.java | 2 +- ...reamWriterTest_writeFieldValue_string.java | 2 +- ...Test_writeFieldValue_string_singQuote.java | 2 +- .../stream/StreamWriterTest_writeInt.java | 2 +- .../StreamWriterTest_writeIntAndChar.java | 2 +- .../StreamWriterTest_writeJSONStringTo.java | 2 +- .../stream/StreamWriterTest_writeLong.java | 2 +- .../StreamWriterTest_writeLongAndChar.java | 2 +- .../stream/StreamWriterTest_writeString.java | 2 +- .../stream/StreamWriterTest_writeString1.java | 2 +- .../StreamWriterTest_writeValueString.java | 2 +- .../StreamWriterTest_writeValueString1.java | 2 +- .../StreamWriterTest_writeValueString2.java | 2 +- .../alibaba/json/bvt/util/FieldInfoTest.java | 2 +- .../json/bvt/util/JSONASMUtilTest.java | 2 +- .../json/bvt/util/ThreadLocalCacheTest.java | 2 +- .../json/bvt/writeClassName/MapTest.java | 2 +- .../writeClassName/WriteClassNameTest.java | 2 +- .../writeClassName/WriteClassNameTest2.java | 2 +- .../WriteClassNameTest_Collection.java | 2 +- .../WriteClassNameTest_Collection2.java | 2 +- .../WriteClassNameTest_List.java | 2 +- .../WriteClassNameTest_List2.java | 2 +- .../WriteClassNameTest_Set.java | 2 +- .../WriteClassNameTest_Set2.java | 2 +- .../WriteClassNameTest_Set3.java | 2 +- .../WriteClassNameTest_Set4.java | 2 +- .../alibaba/json/bvtVO/DataTransaction2.java | 2 +- .../java/com/alibaba/json/demo/DateDemo.java | 2 +- .../com/alibaba/json/demo/JSONFeidDemo.java | 2 +- .../test/IntArrayFieldTest_primitive.java | 2 +- 534 files changed, 963 insertions(+), 618 deletions(-) create mode 100644 src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest.java create mode 100644 src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest_map.java create mode 100644 src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest_map_singleQuote.java diff --git a/src/main/java/com/alibaba/fastjson/parser/JSONLexer.java b/src/main/java/com/alibaba/fastjson/parser/JSONLexer.java index af42720d3..f17787a5c 100755 --- a/src/main/java/com/alibaba/fastjson/parser/JSONLexer.java +++ b/src/main/java/com/alibaba/fastjson/parser/JSONLexer.java @@ -43,50 +43,14 @@ import com.alibaba.fastjson.JSONException; */ public abstract class JSONLexer implements Closeable { - public final static byte EOI = 0x1A; - public final static int NOT_MATCH = -1; - public final static int NOT_MATCH_NAME = -2; - public final static int UNKOWN = 0; - public final static int OBJECT = 1; - public final static int ARRAY = 2; - public final static int VALUE = 3; - public final static int END = 4; - - protected static boolean[] whitespaceFlags = new boolean[256]; - static { - whitespaceFlags[' '] = true; - whitespaceFlags['\n'] = true; - whitespaceFlags['\r'] = true; - whitespaceFlags['\t'] = true; - whitespaceFlags['\f'] = true; - whitespaceFlags['\b'] = true; - } - - protected static final long MULTMIN_RADIX_TEN = Long.MIN_VALUE / 10; - protected static final long N_MULTMAX_RADIX_TEN = -Long.MAX_VALUE / 10; - - protected static final int INT_MULTMIN_RADIX_TEN = Integer.MIN_VALUE / 10; - protected static final int INT_N_MULTMAX_RADIX_TEN = -Integer.MAX_VALUE / 10; - - protected final static int[] digits = new int[(int) 'f' + 1]; - - static { - for (int i = '0'; i <= '9'; ++i) { - digits[i] = i - '0'; - } - - for (int i = 'a'; i <= 'f'; ++i) { - digits[i] = (i - 'a') + 10; - } - for (int i = 'A'; i <= 'F'; ++i) { - digits[i] = (i - 'A') + 10; - } - } - - public static final boolean isWhitespace(char ch) { - // 专门调整了判断顺序 - return ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\f' || ch == '\b'; - } + public final static byte EOI = 0x1A; + public final static int NOT_MATCH = -1; + public final static int NOT_MATCH_NAME = -2; + public final static int UNKOWN = 0; + public final static int OBJECT = 1; + public final static int ARRAY = 2; + public final static int VALUE = 3; + public final static int END = 4; protected void lexError(String key, Object... args) { token = ERROR; @@ -94,7 +58,7 @@ public abstract class JSONLexer implements Closeable { protected int token; protected int pos; - protected int features = JSON.DEFAULT_PARSER_FEATURE; + protected int features = JSON.DEFAULT_PARSER_FEATURE; protected char ch; protected int bp; @@ -114,19 +78,19 @@ public abstract class JSONLexer implements Closeable { protected boolean hasSpecial; - protected Calendar calendar = null; + protected Calendar calendar = null; - public int matchStat = UNKOWN; + public int matchStat = UNKOWN; - private final static ThreadLocal> sbufRefLocal = new ThreadLocal>(); - protected Keywords keywods = Keywords.DEFAULT_KEYWORDS; + private final static ThreadLocal> SBUF_REF_LOCAL = new ThreadLocal>(); + protected Keywords keywods = Keywords.DEFAULT_KEYWORDS; public JSONLexer(){ - SoftReference sbufRef = sbufRefLocal.get(); + SoftReference sbufRef = SBUF_REF_LOCAL.get(); if (sbufRef != null) { sbuf = sbufRef.get(); - sbufRefLocal.set(null); + SBUF_REF_LOCAL.set(null); } if (sbuf == null) { @@ -724,7 +688,7 @@ public abstract class JSONLexer implements Closeable { public void close() { if (sbuf.length <= 1024 * 8) { - sbufRefLocal.set(new SoftReference(sbuf)); + SBUF_REF_LOCAL.set(new SoftReference(sbuf)); } this.sbuf = null; } @@ -1822,4 +1786,40 @@ public abstract class JSONLexer implements Closeable { public final BigDecimal decimalValue() { return new BigDecimal(numberString()); } + + public static final boolean isWhitespace(char ch) { + // 专门调整了判断顺序 + return ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\f' || ch == '\b'; + } + + protected static boolean[] whitespaceFlags = new boolean[256]; + static { + whitespaceFlags[' '] = true; + whitespaceFlags['\n'] = true; + whitespaceFlags['\r'] = true; + whitespaceFlags['\t'] = true; + whitespaceFlags['\f'] = true; + whitespaceFlags['\b'] = true; + } + + protected static final long MULTMIN_RADIX_TEN = Long.MIN_VALUE / 10; + protected static final long N_MULTMAX_RADIX_TEN = -Long.MAX_VALUE / 10; + + protected static final int INT_MULTMIN_RADIX_TEN = Integer.MIN_VALUE / 10; + protected static final int INT_N_MULTMAX_RADIX_TEN = -Integer.MAX_VALUE / 10; + + protected final static int[] digits = new int[(int) 'f' + 1]; + + static { + for (int i = '0'; i <= '9'; ++i) { + digits[i] = i - '0'; + } + + for (int i = 'a'; i <= 'f'; ++i) { + digits[i] = (i - 'a') + 10; + } + for (int i = 'A'; i <= 'F'; ++i) { + digits[i] = (i - 'A') + 10; + } + } } diff --git a/src/main/java/com/alibaba/fastjson/parser/JSONReaderScanner.java b/src/main/java/com/alibaba/fastjson/parser/JSONReaderScanner.java index 88c2ab0ac..8c9ff18cd 100644 --- a/src/main/java/com/alibaba/fastjson/parser/JSONReaderScanner.java +++ b/src/main/java/com/alibaba/fastjson/parser/JSONReaderScanner.java @@ -35,8 +35,8 @@ import com.alibaba.fastjson.util.IOUtils; */ public final class JSONReaderScanner extends JSONLexer { - public final static int BUF_INIT_LEN = 1024; - private final static ThreadLocal> textRefLocal = new ThreadLocal>(); + public final static int BUF_INIT_LEN = 1024; + private final static ThreadLocal> BUF_REF_LOCAL = new ThreadLocal>(); private Reader reader; private char[] buf; @@ -62,10 +62,10 @@ public final class JSONReaderScanner extends JSONLexer { this.reader = reader; this.features = features; - SoftReference bufRef = textRefLocal.get(); + SoftReference bufRef = BUF_REF_LOCAL.get(); if (bufRef != null) { this.buf = bufRef.get(); - textRefLocal.set(null); + BUF_REF_LOCAL.set(null); } if (this.buf == null) { @@ -722,9 +722,9 @@ public final class JSONReaderScanner extends JSONLexer { public void close() { super.close(); - textRefLocal.set(new SoftReference(buf)); + BUF_REF_LOCAL.set(new SoftReference(buf)); this.buf = null; - + IOUtils.close(reader); } diff --git a/src/main/java/com/alibaba/fastjson/parser/JSONScanner.java b/src/main/java/com/alibaba/fastjson/parser/JSONScanner.java index 84da1fa5d..fba964279 100755 --- a/src/main/java/com/alibaba/fastjson/parser/JSONScanner.java +++ b/src/main/java/com/alibaba/fastjson/parser/JSONScanner.java @@ -105,33 +105,60 @@ public final class JSONScanner extends JSONLexer { chLocal = charAt(++bp); switch (chLocal) { - case '"': - putChar('"'); + case '0': + putChar('\0'); break; - case '\\': - putChar('\\'); + case '1': + putChar('\1'); break; - case '/': - putChar('/'); + case '2': + putChar('\2'); break; - case '\'': - putChar('\''); + case '3': + putChar('\3'); break; - case 'b': + case '4': + putChar('\4'); + break; + case '5': + putChar('\5'); + break; + case '6': + putChar('\6'); + break; + case '7': + putChar('\7'); + break; + case 'b': // 8 putChar('\b'); break; - case 'f': + case 't': // 9 + putChar('\t'); + break; + case 'n': // 10 + putChar('\n'); + break; + case 'v': // 11 + putChar('\u000B'); + break; + case 'f': // 12 case 'F': putChar('\f'); break; - case 'n': - putChar('\n'); - break; - case 'r': + case 'r': // 13 putChar('\r'); break; - case 't': - putChar('\t'); + case '"': // 34 + putChar('"'); + break; + case '\'': // 39 + putChar('\''); + break; + case '/': // 47 + putChar('/'); + break; + case '\\': // 92 + putChar('\\'); break; case 'x': char x1 = chLocal = charAt(++bp); diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/AbstractDateDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/AbstractDateDeserializer.java index 42ee3edac..f44441196 100755 --- a/src/main/java/com/alibaba/fastjson/parser/deserializer/AbstractDateDeserializer.java +++ b/src/main/java/com/alibaba/fastjson/parser/deserializer/AbstractDateDeserializer.java @@ -31,6 +31,7 @@ public abstract class AbstractDateDeserializer implements ObjectDeserializer { if (iso8601Lexer.scanISO8601DateIfMatch()) { val = iso8601Lexer.getCalendar().getTime(); } + iso8601Lexer.close(); } } else if (lexer.token() == JSONToken.NULL) { lexer.nextToken(); diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/DateDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/DateDeserializer.java index 50be04ce8..299c3d845 100755 --- a/src/main/java/com/alibaba/fastjson/parser/deserializer/DateDeserializer.java +++ b/src/main/java/com/alibaba/fastjson/parser/deserializer/DateDeserializer.java @@ -31,8 +31,12 @@ public class DateDeserializer extends AbstractDateDeserializer implements Object } JSONScanner dateLexer = new JSONScanner(strVal); - if (dateLexer.scanISO8601DateIfMatch(false)) { - return (T) dateLexer.getCalendar().getTime(); + try { + if (dateLexer.scanISO8601DateIfMatch(false)) { + return (T) dateLexer.getCalendar().getTime(); + } + } finally { + dateLexer.close(); } DateFormat dateFormat = parser.getDateFormat(); diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/SqlDateDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/SqlDateDeserializer.java index c8d902d36..62dac77d5 100755 --- a/src/main/java/com/alibaba/fastjson/parser/deserializer/SqlDateDeserializer.java +++ b/src/main/java/com/alibaba/fastjson/parser/deserializer/SqlDateDeserializer.java @@ -33,19 +33,24 @@ public class SqlDateDeserializer extends AbstractDateDeserializer implements Obj long longVal; JSONScanner dateLexer = new JSONScanner(strVal); - if (dateLexer.scanISO8601DateIfMatch()) { - longVal = dateLexer.getCalendar().getTimeInMillis(); - } else { + try { + if (dateLexer.scanISO8601DateIfMatch()) { + longVal = dateLexer.getCalendar().getTimeInMillis(); + } else { - DateFormat dateFormat = parser.getDateFormat(); - try { - java.util.Date date = (java.util.Date) dateFormat.parse(strVal); - return (T) new java.sql.Date(date.getTime()); - } catch (ParseException e) { - // skip + DateFormat dateFormat = parser.getDateFormat(); + try { + java.util.Date date = (java.util.Date) dateFormat.parse(strVal); + java.sql.Date sqlDate = new java.sql.Date(date.getTime()); + return (T) sqlDate; + } catch (ParseException e) { + // skip + } + + longVal = Long.parseLong(strVal); } - - longVal = Long.parseLong(strVal); + } finally { + dateLexer.close(); } return (T) new java.sql.Date(longVal); } else { diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/TimeDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/TimeDeserializer.java index 5cb9c9095..5d4209e85 100755 --- a/src/main/java/com/alibaba/fastjson/parser/deserializer/TimeDeserializer.java +++ b/src/main/java/com/alibaba/fastjson/parser/deserializer/TimeDeserializer.java @@ -62,6 +62,7 @@ public class TimeDeserializer implements ObjectDeserializer { } else { longVal = Long.parseLong(strVal); } + dateLexer.close(); return (T) new java.sql.Time(longVal); } diff --git a/src/main/java/com/alibaba/fastjson/serializer/DoubleSerializer.java b/src/main/java/com/alibaba/fastjson/serializer/DoubleSerializer.java index 312c9f288..b65950ef2 100755 --- a/src/main/java/com/alibaba/fastjson/serializer/DoubleSerializer.java +++ b/src/main/java/com/alibaba/fastjson/serializer/DoubleSerializer.java @@ -17,13 +17,24 @@ package com.alibaba.fastjson.serializer; import java.io.IOException; import java.lang.reflect.Type; +import java.text.DecimalFormat; /** * @author wenshao */ public class DoubleSerializer implements ObjectSerializer { - public final static DoubleSerializer instance = new DoubleSerializer(); + public final static DoubleSerializer instance = new DoubleSerializer(); + + private DecimalFormat decimalFomrat = null; + + public DoubleSerializer(){ + + } + + public DoubleSerializer(DecimalFormat decimalFomrat){ + this.decimalFomrat = decimalFomrat; + } public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType) throws IOException { SerializeWriter out = serializer.getWriter(); @@ -32,24 +43,29 @@ public class DoubleSerializer implements ObjectSerializer { if (serializer.isEnabled(SerializerFeature.WriteNullNumberAsZero)) { out.write('0'); } else { - out.writeNull(); + out.writeNull(); } return; } - double doubleValue = ((Double) object).doubleValue(); - + double doubleValue = ((Double) object).doubleValue(); + if (Double.isNaN(doubleValue)) { out.writeNull(); } else if (Double.isInfinite(doubleValue)) { out.writeNull(); } else { - String doubleText = Double.toString(doubleValue); - if (doubleText.endsWith(".0")) { - doubleText = doubleText.substring(0, doubleText.length() - 2); + String doubleText; + if (decimalFomrat == null) { + doubleText = Double.toString(doubleValue); + if (doubleText.endsWith(".0")) { + doubleText = doubleText.substring(0, doubleText.length() - 2); + } + } else { + doubleText = decimalFomrat.format(doubleValue); } out.append(doubleText); - + if (serializer.isEnabled(SerializerFeature.WriteClassName)) { out.write('D'); } diff --git a/src/test/java/com/alibaba/json/ArrayRefTest2.java b/src/test/java/com/alibaba/json/ArrayRefTest2.java index d1fed1c60..45be1a77f 100755 --- a/src/test/java/com/alibaba/json/ArrayRefTest2.java +++ b/src/test/java/com/alibaba/json/ArrayRefTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/AnnotationTest.java b/src/test/java/com/alibaba/json/bvt/AnnotationTest.java index 9dc835295..4dd3eeddf 100755 --- a/src/test/java/com/alibaba/json/bvt/AnnotationTest.java +++ b/src/test/java/com/alibaba/json/bvt/AnnotationTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/AnnotationTest2.java b/src/test/java/com/alibaba/json/bvt/AnnotationTest2.java index 93135ddcc..c7415f504 100755 --- a/src/test/java/com/alibaba/json/bvt/AnnotationTest2.java +++ b/src/test/java/com/alibaba/json/bvt/AnnotationTest2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/AnnotationTest3.java b/src/test/java/com/alibaba/json/bvt/AnnotationTest3.java index d9cc2c208..7c3140f14 100755 --- a/src/test/java/com/alibaba/json/bvt/AnnotationTest3.java +++ b/src/test/java/com/alibaba/json/bvt/AnnotationTest3.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/AppendableFieldTest.java b/src/test/java/com/alibaba/json/bvt/AppendableFieldTest.java index 4cc787e61..1d4679f43 100755 --- a/src/test/java/com/alibaba/json/bvt/AppendableFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/AppendableFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ArmoryTest.java b/src/test/java/com/alibaba/json/bvt/ArmoryTest.java index 8c81c22ef..e64dab899 100755 --- a/src/test/java/com/alibaba/json/bvt/ArmoryTest.java +++ b/src/test/java/com/alibaba/json/bvt/ArmoryTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ArrayListFieldTest.java b/src/test/java/com/alibaba/json/bvt/ArrayListFieldTest.java index b240d46d8..638de152c 100755 --- a/src/test/java/com/alibaba/json/bvt/ArrayListFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/ArrayListFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.ArrayList; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ArrayListFloatFieldTest.java b/src/test/java/com/alibaba/json/bvt/ArrayListFloatFieldTest.java index 5175d8171..6897f63ed 100755 --- a/src/test/java/com/alibaba/json/bvt/ArrayListFloatFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/ArrayListFloatFieldTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ArrayRefTest.java b/src/test/java/com/alibaba/json/bvt/ArrayRefTest.java index 6c92e757f..d296713e0 100755 --- a/src/test/java/com/alibaba/json/bvt/ArrayRefTest.java +++ b/src/test/java/com/alibaba/json/bvt/ArrayRefTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/AtomicIntegerArrayFieldTest.java b/src/test/java/com/alibaba/json/bvt/AtomicIntegerArrayFieldTest.java index fbf5f3287..45679f51e 100755 --- a/src/test/java/com/alibaba/json/bvt/AtomicIntegerArrayFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/AtomicIntegerArrayFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.concurrent.atomic.AtomicIntegerArray; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/AtomicLongArrayFieldTest.java b/src/test/java/com/alibaba/json/bvt/AtomicLongArrayFieldTest.java index 9a3ec635a..dfbae3b59 100755 --- a/src/test/java/com/alibaba/json/bvt/AtomicLongArrayFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/AtomicLongArrayFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.concurrent.atomic.AtomicLongArray; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/Base64Test.java b/src/test/java/com/alibaba/json/bvt/Base64Test.java index 750f45dc0..242ebe0c8 100755 --- a/src/test/java/com/alibaba/json/bvt/Base64Test.java +++ b/src/test/java/com/alibaba/json/bvt/Base64Test.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.util.Base64; diff --git a/src/test/java/com/alibaba/json/bvt/BigDecimalFieldTest.java b/src/test/java/com/alibaba/json/bvt/BigDecimalFieldTest.java index 085482d3c..d57eadae4 100755 --- a/src/test/java/com/alibaba/json/bvt/BigDecimalFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/BigDecimalFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/BigIntegerFieldTest.java b/src/test/java/com/alibaba/json/bvt/BigIntegerFieldTest.java index 3b17dfadf..01fb2b24a 100755 --- a/src/test/java/com/alibaba/json/bvt/BigIntegerFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/BigIntegerFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.math.BigInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/BooleanArrayFieldTest.java b/src/test/java/com/alibaba/json/bvt/BooleanArrayFieldTest.java index 75a7f9a90..e133a2a13 100755 --- a/src/test/java/com/alibaba/json/bvt/BooleanArrayFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/BooleanArrayFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/BooleanArrayFieldTest_primitive.java b/src/test/java/com/alibaba/json/bvt/BooleanArrayFieldTest_primitive.java index 2c45084d8..448f2e73b 100755 --- a/src/test/java/com/alibaba/json/bvt/BooleanArrayFieldTest_primitive.java +++ b/src/test/java/com/alibaba/json/bvt/BooleanArrayFieldTest_primitive.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/BuilderTest.java b/src/test/java/com/alibaba/json/bvt/BuilderTest.java index 2b68c1cb0..4ba83dcdf 100755 --- a/src/test/java/com/alibaba/json/bvt/BuilderTest.java +++ b/src/test/java/com/alibaba/json/bvt/BuilderTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_1.java b/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_1.java index f8892435a..efd64ec38 100755 --- a/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_1.java +++ b/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_1.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_2.java b/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_2.java index ace1fa719..dd81f96e0 100755 --- a/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_2.java +++ b/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.io.UnsupportedEncodingException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_3.java b/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_3.java index f612c08ae..b47179fb7 100755 --- a/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_3.java +++ b/src/test/java/com/alibaba/json/bvt/ByteArrayFieldTest_3.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.io.UnsupportedEncodingException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ByteFieldTest.java b/src/test/java/com/alibaba/json/bvt/ByteFieldTest.java index 2f80afd46..f8e24e94c 100755 --- a/src/test/java/com/alibaba/json/bvt/ByteFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/ByteFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/CastTest.java b/src/test/java/com/alibaba/json/bvt/CastTest.java index 2c2856601..5a18b3856 100755 --- a/src/test/java/com/alibaba/json/bvt/CastTest.java +++ b/src/test/java/com/alibaba/json/bvt/CastTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/CastTest2.java b/src/test/java/com/alibaba/json/bvt/CastTest2.java index bbef9c417..43e42e6f2 100755 --- a/src/test/java/com/alibaba/json/bvt/CastTest2.java +++ b/src/test/java/com/alibaba/json/bvt/CastTest2.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/CharsetFieldTest.java b/src/test/java/com/alibaba/json/bvt/CharsetFieldTest.java index 8e78fed61..b190b0666 100755 --- a/src/test/java/com/alibaba/json/bvt/CharsetFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/CharsetFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.nio.charset.Charset; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ClassFieldTest.java b/src/test/java/com/alibaba/json/bvt/ClassFieldTest.java index 0355dfa6e..63cfb981a 100755 --- a/src/test/java/com/alibaba/json/bvt/ClassFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/ClassFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ColorTest.java b/src/test/java/com/alibaba/json/bvt/ColorTest.java index d52350c8e..c25f890d8 100755 --- a/src/test/java/com/alibaba/json/bvt/ColorTest.java +++ b/src/test/java/com/alibaba/json/bvt/ColorTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.awt.Color; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ColorTest2.java b/src/test/java/com/alibaba/json/bvt/ColorTest2.java index 572857a6a..34c0b3fb3 100755 --- a/src/test/java/com/alibaba/json/bvt/ColorTest2.java +++ b/src/test/java/com/alibaba/json/bvt/ColorTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.awt.Color; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DateFieldTest.java b/src/test/java/com/alibaba/json/bvt/DateFieldTest.java index f0c701a58..b46319a7f 100755 --- a/src/test/java/com/alibaba/json/bvt/DateFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/DateFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DateFieldTest2.java b/src/test/java/com/alibaba/json/bvt/DateFieldTest2.java index 9dd1cb797..aa45b2973 100755 --- a/src/test/java/com/alibaba/json/bvt/DateFieldTest2.java +++ b/src/test/java/com/alibaba/json/bvt/DateFieldTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DateFieldTest3.java b/src/test/java/com/alibaba/json/bvt/DateFieldTest3.java index 91affb8da..90b610663 100755 --- a/src/test/java/com/alibaba/json/bvt/DateFieldTest3.java +++ b/src/test/java/com/alibaba/json/bvt/DateFieldTest3.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DateFieldTest4.java b/src/test/java/com/alibaba/json/bvt/DateFieldTest4.java index 827d7c502..53a2a35f3 100755 --- a/src/test/java/com/alibaba/json/bvt/DateFieldTest4.java +++ b/src/test/java/com/alibaba/json/bvt/DateFieldTest4.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DateFieldTest5.java b/src/test/java/com/alibaba/json/bvt/DateFieldTest5.java index 6c1b4e2a1..e19d8bfac 100755 --- a/src/test/java/com/alibaba/json/bvt/DateFieldTest5.java +++ b/src/test/java/com/alibaba/json/bvt/DateFieldTest5.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DateFieldTest6.java b/src/test/java/com/alibaba/json/bvt/DateFieldTest6.java index 6f3324e79..b14c616b5 100755 --- a/src/test/java/com/alibaba/json/bvt/DateFieldTest6.java +++ b/src/test/java/com/alibaba/json/bvt/DateFieldTest6.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DateFieldTest7.java b/src/test/java/com/alibaba/json/bvt/DateFieldTest7.java index 22478b6dd..a57c1add1 100755 --- a/src/test/java/com/alibaba/json/bvt/DateFieldTest7.java +++ b/src/test/java/com/alibaba/json/bvt/DateFieldTest7.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DefaultJSONParserTest.java b/src/test/java/com/alibaba/json/bvt/DefaultJSONParserTest.java index d8220fa07..a4777ff8a 100755 --- a/src/test/java/com/alibaba/json/bvt/DefaultJSONParserTest.java +++ b/src/test/java/com/alibaba/json/bvt/DefaultJSONParserTest.java @@ -17,7 +17,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.DefaultJSONParser; diff --git a/src/test/java/com/alibaba/json/bvt/DoubleArrayFieldTest_primitive.java b/src/test/java/com/alibaba/json/bvt/DoubleArrayFieldTest_primitive.java index 769dcf54b..1171616a7 100755 --- a/src/test/java/com/alibaba/json/bvt/DoubleArrayFieldTest_primitive.java +++ b/src/test/java/com/alibaba/json/bvt/DoubleArrayFieldTest_primitive.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/DoubleFieldTest_A.java b/src/test/java/com/alibaba/json/bvt/DoubleFieldTest_A.java index f8d420224..48d55ecbc 100755 --- a/src/test/java/com/alibaba/json/bvt/DoubleFieldTest_A.java +++ b/src/test/java/com/alibaba/json/bvt/DoubleFieldTest_A.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/EmptyObjectTest.java b/src/test/java/com/alibaba/json/bvt/EmptyObjectTest.java index 7decd7e98..9400ca98a 100755 --- a/src/test/java/com/alibaba/json/bvt/EmptyObjectTest.java +++ b/src/test/java/com/alibaba/json/bvt/EmptyObjectTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/EnumerationTest.java b/src/test/java/com/alibaba/json/bvt/EnumerationTest.java index 6d9fa116c..390812be3 100755 --- a/src/test/java/com/alibaba/json/bvt/EnumerationTest.java +++ b/src/test/java/com/alibaba/json/bvt/EnumerationTest.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.Enumeration; import java.util.Vector; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FeaturesTest.java b/src/test/java/com/alibaba/json/bvt/FeaturesTest.java index 36cd05784..039f2dd02 100755 --- a/src/test/java/com/alibaba/json/bvt/FeaturesTest.java +++ b/src/test/java/com/alibaba/json/bvt/FeaturesTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FeaturesTest2.java b/src/test/java/com/alibaba/json/bvt/FeaturesTest2.java index f9e7e654e..a4d65f263 100755 --- a/src/test/java/com/alibaba/json/bvt/FeaturesTest2.java +++ b/src/test/java/com/alibaba/json/bvt/FeaturesTest2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FeaturesTest3.java b/src/test/java/com/alibaba/json/bvt/FeaturesTest3.java index 8aa9c2094..476cd9586 100755 --- a/src/test/java/com/alibaba/json/bvt/FeaturesTest3.java +++ b/src/test/java/com/alibaba/json/bvt/FeaturesTest3.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FeaturesTest4.java b/src/test/java/com/alibaba/json/bvt/FeaturesTest4.java index 335689744..df06359b1 100755 --- a/src/test/java/com/alibaba/json/bvt/FeaturesTest4.java +++ b/src/test/java/com/alibaba/json/bvt/FeaturesTest4.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FeaturesTest5.java b/src/test/java/com/alibaba/json/bvt/FeaturesTest5.java index 25d41fca9..f169cc8bc 100755 --- a/src/test/java/com/alibaba/json/bvt/FeaturesTest5.java +++ b/src/test/java/com/alibaba/json/bvt/FeaturesTest5.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FeaturesTest6.java b/src/test/java/com/alibaba/json/bvt/FeaturesTest6.java index 4fdd518db..00957355e 100755 --- a/src/test/java/com/alibaba/json/bvt/FeaturesTest6.java +++ b/src/test/java/com/alibaba/json/bvt/FeaturesTest6.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FeaturesTest7.java b/src/test/java/com/alibaba/json/bvt/FeaturesTest7.java index 07de14d2d..917c99a04 100755 --- a/src/test/java/com/alibaba/json/bvt/FeaturesTest7.java +++ b/src/test/java/com/alibaba/json/bvt/FeaturesTest7.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FileFieldTest.java b/src/test/java/com/alibaba/json/bvt/FileFieldTest.java index 131e5db1d..c59f10ab2 100755 --- a/src/test/java/com/alibaba/json/bvt/FileFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/FileFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.io.File; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FloatArrayFieldTest_primitive.java b/src/test/java/com/alibaba/json/bvt/FloatArrayFieldTest_primitive.java index fbdef8665..94cb21367 100755 --- a/src/test/java/com/alibaba/json/bvt/FloatArrayFieldTest_primitive.java +++ b/src/test/java/com/alibaba/json/bvt/FloatArrayFieldTest_primitive.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FloatFieldTest.java b/src/test/java/com/alibaba/json/bvt/FloatFieldTest.java index 1cb97489f..e65516fd5 100755 --- a/src/test/java/com/alibaba/json/bvt/FloatFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/FloatFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FloatFieldTest_A.java b/src/test/java/com/alibaba/json/bvt/FloatFieldTest_A.java index 8df92dfec..59b24c42a 100755 --- a/src/test/java/com/alibaba/json/bvt/FloatFieldTest_A.java +++ b/src/test/java/com/alibaba/json/bvt/FloatFieldTest_A.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FontTest.java b/src/test/java/com/alibaba/json/bvt/FontTest.java index f1e4e55ea..323df4bbb 100755 --- a/src/test/java/com/alibaba/json/bvt/FontTest.java +++ b/src/test/java/com/alibaba/json/bvt/FontTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.awt.Font; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/FontTest2.java b/src/test/java/com/alibaba/json/bvt/FontTest2.java index 130e340b6..fb77f7747 100755 --- a/src/test/java/com/alibaba/json/bvt/FontTest2.java +++ b/src/test/java/com/alibaba/json/bvt/FontTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.awt.Font; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/GroovyTest.java b/src/test/java/com/alibaba/json/bvt/GroovyTest.java index f9c70db5f..2861f2ac7 100755 --- a/src/test/java/com/alibaba/json/bvt/GroovyTest.java +++ b/src/test/java/com/alibaba/json/bvt/GroovyTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyObject; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/InetAddressFieldTest.java b/src/test/java/com/alibaba/json/bvt/InetAddressFieldTest.java index 475eabbf0..7dc6852dd 100755 --- a/src/test/java/com/alibaba/json/bvt/InetAddressFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/InetAddressFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.net.InetAddress; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/InetSocketAddressFieldTest.java b/src/test/java/com/alibaba/json/bvt/InetSocketAddressFieldTest.java index e73ae2078..06fb15b16 100755 --- a/src/test/java/com/alibaba/json/bvt/InetSocketAddressFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/InetSocketAddressFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.net.InetSocketAddress; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/IntArrayFieldTest_primitive.java b/src/test/java/com/alibaba/json/bvt/IntArrayFieldTest_primitive.java index 1bbb2b5c3..59e1d669d 100755 --- a/src/test/java/com/alibaba/json/bvt/IntArrayFieldTest_primitive.java +++ b/src/test/java/com/alibaba/json/bvt/IntArrayFieldTest_primitive.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/IntegerArrayFieldTest.java b/src/test/java/com/alibaba/json/bvt/IntegerArrayFieldTest.java index 2f6d0b4ee..b287a8c5e 100755 --- a/src/test/java/com/alibaba/json/bvt/IntegerArrayFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/IntegerArrayFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONArrayTest.java b/src/test/java/com/alibaba/json/bvt/JSONArrayTest.java index fdd27ba9e..5a05dfe75 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONArrayTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSONArrayTest.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.ListIterator; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONArrayTest2.java b/src/test/java/com/alibaba/json/bvt/JSONArrayTest2.java index b38b3620e..6275af845 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONArrayTest2.java +++ b/src/test/java/com/alibaba/json/bvt/JSONArrayTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.math.BigInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/JSONArrayTest_hashCode.java b/src/test/java/com/alibaba/json/bvt/JSONArrayTest_hashCode.java index 5e5b29e94..e8373bd4a 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONArrayTest_hashCode.java +++ b/src/test/java/com/alibaba/json/bvt/JSONArrayTest_hashCode.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONExceptionTest.java b/src/test/java/com/alibaba/json/bvt/JSONExceptionTest.java index 0017bf175..ced2a856b 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONExceptionTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSONExceptionTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/JSONFromObjectTest.java b/src/test/java/com/alibaba/json/bvt/JSONFromObjectTest.java index 83530a591..10c396e22 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONFromObjectTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSONFromObjectTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONObjectTest.java b/src/test/java/com/alibaba/json/bvt/JSONObjectTest.java index 6dac37843..68d2ccb5c 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONObjectTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSONObjectTest.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONObject; diff --git a/src/test/java/com/alibaba/json/bvt/JSONObjectTest2.java b/src/test/java/com/alibaba/json/bvt/JSONObjectTest2.java index 4424e6dd2..51eb8125e 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONObjectTest2.java +++ b/src/test/java/com/alibaba/json/bvt/JSONObjectTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.LinkedHashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/JSONObjectTest3.java b/src/test/java/com/alibaba/json/bvt/JSONObjectTest3.java index abf957cc5..cfad9757f 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONObjectTest3.java +++ b/src/test/java/com/alibaba/json/bvt/JSONObjectTest3.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONObjectTest_hashCode.java b/src/test/java/com/alibaba/json/bvt/JSONObjectTest_hashCode.java index 0552e0b75..9e466cbc9 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONObjectTest_hashCode.java +++ b/src/test/java/com/alibaba/json/bvt/JSONObjectTest_hashCode.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONTest.java b/src/test/java/com/alibaba/json/bvt/JSONTest.java index bba4cd11a..0a6c7eb40 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSONTest.java @@ -20,7 +20,7 @@ import java.io.StringWriter; import java.math.BigDecimal; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONTest_Bytes.java b/src/test/java/com/alibaba/json/bvt/JSONTest_Bytes.java index 877c6867e..117d590f7 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONTest_Bytes.java +++ b/src/test/java/com/alibaba/json/bvt/JSONTest_Bytes.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONTest_null.java b/src/test/java/com/alibaba/json/bvt/JSONTest_null.java index 28abe97cd..7ed988119 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONTest_null.java +++ b/src/test/java/com/alibaba/json/bvt/JSONTest_null.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.lang.reflect.Type; import java.nio.charset.Charset; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONTest_overflow.java b/src/test/java/com/alibaba/json/bvt/JSONTest_overflow.java index 9542eacb2..7ed5e6644 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONTest_overflow.java +++ b/src/test/java/com/alibaba/json/bvt/JSONTest_overflow.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONTokenTest.java b/src/test/java/com/alibaba/json/bvt/JSONTokenTest.java index c67ade722..6b559c9c0 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONTokenTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSONTokenTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.JSONToken; diff --git a/src/test/java/com/alibaba/json/bvt/JSONTypeTest.java b/src/test/java/com/alibaba/json/bvt/JSONTypeTest.java index 11b0d5f2e..a49aa812f 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONTypeTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSONTypeTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONTypeTest1.java b/src/test/java/com/alibaba/json/bvt/JSONTypeTest1.java index 92dfde866..e201b1c9c 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONTypeTest1.java +++ b/src/test/java/com/alibaba/json/bvt/JSONTypeTest1.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JSONWriterTest.java b/src/test/java/com/alibaba/json/bvt/JSONWriterTest.java index adf8d5808..1fad5129c 100755 --- a/src/test/java/com/alibaba/json/bvt/JSONWriterTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSONWriterTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONWriter; diff --git a/src/test/java/com/alibaba/json/bvt/JSON_toJSONStringTest.java b/src/test/java/com/alibaba/json/bvt/JSON_toJSONStringTest.java index 9925ceda4..f899fe541 100755 --- a/src/test/java/com/alibaba/json/bvt/JSON_toJSONStringTest.java +++ b/src/test/java/com/alibaba/json/bvt/JSON_toJSONStringTest.java @@ -17,7 +17,7 @@ package com.alibaba.json.bvt; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/JSON_toJavaObject_test.java b/src/test/java/com/alibaba/json/bvt/JSON_toJavaObject_test.java index 7f80abc79..8b4e3bf74 100755 --- a/src/test/java/com/alibaba/json/bvt/JSON_toJavaObject_test.java +++ b/src/test/java/com/alibaba/json/bvt/JSON_toJavaObject_test.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JavaBeanTest.java b/src/test/java/com/alibaba/json/bvt/JavaBeanTest.java index 634cd48a4..db7cdcebf 100755 --- a/src/test/java/com/alibaba/json/bvt/JavaBeanTest.java +++ b/src/test/java/com/alibaba/json/bvt/JavaBeanTest.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/JsonValueTest.java b/src/test/java/com/alibaba/json/bvt/JsonValueTest.java index bfc76c47a..4fc31b07f 100755 --- a/src/test/java/com/alibaba/json/bvt/JsonValueTest.java +++ b/src/test/java/com/alibaba/json/bvt/JsonValueTest.java @@ -17,7 +17,7 @@ package com.alibaba.json.bvt; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/LexerTest.java b/src/test/java/com/alibaba/json/bvt/LexerTest.java index ac1ecf8cb..e17f4e42f 100755 --- a/src/test/java/com/alibaba/json/bvt/LexerTest.java +++ b/src/test/java/com/alibaba/json/bvt/LexerTest.java @@ -18,7 +18,7 @@ package com.alibaba.json.bvt; import java.math.BigDecimal; import java.math.BigInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/LinkedListFieldTest.java b/src/test/java/com/alibaba/json/bvt/LinkedListFieldTest.java index 01d6e25f3..b6cd8cc92 100755 --- a/src/test/java/com/alibaba/json/bvt/LinkedListFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/LinkedListFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.LinkedList; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ListFieldTest.java b/src/test/java/com/alibaba/json/bvt/ListFieldTest.java index 7484086b0..edc635846 100755 --- a/src/test/java/com/alibaba/json/bvt/ListFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/ListFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ListFieldTest2.java b/src/test/java/com/alibaba/json/bvt/ListFieldTest2.java index 80fa81ea6..3fa264e8a 100755 --- a/src/test/java/com/alibaba/json/bvt/ListFieldTest2.java +++ b/src/test/java/com/alibaba/json/bvt/ListFieldTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ListFloatFieldTest.java b/src/test/java/com/alibaba/json/bvt/ListFloatFieldTest.java index 52cd65140..302e3326b 100755 --- a/src/test/java/com/alibaba/json/bvt/ListFloatFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/ListFloatFieldTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/LocaleFieldTest.java b/src/test/java/com/alibaba/json/bvt/LocaleFieldTest.java index 8758e783c..ceb578a23 100755 --- a/src/test/java/com/alibaba/json/bvt/LocaleFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/LocaleFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.Locale; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/LongArrayFieldTest.java b/src/test/java/com/alibaba/json/bvt/LongArrayFieldTest.java index ba9efa5d6..4e21abd47 100755 --- a/src/test/java/com/alibaba/json/bvt/LongArrayFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/LongArrayFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/LongArrayFieldTest_primitive.java b/src/test/java/com/alibaba/json/bvt/LongArrayFieldTest_primitive.java index 35b291990..1c60406c7 100755 --- a/src/test/java/com/alibaba/json/bvt/LongArrayFieldTest_primitive.java +++ b/src/test/java/com/alibaba/json/bvt/LongArrayFieldTest_primitive.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/LongFieldTest.java b/src/test/java/com/alibaba/json/bvt/LongFieldTest.java index 56d01105f..43e25a379 100755 --- a/src/test/java/com/alibaba/json/bvt/LongFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/LongFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/LongFieldTest_primitive.java b/src/test/java/com/alibaba/json/bvt/LongFieldTest_primitive.java index 6ec50318d..ed0786e56 100755 --- a/src/test/java/com/alibaba/json/bvt/LongFieldTest_primitive.java +++ b/src/test/java/com/alibaba/json/bvt/LongFieldTest_primitive.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/MapRefTest.java b/src/test/java/com/alibaba/json/bvt/MapRefTest.java index 0731aa6fa..9220f9f36 100755 --- a/src/test/java/com/alibaba/json/bvt/MapRefTest.java +++ b/src/test/java/com/alibaba/json/bvt/MapRefTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/MapRefTest1.java b/src/test/java/com/alibaba/json/bvt/MapRefTest1.java index 6aa38636e..35c23969a 100755 --- a/src/test/java/com/alibaba/json/bvt/MapRefTest1.java +++ b/src/test/java/com/alibaba/json/bvt/MapRefTest1.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/MapRefTest2.java b/src/test/java/com/alibaba/json/bvt/MapRefTest2.java index 79144dcc8..e71cc9d3f 100755 --- a/src/test/java/com/alibaba/json/bvt/MapRefTest2.java +++ b/src/test/java/com/alibaba/json/bvt/MapRefTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/MapRefTest3.java b/src/test/java/com/alibaba/json/bvt/MapRefTest3.java index f101cf79c..3c4ad9b49 100755 --- a/src/test/java/com/alibaba/json/bvt/MapRefTest3.java +++ b/src/test/java/com/alibaba/json/bvt/MapRefTest3.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/MapTest.java b/src/test/java/com/alibaba/json/bvt/MapTest.java index 7e97fcfc4..317d4d492 100755 --- a/src/test/java/com/alibaba/json/bvt/MapTest.java +++ b/src/test/java/com/alibaba/json/bvt/MapTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/MapTest2.java b/src/test/java/com/alibaba/json/bvt/MapTest2.java index 1c5ecea54..152324ade 100755 --- a/src/test/java/com/alibaba/json/bvt/MapTest2.java +++ b/src/test/java/com/alibaba/json/bvt/MapTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/MaterializedInterfaceTest.java b/src/test/java/com/alibaba/json/bvt/MaterializedInterfaceTest.java index 4aa7b0c62..74fecca5a 100755 --- a/src/test/java/com/alibaba/json/bvt/MaterializedInterfaceTest.java +++ b/src/test/java/com/alibaba/json/bvt/MaterializedInterfaceTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/MaterializedInterfaceTest2.java b/src/test/java/com/alibaba/json/bvt/MaterializedInterfaceTest2.java index 42e386931..ee41825d8 100755 --- a/src/test/java/com/alibaba/json/bvt/MaterializedInterfaceTest2.java +++ b/src/test/java/com/alibaba/json/bvt/MaterializedInterfaceTest2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/NotWriteRootClassNameTest.java b/src/test/java/com/alibaba/json/bvt/NotWriteRootClassNameTest.java index 6aeb5f676..1eb1777e9 100755 --- a/src/test/java/com/alibaba/json/bvt/NotWriteRootClassNameTest.java +++ b/src/test/java/com/alibaba/json/bvt/NotWriteRootClassNameTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/json/bvt/NumberFieldTest.java b/src/test/java/com/alibaba/json/bvt/NumberFieldTest.java index a84411fa3..858eff34f 100755 --- a/src/test/java/com/alibaba/json/bvt/NumberFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/NumberFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/OOMTest.java b/src/test/java/com/alibaba/json/bvt/OOMTest.java index 33d300dc1..9c7f36e1b 100755 --- a/src/test/java/com/alibaba/json/bvt/OOMTest.java +++ b/src/test/java/com/alibaba/json/bvt/OOMTest.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.parser.SymbolTable; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class OOMTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/ObjectArrayFieldTest.java b/src/test/java/com/alibaba/json/bvt/ObjectArrayFieldTest.java index 83ebc2121..072fde056 100755 --- a/src/test/java/com/alibaba/json/bvt/ObjectArrayFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/ObjectArrayFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ObjectFieldTest.java b/src/test/java/com/alibaba/json/bvt/ObjectFieldTest.java index edb4a9736..a25dad03b 100755 --- a/src/test/java/com/alibaba/json/bvt/ObjectFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/ObjectFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ParseArrayTest.java b/src/test/java/com/alibaba/json/bvt/ParseArrayTest.java index 38f39cfb7..d0ca75783 100755 --- a/src/test/java/com/alibaba/json/bvt/ParseArrayTest.java +++ b/src/test/java/com/alibaba/json/bvt/ParseArrayTest.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/PatternFieldTest.java b/src/test/java/com/alibaba/json/bvt/PatternFieldTest.java index 5914343f7..d36ab5175 100755 --- a/src/test/java/com/alibaba/json/bvt/PatternFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/PatternFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/PointTest.java b/src/test/java/com/alibaba/json/bvt/PointTest.java index 6e28c8094..78ff5d106 100755 --- a/src/test/java/com/alibaba/json/bvt/PointTest.java +++ b/src/test/java/com/alibaba/json/bvt/PointTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.awt.Point; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/PointTest2.java b/src/test/java/com/alibaba/json/bvt/PointTest2.java index b209521ac..b85a9c962 100755 --- a/src/test/java/com/alibaba/json/bvt/PointTest2.java +++ b/src/test/java/com/alibaba/json/bvt/PointTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.awt.Point; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/PublicFieldDoubleTest.java b/src/test/java/com/alibaba/json/bvt/PublicFieldDoubleTest.java index b6f3b79ad..cc5d12da9 100755 --- a/src/test/java/com/alibaba/json/bvt/PublicFieldDoubleTest.java +++ b/src/test/java/com/alibaba/json/bvt/PublicFieldDoubleTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class PublicFieldDoubleTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/PublicFieldFloatTest.java b/src/test/java/com/alibaba/json/bvt/PublicFieldFloatTest.java index b2695e0a6..9f4905368 100755 --- a/src/test/java/com/alibaba/json/bvt/PublicFieldFloatTest.java +++ b/src/test/java/com/alibaba/json/bvt/PublicFieldFloatTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class PublicFieldFloatTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/PublicFieldLongTest.java b/src/test/java/com/alibaba/json/bvt/PublicFieldLongTest.java index 9ea5d85ec..d3856d376 100755 --- a/src/test/java/com/alibaba/json/bvt/PublicFieldLongTest.java +++ b/src/test/java/com/alibaba/json/bvt/PublicFieldLongTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class PublicFieldLongTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/PublicFieldStringTest.java b/src/test/java/com/alibaba/json/bvt/PublicFieldStringTest.java index e30d4de86..b1fa0cbd3 100755 --- a/src/test/java/com/alibaba/json/bvt/PublicFieldStringTest.java +++ b/src/test/java/com/alibaba/json/bvt/PublicFieldStringTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class PublicFieldStringTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/RectangleTest.java b/src/test/java/com/alibaba/json/bvt/RectangleTest.java index 6a5ed076d..7107f84bc 100755 --- a/src/test/java/com/alibaba/json/bvt/RectangleTest.java +++ b/src/test/java/com/alibaba/json/bvt/RectangleTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.awt.Rectangle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/SerializeWriterTest.java b/src/test/java/com/alibaba/json/bvt/SerializeWriterTest.java index 776b7611a..909d63d21 100755 --- a/src/test/java/com/alibaba/json/bvt/SerializeWriterTest.java +++ b/src/test/java/com/alibaba/json/bvt/SerializeWriterTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/SetFieldTest.java b/src/test/java/com/alibaba/json/bvt/SetFieldTest.java index 682f513b1..ee018eced 100755 --- a/src/test/java/com/alibaba/json/bvt/SetFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/SetFieldTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ShortArrayFieldTest_primitive.java b/src/test/java/com/alibaba/json/bvt/ShortArrayFieldTest_primitive.java index 287fdb12d..356bf2ffd 100755 --- a/src/test/java/com/alibaba/json/bvt/ShortArrayFieldTest_primitive.java +++ b/src/test/java/com/alibaba/json/bvt/ShortArrayFieldTest_primitive.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/SlashTest.java b/src/test/java/com/alibaba/json/bvt/SlashTest.java index 5302285d0..70fd2a594 100755 --- a/src/test/java/com/alibaba/json/bvt/SlashTest.java +++ b/src/test/java/com/alibaba/json/bvt/SlashTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/SpecialKeyTest.java b/src/test/java/com/alibaba/json/bvt/SpecialKeyTest.java index 9b1fc4e54..8744818fb 100755 --- a/src/test/java/com/alibaba/json/bvt/SpecialKeyTest.java +++ b/src/test/java/com/alibaba/json/bvt/SpecialKeyTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/StringDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/StringDeserializerTest.java index f9924823d..31b7f9b7c 100755 --- a/src/test/java/com/alibaba/json/bvt/StringDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/StringDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/StringFieldTest.java b/src/test/java/com/alibaba/json/bvt/StringFieldTest.java index 79e11396f..d9c82e183 100755 --- a/src/test/java/com/alibaba/json/bvt/StringFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/StringFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/SymbolTableTest.java b/src/test/java/com/alibaba/json/bvt/SymbolTableTest.java index 27dd4981a..af38f8b0c 100755 --- a/src/test/java/com/alibaba/json/bvt/SymbolTableTest.java +++ b/src/test/java/com/alibaba/json/bvt/SymbolTableTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.codehaus.jackson.sym.CharsToNameCanonicalizer; diff --git a/src/test/java/com/alibaba/json/bvt/TestExternal3.java b/src/test/java/com/alibaba/json/bvt/TestExternal3.java index b1a373657..27f623951 100755 --- a/src/test/java/com/alibaba/json/bvt/TestExternal3.java +++ b/src/test/java/com/alibaba/json/bvt/TestExternal3.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Method; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.commons.io.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/TestExternal4.java b/src/test/java/com/alibaba/json/bvt/TestExternal4.java index b84a8d4aa..bc4a2fc78 100755 --- a/src/test/java/com/alibaba/json/bvt/TestExternal4.java +++ b/src/test/java/com/alibaba/json/bvt/TestExternal4.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.lang.reflect.Method; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.commons.io.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/TestExternal5.java b/src/test/java/com/alibaba/json/bvt/TestExternal5.java index 95259c687..36301030c 100755 --- a/src/test/java/com/alibaba/json/bvt/TestExternal5.java +++ b/src/test/java/com/alibaba/json/bvt/TestExternal5.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.lang.reflect.Method; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.commons.io.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/TestExternal6.java b/src/test/java/com/alibaba/json/bvt/TestExternal6.java index 4834ae446..9bcd5e7a5 100755 --- a/src/test/java/com/alibaba/json/bvt/TestExternal6.java +++ b/src/test/java/com/alibaba/json/bvt/TestExternal6.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.lang.reflect.Method; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.commons.io.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/TestForEmoji.java b/src/test/java/com/alibaba/json/bvt/TestForEmoji.java index 44db296e1..786ff5385 100755 --- a/src/test/java/com/alibaba/json/bvt/TestForEmoji.java +++ b/src/test/java/com/alibaba/json/bvt/TestForEmoji.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/json/bvt/TestForPascalStyle.java b/src/test/java/com/alibaba/json/bvt/TestForPascalStyle.java index 2b8acd171..0ced5dc38 100755 --- a/src/test/java/com/alibaba/json/bvt/TestForPascalStyle.java +++ b/src/test/java/com/alibaba/json/bvt/TestForPascalStyle.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TestNullKeyMap.java b/src/test/java/com/alibaba/json/bvt/TestNullKeyMap.java index 6b27f94b9..e0375a6bf 100755 --- a/src/test/java/com/alibaba/json/bvt/TestNullKeyMap.java +++ b/src/test/java/com/alibaba/json/bvt/TestNullKeyMap.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TestTimeUnit.java b/src/test/java/com/alibaba/json/bvt/TestTimeUnit.java index 60fc0dda1..35cffd286 100755 --- a/src/test/java/com/alibaba/json/bvt/TestTimeUnit.java +++ b/src/test/java/com/alibaba/json/bvt/TestTimeUnit.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TimeZoneFieldTest.java b/src/test/java/com/alibaba/json/bvt/TimeZoneFieldTest.java index 77dd71cf4..a800b0757 100755 --- a/src/test/java/com/alibaba/json/bvt/TimeZoneFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/TimeZoneFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.TimeZone; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TimestampTest.java b/src/test/java/com/alibaba/json/bvt/TimestampTest.java index 67c72b5f2..2e6f5f9ac 100755 --- a/src/test/java/com/alibaba/json/bvt/TimestampTest.java +++ b/src/test/java/com/alibaba/json/bvt/TimestampTest.java @@ -5,7 +5,7 @@ import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest.java index e2f05b601..360e216ff 100755 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest2.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest2.java index 49d38f993..93d7aca7b 100755 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest2.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest3.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest3.java index 40dcc3f20..5f0aeb81a 100755 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest3.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest3.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest4.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest4.java index 8d7ce15fa..798521481 100755 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest4.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest4.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest5.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest5.java index adc953f05..6399423d5 100755 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest5.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest5.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.LinkedHashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest6.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest6.java index 308bd4794..c78b05475 100644 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest6.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest6.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest7.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest7.java index a4c948bbb..684ad9d16 100644 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest7.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest7.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest8.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest8.java index c2d72a45b..ec40ba283 100644 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest8.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest8.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest9.java b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest9.java index d67f13898..623761f22 100644 --- a/src/test/java/com/alibaba/json/bvt/TypeReferenceTest9.java +++ b/src/test/java/com/alibaba/json/bvt/TypeReferenceTest9.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/URIFieldTest.java b/src/test/java/com/alibaba/json/bvt/URIFieldTest.java index 185059f66..c64e1a866 100755 --- a/src/test/java/com/alibaba/json/bvt/URIFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/URIFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.net.URI; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/URLFieldTest.java b/src/test/java/com/alibaba/json/bvt/URLFieldTest.java index 90776861a..57add6950 100755 --- a/src/test/java/com/alibaba/json/bvt/URLFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/URLFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.net.URL; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/UUIDFieldTest.java b/src/test/java/com/alibaba/json/bvt/UUIDFieldTest.java index 041f4c79b..5b1628bc9 100755 --- a/src/test/java/com/alibaba/json/bvt/UUIDFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/UUIDFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/WriteClassNameTest.java b/src/test/java/com/alibaba/json/bvt/WriteClassNameTest.java index 2a1bb4fa4..dc4dbf3b7 100755 --- a/src/test/java/com/alibaba/json/bvt/WriteClassNameTest.java +++ b/src/test/java/com/alibaba/json/bvt/WriteClassNameTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/WriteClassNameTest2.java b/src/test/java/com/alibaba/json/bvt/WriteClassNameTest2.java index bd16c8eff..297ece8d0 100755 --- a/src/test/java/com/alibaba/json/bvt/WriteClassNameTest2.java +++ b/src/test/java/com/alibaba/json/bvt/WriteClassNameTest2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/annotation/JSONTypejsonType_alphabetic_Test.java b/src/test/java/com/alibaba/json/bvt/annotation/JSONTypejsonType_alphabetic_Test.java index 91808f919..a26db3859 100755 --- a/src/test/java/com/alibaba/json/bvt/annotation/JSONTypejsonType_alphabetic_Test.java +++ b/src/test/java/com/alibaba/json/bvt/annotation/JSONTypejsonType_alphabetic_Test.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.annotation; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/asm/ASMDeserTest.java b/src/test/java/com/alibaba/json/bvt/asm/ASMDeserTest.java index 7f08ff480..29aa78a4b 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/ASMDeserTest.java +++ b/src/test/java/com/alibaba/json/bvt/asm/ASMDeserTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.asm; import java.util.ArrayList; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/asm/ASMDeserTest2.java b/src/test/java/com/alibaba/json/bvt/asm/ASMDeserTest2.java index ffbb4b6f6..2338f8969 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/ASMDeserTest2.java +++ b/src/test/java/com/alibaba/json/bvt/asm/ASMDeserTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.asm; import java.util.ArrayList; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/asm/ASMUtilsTest.java b/src/test/java/com/alibaba/json/bvt/asm/ASMUtilsTest.java index 1be23b76e..90681cbdc 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/ASMUtilsTest.java +++ b/src/test/java/com/alibaba/json/bvt/asm/ASMUtilsTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.asm; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.ParseContext; diff --git a/src/test/java/com/alibaba/json/bvt/asm/Case0.java b/src/test/java/com/alibaba/json/bvt/asm/Case0.java index 1fccca38e..a0a5f23d4 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/Case0.java +++ b/src/test/java/com/alibaba/json/bvt/asm/Case0.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.asm; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/asm/JSONASMUtilTest.java b/src/test/java/com/alibaba/json/bvt/asm/JSONASMUtilTest.java index 84c5f21b1..145d3d89c 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/JSONASMUtilTest.java +++ b/src/test/java/com/alibaba/json/bvt/asm/JSONASMUtilTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.asm; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.util.ASMUtils; diff --git a/src/test/java/com/alibaba/json/bvt/asm/LoopTest.java b/src/test/java/com/alibaba/json/bvt/asm/LoopTest.java index 671f25987..7f8f4cad4 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/LoopTest.java +++ b/src/test/java/com/alibaba/json/bvt/asm/LoopTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.asm; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/asm/SortFieldTest.java b/src/test/java/com/alibaba/json/bvt/asm/SortFieldTest.java index 926ddd8be..9862b99b9 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/SortFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/asm/SortFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.asm; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/asm/TestList.java b/src/test/java/com/alibaba/json/bvt/asm/TestList.java index 9e7a7a298..3bb094b13 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/TestList.java +++ b/src/test/java/com/alibaba/json/bvt/asm/TestList.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/asm/TestNonASM.java b/src/test/java/com/alibaba/json/bvt/asm/TestNonASM.java index 6dc3e9acb..395f1ca59 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/TestNonASM.java +++ b/src/test/java/com/alibaba/json/bvt/asm/TestNonASM.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.asm; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.ParserConfig; diff --git a/src/test/java/com/alibaba/json/bvt/asm/TestType.java b/src/test/java/com/alibaba/json/bvt/asm/TestType.java index 66529d660..2e5715e36 100755 --- a/src/test/java/com/alibaba/json/bvt/asm/TestType.java +++ b/src/test/java/com/alibaba/json/bvt/asm/TestType.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.asm; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.asm.Type; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug2.java b/src/test/java/com/alibaba/json/bvt/bug/Bug2.java index 3a535f054..8740c54f2 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug2.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug2.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_101_for_rongganlin_case2.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_101_for_rongganlin_case2.java index a37afbf13..43254d0c9 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_101_for_rongganlin_case2.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_101_for_rongganlin_case2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_101_for_rongganlin_case3.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_101_for_rongganlin_case3.java index 28cf3c6dd..bee4529a8 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_101_for_rongganlin_case3.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_101_for_rongganlin_case3.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_8.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_8.java index adffef888..4d83c1417 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_8.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_8.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_80108116.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_80108116.java index 88c1818ce..35474ad88 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_80108116.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_80108116.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_ArrayMember.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_ArrayMember.java index 30fb773df..ce80bbd7d 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_ArrayMember.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_ArrayMember.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class Bug_for_ArrayMember extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_Johnny.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_Johnny.java index 1e351714c..798ee8b61 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_Johnny.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_Johnny.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_agapple_2.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_agapple_2.java index e6dcc38af..e9af77494 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_agapple_2.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_agapple_2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_ascii_0_31.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_ascii_0_31.java index 5ee148d0a..795a96294 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_ascii_0_31.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_ascii_0_31.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_bbl.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_bbl.java index e57e0cf61..d74d14b03 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_bbl.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_bbl.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_cduym.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_cduym.java index 650124f69..84d66033f 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_cduym.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_cduym.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_cnhans.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_cnhans.java index f06b50be6..a15131256 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_cnhans.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_cnhans.java @@ -4,7 +4,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo.java index ce83e4f36..5e2eff136 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo1.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo1.java index c69689fa3..9dc0c7247 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo1.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo1.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo3.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo3.java index 9cab0aa8a..6678eaf7d 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo3.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo3.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo_long.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo_long.java index 40823b49c..8912bba33 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo_long.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_dubbo_long.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_franklee77.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_franklee77.java index 8a51c660a..991d93c8e 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_franklee77.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_franklee77.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jiangwei1.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jiangwei1.java index 9227586e5..ad78d95ab 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jiangwei1.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jiangwei1.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinghui70.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinghui70.java index eaa0ab67d..7129a9fb8 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinghui70.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinghui70.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinguwei.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinguwei.java index dfc7d8844..489b90d1a 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinguwei.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinguwei.java @@ -5,7 +5,7 @@ import java.util.List; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class Bug_for_jinguwei extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix.java index ac6c92dd4..8c8ef85e9 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_10.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_10.java index 596647533..20dddf510 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_10.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_10.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_11.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_11.java index 693a8b885..8d58f8011 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_11.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_11.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import java.text.SimpleDateFormat; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_9.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_9.java index ed5204913..3d0e910ee 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_9.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_lenolix_9.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_leupom_2.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_leupom_2.java index d2d0829e9..128275277 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_leupom_2.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_leupom_2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_leupom_3.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_leupom_3.java index c45ae941c..84ef326f5 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_leupom_3.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_leupom_3.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import java.io.Serializable; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_melin.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_melin.java index b5d653c8b..91e7b30a4 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_melin.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_melin.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_rendong.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_rendong.java index 0af412b17..8d7ae81b9 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_rendong.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_rendong.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat.java index c288693f7..014031a7a 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat2.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat2.java index 728c59181..9e32e2e04 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat2.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat3.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat3.java index 293fa4c53..c69d89e64 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat3.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat3.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat4.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat4.java index 8ddb30b84..a1cdcc9f6 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat4.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat4.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat5.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat5.java index 42c5eef8c..d07c45636 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat5.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat5.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat6.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat6.java index 9f1382ede..f299fe58c 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat6.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat6.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat7.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat7.java index c7258e1f2..316ba1a9a 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat7.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat7.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat8.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat8.java index 99acd4212..ac829a3e0 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat8.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat8.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat9.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat9.java index cd5c6c464..6cf9d9f46 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat9.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_smoothrat9.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_stv_liu.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_stv_liu.java index 58c2e00fc..27e65b529 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_stv_liu.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_stv_liu.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import java.io.Serializable; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran.java index e018733ec..ed42ee709 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.io.InputStream; import java.io.InputStreamReader; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.commons.io.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran1.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran1.java index acad237d4..046848acc 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran1.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran1.java @@ -5,7 +5,7 @@ import java.util.Map; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class Bug_for_wangran1 extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran2.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran2.java index 0ca6d58b1..b72b743e9 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran2.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wangran2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wuyexiong.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wuyexiong.java index b957fd6fe..16c256bd2 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wuyexiong.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wuyexiong.java @@ -5,7 +5,7 @@ import java.io.InputStream; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.util.IOUtils; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class Bug_for_wuyexiong extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wuzhengmao.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wuzhengmao.java index c6a157686..bdca031a2 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wuzhengmao.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_wuzhengmao.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_xiayucai2012.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_xiayucai2012.java index 4ae2988e9..06ccc35a0 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_xiayucai2012.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_xiayucai2012.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.bug; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_yannywang.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_yannywang.java index 3434d9146..011858aef 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_yannywang.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_yannywang.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import java.io.InputStream; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.commons.io.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_zhaoyao.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_zhaoyao.java index 56c8d6d12..ab5a38d5b 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_zhaoyao.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_zhaoyao.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.bug; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_zhuel.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_zhuel.java index f2e246ec9..58660e40a 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_zhuel.java +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_zhuel.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/bug/StackTraceElementTest.java b/src/test/java/com/alibaba/json/bvt/bug/StackTraceElementTest.java index f3d397577..30ed21631 100755 --- a/src/test/java/com/alibaba/json/bvt/bug/StackTraceElementTest.java +++ b/src/test/java/com/alibaba/json/bvt/bug/StackTraceElementTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/cglib/TestCglib.java b/src/test/java/com/alibaba/json/bvt/cglib/TestCglib.java index 6878dc207..127f3fc75 100755 --- a/src/test/java/com/alibaba/json/bvt/cglib/TestCglib.java +++ b/src/test/java/com/alibaba/json/bvt/cglib/TestCglib.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.cglib; import java.lang.reflect.Method; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.MethodInterceptor; diff --git a/src/test/java/com/alibaba/json/bvt/compatible/jsonlib/CompatibleTest0.java b/src/test/java/com/alibaba/json/bvt/compatible/jsonlib/CompatibleTest0.java index b1c471e05..a3a26f0b6 100755 --- a/src/test/java/com/alibaba/json/bvt/compatible/jsonlib/CompatibleTest0.java +++ b/src/test/java/com/alibaba/json/bvt/compatible/jsonlib/CompatibleTest0.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/compatible/jsonlib/CompatibleTest_noasm.java b/src/test/java/com/alibaba/json/bvt/compatible/jsonlib/CompatibleTest_noasm.java index 406e47296..e4c0b72ff 100755 --- a/src/test/java/com/alibaba/json/bvt/compatible/jsonlib/CompatibleTest_noasm.java +++ b/src/test/java/com/alibaba/json/bvt/compatible/jsonlib/CompatibleTest_noasm.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/dubbo/TestForDubbo.java b/src/test/java/com/alibaba/json/bvt/dubbo/TestForDubbo.java index 7cb896f4d..70a26d342 100755 --- a/src/test/java/com/alibaba/json/bvt/dubbo/TestForDubbo.java +++ b/src/test/java/com/alibaba/json/bvt/dubbo/TestForDubbo.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.dubbo; import java.util.ArrayList; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/fullSer/LongTest.java b/src/test/java/com/alibaba/json/bvt/fullSer/LongTest.java index f5b68d364..75a403467 100755 --- a/src/test/java/com/alibaba/json/bvt/fullSer/LongTest.java +++ b/src/test/java/com/alibaba/json/bvt/fullSer/LongTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.fullSer; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class LongTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/parser/AsmParserTest0.java b/src/test/java/com/alibaba/json/bvt/parser/AsmParserTest0.java index 9ef6261b5..6e01e79ad 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/AsmParserTest0.java +++ b/src/test/java/com/alibaba/json/bvt/parser/AsmParserTest0.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/AsmParserTest1.java b/src/test/java/com/alibaba/json/bvt/parser/AsmParserTest1.java index 3b0e8d33b..e30b37054 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/AsmParserTest1.java +++ b/src/test/java/com/alibaba/json/bvt/parser/AsmParserTest1.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/ClassTest.java b/src/test/java/com/alibaba/json/bvt/parser/ClassTest.java index f926f3fce..eebbce77f 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/ClassTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/ClassTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class ClassTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest.java b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest.java index 78b7cfe7e..6fb8def18 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql.java b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql.java index eaf8a79bd..1161ce693 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql_timestamp.java b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql_timestamp.java index 153922542..86edf0320 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql_timestamp.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql_timestamp.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DateTest.java b/src/test/java/com/alibaba/json/bvt/parser/DateTest.java index 16cc6fb38..85f37a1ea 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DateTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DateTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest.java index 93dd3d050..918287b16 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest.java @@ -38,7 +38,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_0.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_0.java index edb6ea896..0cce85599 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_0.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_0.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.math.BigDecimal; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_1.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_1.java index ab24c63fd..964b5456e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_1.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_1.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.math.BigDecimal; import java.math.BigInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_2.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_2.java index 49235099c..22eaed0c9 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_2.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_3.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_3.java index a3323526b..bf8d9692e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_3.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_3.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_4.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_4.java index 86efba832..275008df1 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_4.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_4.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONObject; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_5.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_5.java index 74898508f..30453c973 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_5.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_5.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.DefaultExtJSONParser; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_6.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_6.java index daececb1b..32aacaefb 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_6.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_6.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.DefaultExtJSONParser; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray.java index a67c7720d..c7ab4b846 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONObject; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray_2.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray_2.java index f3d91f847..660238f16 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray_2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray_2.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.TypeReference; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest2.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest2.java index c3c76a815..045cf0db3 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_charArray.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_charArray.java index ec7676727..9182de1f7 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_charArray.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_charArray.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.DefaultJSONParser; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_comma.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_comma.java index b392877b0..4b4aa7837 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_comma.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_comma.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_date.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_date.java index a64b470e6..a0626dbdd 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_date.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_date.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONObject; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_error.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_error.java index d6013b284..f62cf8425 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_error.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultJSONParserTest_error.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/EnumParserTest.java b/src/test/java/com/alibaba/json/bvt/parser/EnumParserTest.java index 14824a2c2..6df0249aa 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/EnumParserTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/EnumParserTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.DefaultExtJSONParser; diff --git a/src/test/java/com/alibaba/json/bvt/parser/FastMatchCheckTest.java b/src/test/java/com/alibaba/json/bvt/parser/FastMatchCheckTest.java index 175bc200a..0ae3883f8 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/FastMatchCheckTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/FastMatchCheckTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.JSONToken; diff --git a/src/test/java/com/alibaba/json/bvt/parser/FeatureParserTest.java b/src/test/java/com/alibaba/json/bvt/parser/FeatureParserTest.java index 69a1980dd..0aa36f7bc 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/FeatureParserTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/FeatureParserTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/FeatureTest.java b/src/test/java/com/alibaba/json/bvt/parser/FeatureTest.java index 4ddc9aeb9..b659f4459 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/FeatureTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/FeatureTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.CharTypes; diff --git a/src/test/java/com/alibaba/json/bvt/parser/GenericTest.java b/src/test/java/com/alibaba/json/bvt/parser/GenericTest.java index fc93356f5..87edab4ec 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/GenericTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/GenericTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/IOUtilsTest.java b/src/test/java/com/alibaba/json/bvt/parser/IOUtilsTest.java index c33235db7..f9cdff78a 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/IOUtilsTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/IOUtilsTest.java @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CoderResult; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.util.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/parser/InetSocketAddressTest.java b/src/test/java/com/alibaba/json/bvt/parser/InetSocketAddressTest.java index ed23bc9a1..c35714b1c 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/InetSocketAddressTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/InetSocketAddressTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.net.InetSocketAddress; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONArrayParseTest.java b/src/test/java/com/alibaba/json/bvt/parser/JSONArrayParseTest.java index 53fd8e682..b451ada56 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONArrayParseTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONArrayParseTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONCreatorFactoryTest.java b/src/test/java/com/alibaba/json/bvt/parser/JSONCreatorFactoryTest.java index a2c294017..9342aa85a 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONCreatorFactoryTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONCreatorFactoryTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONCreatorTest.java b/src/test/java/com/alibaba/json/bvt/parser/JSONCreatorTest.java index 84b8b9b08..cf2ac7069 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONCreatorTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONCreatorTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_boolean.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_boolean.java index a2aa4ab16..809ac6762 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_boolean.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_boolean.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_double.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_double.java index 167b55013..ebba9064b 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_double.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_double.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_enum.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_enum.java index c546cd2dd..74f8533a2 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_enum.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_enum.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_float.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_float.java index 0ba284c57..0aa64e6ae 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_float.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_float.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_int.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_int.java index 0f95eea27..32b812fef 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_int.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_int.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_long.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_long.java index bf1dcf8e9..868592756 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_long.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_long.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_string.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_string.java index 90160c592..d732f54ba 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_string.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_string.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_stringList.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_stringList.java index 705c2eedf..50b95127e 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_stringList.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_stringList.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__map_string.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__map_string.java index 6f311d6a4..c518cf066 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__map_string.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__map_string.java @@ -3,9 +3,10 @@ package com.alibaba.json.bvt.parser; import java.io.Reader; import java.io.StringReader; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONReaderScanner; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_array_string.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_array_string.java index 33a0fea09..d3f25c835 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_array_string.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_array_string.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.io.Reader; import java.io.StringReader; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_decimal.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_decimal.java index ec8bbf82e..af464a154 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_decimal.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_decimal.java @@ -4,7 +4,7 @@ import java.io.Reader; import java.io.StringReader; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_int.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_int.java index 7fad9bb20..56fc8c5f1 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_int.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_int.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.io.Reader; import java.io.StringReader; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_long.java b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_long.java index 3d913242e..c5feb755a 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_long.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest_long.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.io.Reader; import java.io.StringReader; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONArray; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_ISO8601.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_ISO8601.java index 0e3894746..544508323 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_ISO8601.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_ISO8601.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.Feature; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest__nextToken.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest__nextToken.java index 77ccc45d8..9a91e77ae 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest__nextToken.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest__nextToken.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.JSONScanner; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest__x.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest__x.java index d28830f55..7f6c46c47 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest__x.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest__x.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_colon.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_colon.java index c18891efd..25780645f 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_colon.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_colon.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_false.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_false.java index 03a4cb878..e5c4b1919 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_false.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_false.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_ident.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_ident.java index 33c2a830e..f10578ac1 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_ident.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_ident.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.JSONScanner; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_int.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_int.java index 1e5dc55ed..39c3ac294 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_int.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_int.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.JSONScanner; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_isEOF.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_isEOF.java index a69bb3d47..3c7650e8d 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_isEOF.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_isEOF.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_long.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_long.java index 1c328414c..d18a6bb53 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_long.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_long.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.JSONScanner; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_new.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_new.java index 23d33e814..9c6c0567f 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_new.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_new.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_null.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_null.java index e0b841a2b..4b76da914 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_null.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_null.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldBoolean.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldBoolean.java index bf5a9dc4b..f882fcde4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldBoolean.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldBoolean.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldBoolean_unquote.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldBoolean_unquote.java index 52ee5af88..e7a749499 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldBoolean_unquote.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldBoolean_unquote.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldDouble.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldDouble.java index 6da2b9589..0350d8255 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldDouble.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldDouble.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldFloat.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldFloat.java index 8a2b1d3c5..875856961 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldFloat.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldFloat.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldInt.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldInt.java index d37b7af4c..0ed277597 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldInt.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldInt.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldLong.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldLong.java index 95bb90e5a..9ed14f8f8 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldLong.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldLong.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldString.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldString.java index dd9ed029a..79f173ab4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldString.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldString.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldStringArray.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldStringArray.java index 00c0dcf67..18661162b 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldStringArray.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldStringArray.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldString_error.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldString_error.java index d0132a6e2..bd3bb187b 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldString_error.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldString_error.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanSymbol.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanSymbol.java index e8b072387..a1dcb7be5 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanSymbol.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanSymbol.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.parser.JSONScanner; 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 index 4c6592718..ea827edad 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_singQuoteString.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_singQuoteString.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_symbol.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_symbol.java index 2e8bcb934..47fe12ce4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_symbol.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_symbol.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_true.java b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_true.java index 0ed55a7a2..8a991dcdb 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_true.java +++ b/src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_true.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/NullCheckTest.java b/src/test/java/com/alibaba/json/bvt/parser/NullCheckTest.java index 6a3aabc63..ce47f098e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/NullCheckTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/NullCheckTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/ParseRestTest.java b/src/test/java/com/alibaba/json/bvt/parser/ParseRestTest.java index 3377b3fce..a419c4553 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/ParseRestTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/ParseRestTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest.java b/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest.java new file mode 100644 index 000000000..1c76057be --- /dev/null +++ b/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest.java @@ -0,0 +1,95 @@ +package com.alibaba.json.bvt.parser; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.fastjson.JSON; + +public class ParserSpecialCharTest extends TestCase { + + public void test_0() throws Exception { + Assert.assertEquals("\0", JSON.parseObject("{\"value\":\"\\0\"}", VO.class).getValue()); + } + + public void test_1() throws Exception { + Assert.assertEquals("\1", JSON.parseObject("{\"value\":\"\\1\"}", VO.class).getValue()); + } + + public void test_2() throws Exception { + Assert.assertEquals("\2", JSON.parseObject("{\"value\":\"\\2\"}", VO.class).getValue()); + } + + public void test_3() throws Exception { + Assert.assertEquals("\3", JSON.parseObject("{\"value\":\"\\3\"}", VO.class).getValue()); + } + + public void test_4() throws Exception { + Assert.assertEquals("\4", JSON.parseObject("{\"value\":\"\\4\"}", VO.class).getValue()); + } + + public void test_5() throws Exception { + Assert.assertEquals("\5", JSON.parseObject("{\"value\":\"\\5\"}", VO.class).getValue()); + } + + public void test_6() throws Exception { + Assert.assertEquals("\6", JSON.parseObject("{\"value\":\"\\6\"}", VO.class).getValue()); + } + + public void test_7() throws Exception { + Assert.assertEquals("\7", JSON.parseObject("{\"value\":\"\\7\"}", VO.class).getValue()); + } + + public void test_8() throws Exception { + Assert.assertEquals("\b", JSON.parseObject("{\"value\":\"\\b\"}", VO.class).getValue()); + } + + public void test_9() throws Exception { + Assert.assertEquals("\t", JSON.parseObject("{\"value\":\"\\t\"}", VO.class).getValue()); + } + + public void test_10() throws Exception { + Assert.assertEquals("\n", JSON.parseObject("{\"value\":\"\\n\"}", VO.class).getValue()); + } + + public void test_11() throws Exception { + Assert.assertEquals("\u000B", JSON.parseObject("{\"value\":\"\\v\"}", VO.class).getValue()); + } + + public void test_12() throws Exception { + Assert.assertEquals("\f", JSON.parseObject("{\"value\":\"\\f\"}", VO.class).getValue()); + } + + public void test_13() throws Exception { + Assert.assertEquals("\r", JSON.parseObject("{\"value\":\"\\r\"}", VO.class).getValue()); + } + + public void test_34() throws Exception { + Assert.assertEquals("\"", JSON.parseObject("{\"value\":\"\\\"\"}", VO.class).getValue()); + } + + public void test_39() throws Exception { + Assert.assertEquals("'", JSON.parseObject("{\"value\":\"\\'\"}", VO.class).getValue()); + } + + public void test_47() throws Exception { + Assert.assertEquals("/", JSON.parseObject("{\"value\":\"\\/\"}", VO.class).getValue()); + } + + public void test_92() throws Exception { + Assert.assertEquals("\\", JSON.parseObject("{\"value\":\"\\\\\"}", VO.class).getValue()); + } + public static class VO { + + private String value; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + } +} diff --git a/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest_map.java b/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest_map.java new file mode 100644 index 000000000..4ec657746 --- /dev/null +++ b/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest_map.java @@ -0,0 +1,82 @@ +package com.alibaba.json.bvt.parser; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.fastjson.JSON; + +public class ParserSpecialCharTest_map extends TestCase { + + public void test_0() throws Exception { + Assert.assertEquals("\0", JSON.parseObject("{'value':'\\0'}").getString("value")); + } + + public void test_1() throws Exception { + Assert.assertEquals("\1", JSON.parseObject("{'value':'\\1'}").getString("value")); + } + + public void test_2() throws Exception { + Assert.assertEquals("\2", JSON.parseObject("{'value':'\\2'}").getString("value")); + } + + public void test_3() throws Exception { + Assert.assertEquals("\3", JSON.parseObject("{'value':'\\3'}").getString("value")); + } + + public void test_4() throws Exception { + Assert.assertEquals("\4", JSON.parseObject("{'value':'\\4'}").getString("value")); + } + + public void test_5() throws Exception { + Assert.assertEquals("\5", JSON.parseObject("{'value':'\\5'}").getString("value")); + } + + public void test_6() throws Exception { + Assert.assertEquals("\6", JSON.parseObject("{'value':'\\6'}").getString("value")); + } + + public void test_7() throws Exception { + Assert.assertEquals("\7", JSON.parseObject("{'value':'\\7'}").getString("value")); + } + + public void test_8() throws Exception { + Assert.assertEquals("\b", JSON.parseObject("{'value':'\\b'}").getString("value")); + } + + public void test_9() throws Exception { + Assert.assertEquals("\t", JSON.parseObject("{'value':'\\t'}").getString("value")); + } + + public void test_10() throws Exception { + Assert.assertEquals("\n", JSON.parseObject("{'value':'\\n'}").getString("value")); + } + + public void test_11() throws Exception { + Assert.assertEquals("\u000B", JSON.parseObject("{'value':'\\v'}").getString("value")); + } + + public void test_12() throws Exception { + Assert.assertEquals("\f", JSON.parseObject("{'value':'\\f'}").getString("value")); + } + + public void test_13() throws Exception { + Assert.assertEquals("\r", JSON.parseObject("{'value':'\\r'}").getString("value")); + } + + public void test_34() throws Exception { + Assert.assertEquals("\"", JSON.parseObject("{'value':'\\\"'}").getString("value")); + } + + public void test_39() throws Exception { + Assert.assertEquals("'", JSON.parseObject("{'value':'\\''}").getString("value")); + } + + public void test_47() throws Exception { + Assert.assertEquals("/", JSON.parseObject("{'value':'\\/'}").getString("value")); + } + + public void test_92() throws Exception { + Assert.assertEquals("\\", JSON.parseObject("{'value':'\\\\'}").getString("value")); + } +} diff --git a/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest_map_singleQuote.java b/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest_map_singleQuote.java new file mode 100644 index 000000000..d06678555 --- /dev/null +++ b/src/test/java/com/alibaba/json/bvt/parser/ParserSpecialCharTest_map_singleQuote.java @@ -0,0 +1,82 @@ +package com.alibaba.json.bvt.parser; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.fastjson.JSON; + +public class ParserSpecialCharTest_map_singleQuote extends TestCase { + + public void test_0() throws Exception { + Assert.assertEquals("\0", JSON.parseObject("{\"value\":\"\\0\"}").getString("value")); + } + + public void test_1() throws Exception { + Assert.assertEquals("\1", JSON.parseObject("{\"value\":\"\\1\"}").getString("value")); + } + + public void test_2() throws Exception { + Assert.assertEquals("\2", JSON.parseObject("{\"value\":\"\\2\"}").getString("value")); + } + + public void test_3() throws Exception { + Assert.assertEquals("\3", JSON.parseObject("{\"value\":\"\\3\"}").getString("value")); + } + + public void test_4() throws Exception { + Assert.assertEquals("\4", JSON.parseObject("{\"value\":\"\\4\"}").getString("value")); + } + + public void test_5() throws Exception { + Assert.assertEquals("\5", JSON.parseObject("{\"value\":\"\\5\"}").getString("value")); + } + + public void test_6() throws Exception { + Assert.assertEquals("\6", JSON.parseObject("{\"value\":\"\\6\"}").getString("value")); + } + + public void test_7() throws Exception { + Assert.assertEquals("\7", JSON.parseObject("{\"value\":\"\\7\"}").getString("value")); + } + + public void test_8() throws Exception { + Assert.assertEquals("\b", JSON.parseObject("{\"value\":\"\\b\"}").getString("value")); + } + + public void test_9() throws Exception { + Assert.assertEquals("\t", JSON.parseObject("{\"value\":\"\\t\"}").getString("value")); + } + + public void test_10() throws Exception { + Assert.assertEquals("\n", JSON.parseObject("{\"value\":\"\\n\"}").getString("value")); + } + + public void test_11() throws Exception { + Assert.assertEquals("\u000B", JSON.parseObject("{\"value\":\"\\v\"}").getString("value")); + } + + public void test_12() throws Exception { + Assert.assertEquals("\f", JSON.parseObject("{\"value\":\"\\f\"}").getString("value")); + } + + public void test_13() throws Exception { + Assert.assertEquals("\r", JSON.parseObject("{\"value\":\"\\r\"}").getString("value")); + } + + public void test_34() throws Exception { + Assert.assertEquals("\"", JSON.parseObject("{\"value\":\"\\\"\"}").getString("value")); + } + + public void test_39() throws Exception { + Assert.assertEquals("'", JSON.parseObject("{\"value\":\"\\'\"}").getString("value")); + } + + public void test_47() throws Exception { + Assert.assertEquals("/", JSON.parseObject("{\"value\":\"\\/\"}").getString("value")); + } + + public void test_92() throws Exception { + Assert.assertEquals("\\", JSON.parseObject("{\"value\":\"\\\\\"}").getString("value")); + } +} diff --git a/src/test/java/com/alibaba/json/bvt/parser/TestInitStringFieldAsEmpty.java b/src/test/java/com/alibaba/json/bvt/parser/TestInitStringFieldAsEmpty.java index e867c4808..37bc78b43 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TestInitStringFieldAsEmpty.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TestInitStringFieldAsEmpty.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TestInitStringFieldAsEmpty2.java b/src/test/java/com/alibaba/json/bvt/parser/TestInitStringFieldAsEmpty2.java index 6aabc8a0f..1fa3f6843 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TestInitStringFieldAsEmpty2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TestInitStringFieldAsEmpty2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TestUTF8.java b/src/test/java/com/alibaba/json/bvt/parser/TestUTF8.java index e4b54c27a..b53725dd2 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TestUTF8.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TestUTF8.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_2.java b/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_2.java index cf1998e8d..7dd46fa51 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_3.java b/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_3.java index 18b654a04..8dd263ee4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_3.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_3.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.util.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_4.java b/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_4.java index 7aa1a3e74..c567d7662 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_4.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TestUTF8_4.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.util.IOUtils; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TypeReferenceTest.java b/src/test/java/com/alibaba/json/bvt/parser/TypeReferenceTest.java index 4bc74484c..26333e089 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TypeReferenceTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TypeReferenceTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest2.java b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest2.java index 288f228aa..7e70b3f90 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser; import java.lang.reflect.ParameterizedType; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest3.java b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest3.java index 0a4f49efb..4caf7e88d 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest3.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest3.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest4.java b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest4.java index 2cef189ae..a69db06d4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest4.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsTest4.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsToJSONTest.java b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsToJSONTest.java index 2354ffb9b..da3f22f78 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsToJSONTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/TypeUtilsToJSONTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/bug/Bug0.java b/src/test/java/com/alibaba/json/bvt/parser/bug/Bug0.java index 05aa8cf9a..7e64b1b47 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/bug/Bug0.java +++ b/src/test/java/com/alibaba/json/bvt/parser/bug/Bug0.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.bug; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/bug/Bug2.java b/src/test/java/com/alibaba/json/bvt/parser/bug/Bug2.java index 1ddbea017..18126b3f6 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/bug/Bug2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/bug/Bug2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.bug; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayDeserializerTest.java index 393d358bb..58d6a2a16 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayLisMapDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayLisMapDeserializerTest.java index c534a536f..4fcf90011 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayLisMapDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayLisMapDeserializerTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListEnumFieldDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListEnumFieldDeserializerTest.java index 12d816c2e..ac9158e9e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListEnumFieldDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListEnumFieldDeserializerTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java index 26c925f4b..a3e4303c7 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java @@ -4,7 +4,7 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListTypeDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListTypeDeserializerTest.java index 9c12e4ef2..2acd8c1c7 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListTypeDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListTypeDeserializerTest.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListTypeFieldTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListTypeFieldTest.java index 2c426ab38..43a69f14a 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListTypeFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListTypeFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.ArrayList; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalDeserializerTest.java index 4183ef2e3..1d2f6e725 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalTest.java index 068d63904..82438da02 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/BigIntegerDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/BigIntegerDeserializerTest.java index f7e36552d..919f3de8e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/BigIntegerDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/BigIntegerDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.math.BigInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/BooleanDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/BooleanDeserializerTest.java index 63a1f8b92..4c656db5e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/BooleanDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/BooleanDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/BooleanFieldDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/BooleanFieldDeserializerTest.java index 2a4fc61ed..61bf2dab4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/BooleanFieldDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/BooleanFieldDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/CharArrayDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/CharArrayDeserializerTest.java index 4898c4f40..917104c53 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/CharArrayDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/CharArrayDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class CharArrayDeserializerTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ClassTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ClassTest.java index 09de9968e..5c9ccefbe 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ClassTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ClassTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/CollectionDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/CollectionDeserializerTest.java index 91b232771..61c68f2ca 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/CollectionDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/CollectionDeserializerTest.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.Vector; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/CollectionFieldTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/CollectionFieldTest.java index bb05e88ab..d79df1712 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/CollectionFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/CollectionFieldTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ColorDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ColorDeserializerTest.java index 0f54feda2..39f0ad277 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ColorDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ColorDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.awt.Color; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ConcurrentHashMapDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ConcurrentHashMapDeserializerTest.java index 0fa36c6b0..8c970f1b6 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ConcurrentHashMapDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ConcurrentHashMapDeserializerTest.java @@ -4,7 +4,7 @@ import java.util.IdentityHashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateDeserializerTest.java index 068716b2f..6a9d5ef66 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest1.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest1.java index d6bf73b33..0d5ba1b75 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest1.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest1.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest2.java index 2cd58717a..8092d2b9c 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest3.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest3.java index 85c1d0f60..379a2aa39 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest3.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest3.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest4.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest4.java index e8885a146..4d88ca677 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest4.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest4.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest5.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest5.java index ac5a20ab4..b09e83906 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest5.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest5.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest6.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest6.java index 23a2b0cf1..c641726b0 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest6.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest6.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest7.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest7.java index 591c0cab4..6ead5e31d 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest7.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest7.java @@ -4,7 +4,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest8.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest8.java index 86b9f1255..36834fcb0 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest8.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest8.java @@ -4,7 +4,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest9.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest9.java index 7d9725d0b..2bab673d7 100644 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest9.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DateParseTest9.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest.java index d1d71b25b..e0622d576 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest1.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest1.java index 3fa54d5f4..95e4ea48e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest1.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest1.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest2.java index aba0b9c20..582b37b6e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest2.java @@ -7,7 +7,7 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest_collection.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest_collection.java index d9b5848a5..e20edec67 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest_collection.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest_collection.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.HashMap; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DoubleDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DoubleDeserializerTest.java index e5ee78eec..91e186104 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DoubleDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DoubleDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/EnumTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/EnumTest.java index 0846877d0..424a2231e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/EnumTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/EnumTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FactoryTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FactoryTest.java index 6306d4e4a..f68149feb 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FactoryTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FactoryTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest.java index c242357cc..14c573944 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest1.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest1.java index e92e1c131..03174a5ff 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest1.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest1.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest2.java index 31cd34414..15cea063c 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest3.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest3.java index 77e0352dd..b8643b0bd 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest3.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest3.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.codehaus.jackson.type.TypeReference; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest4.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest4.java index 5efddcf0e..fc1993069 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest4.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest4.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest5.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest5.java index d744eced4..1bac0654f 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest5.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest5.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest.java index b6814fe10..6d775e49d 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest2.java index fd0c4c7db..687289f98 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest3.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest3.java index bf7049d81..346c526cf 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest3.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldSerializerTest3.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FloatDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FloatDeserializerTest.java index 5f5f612a7..5a2706be5 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FloatDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FloatDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FontDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FontDeserializerTest.java index 1ccea1ce9..89126446b 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FontDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FontDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.awt.Font; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/GetOnlyCollectionTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/GetOnlyCollectionTest.java index da3e574d3..65eca0bbf 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/GetOnlyCollectionTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/GetOnlyCollectionTest.java @@ -5,7 +5,7 @@ import java.util.List; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class GetOnlyCollectionTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/InetAddressDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/InetAddressDeserializerTest.java index 8a31f82fb..abec7478e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/InetAddressDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/InetAddressDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerDeserializerTest.java index 3df87db7d..7daa2b3c3 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerFieldDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerFieldDeserializerTest.java index 188150ff4..16e94db72 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerFieldDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerFieldDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerParseTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerParseTest.java index 7c79f1dee..495d12bd8 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerParseTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerParseTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.math.BigDecimal; import java.math.BigInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/InterfaceParseTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/InterfaceParseTest.java index 9b793d66b..235d3a415 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/InterfaceParseTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/InterfaceParseTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import com.alibaba.fastjson.JSON; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/LocaleTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/LocaleTest.java index 00e12ff5b..a4f3e6be4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/LocaleTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/LocaleTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Locale; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/LongDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/LongDeserializerTest.java index 0a81701af..b4676c1a4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/LongDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/LongDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/LongFieldDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/LongFieldDeserializerTest.java index 74ad29df8..1262b198b 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/LongFieldDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/LongFieldDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/MapTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/MapTest.java index 49bd4a266..a0d7ec79f 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/MapTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/MapTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.math.BigDecimal; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/MultiArrayTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/MultiArrayTest.java index 7dfd538cc..19f212394 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/MultiArrayTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/MultiArrayTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/NumberDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/NumberDeserializerTest.java index 37c6ee4f5..1eede24da 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/NumberDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/NumberDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java index fe2bd2d91..e8b4ca2de 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/PointDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/PointDeserializerTest.java index 43d4292ad..7f8b25648 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/PointDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/PointDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.awt.Point; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/RectangleDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/RectangleDeserializerTest.java index 96c639a22..49d920a85 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/RectangleDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/RectangleDeserializerTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.awt.Font; import java.awt.Rectangle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest.java index 70b583149..da2233a12 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest2.java index 6e13a9fb5..5e94fd9e8 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.sql.Date; import java.text.SimpleDateFormat; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/StackTraceElementDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/StackTraceElementDeserializerTest.java index 895a47517..ed62f6de3 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/StackTraceElementDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/StackTraceElementDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM2.java index 8cb816b79..123eb1695 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_BigDecimal.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_BigDecimal.java index bd6ac4d96..a1ff9ae87 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_BigDecimal.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_BigDecimal.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Byte_0.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Byte_0.java index 1e78a909c..a9fabae10 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Byte_0.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Byte_0.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Date.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Date.java index cc5ebc4bd..cfaded629 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Date.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Date.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Integer.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Integer.java index 2b0e97cac..e57351c93 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Integer.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Integer.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Long_0.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Long_0.java index 2a712788f..7deab56ea 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Long_0.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Long_0.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Short_0.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Short_0.java index f3e72fa0a..c774f1cbd 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Short_0.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_Short_0.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_boolean.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_boolean.java index 78e81f765..ff17d2b53 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_boolean.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_boolean.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_byte.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_byte.java index af8413f10..6c41a48d3 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_byte.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_byte.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_char.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_char.java index e28c86eb5..56cdfe448 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_char.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_char.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_double.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_double.java index 5663f6d0e..671415d68 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_double.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_double.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_float.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_float.java index ca873d3dd..dcaf8fe9c 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_float.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_float.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_int.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_int.java index c84fea30a..f20af2865 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_int.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_int.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_long.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_long.java index 90805c4ec..2326f0233 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_long.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_long.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_null.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_null.java index 141c2d156..8853149f1 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_null.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_null.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_object.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_object.java index 9488686a2..11d07ca68 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_object.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_object.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_short.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_short.java index fc219c549..c19fdeae1 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_short.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_short.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestEnum.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestEnum.java index 283fc11e4..a51123498 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestEnum.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestEnum.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestNull.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestNull.java index 080ad1aed..8fef41a85 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestNull.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestNull.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ThrowableDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ThrowableDeserializerTest.java index 857630d79..09619b7c6 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ThrowableDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ThrowableDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TimeDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TimeDeserializerTest.java index b7b94cc26..9289330dc 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TimeDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TimeDeserializerTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import java.sql.Time; import java.text.SimpleDateFormat; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TimeDeserializerTest2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TimeDeserializerTest2.java index 9a56c403d..968099339 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TimeDeserializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TimeDeserializerTest2.java @@ -5,7 +5,7 @@ import java.awt.Color; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java index 9c341dfc6..e9f23e398 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TreeMapDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TreeMapDeserializerTest.java index 583d94824..75255f92c 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TreeMapDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TreeMapDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/URIDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/URIDeserializerTest.java index b8bf730a5..3bc644f99 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/URIDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/URIDeserializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.parser.deser; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/URLDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/URLDeserializerTest.java index a8316512c..b29127f2e 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/URLDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/URLDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.net.URL; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/UUIDDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/UUIDDeserializerTest.java index 9cdb71437..72315c89b 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/UUIDDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/UUIDDeserializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.parser.deser; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ref/TestRef.java b/src/test/java/com/alibaba/json/bvt/ref/TestRef.java index 828156e35..e5929b8c9 100755 --- a/src/test/java/com/alibaba/json/bvt/ref/TestRef.java +++ b/src/test/java/com/alibaba/json/bvt/ref/TestRef.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.ref; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ref/TestRef2.java b/src/test/java/com/alibaba/json/bvt/ref/TestRef2.java index 8b8f4cb98..a349c5b33 100755 --- a/src/test/java/com/alibaba/json/bvt/ref/TestRef2.java +++ b/src/test/java/com/alibaba/json/bvt/ref/TestRef2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.ref; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ref/TestRef3.java b/src/test/java/com/alibaba/json/bvt/ref/TestRef3.java index 093f7eb7a..db5ceb68e 100755 --- a/src/test/java/com/alibaba/json/bvt/ref/TestRef3.java +++ b/src/test/java/com/alibaba/json/bvt/ref/TestRef3.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.ref; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ref/TestRef6.java b/src/test/java/com/alibaba/json/bvt/ref/TestRef6.java index 12fef56e7..b3334efd1 100755 --- a/src/test/java/com/alibaba/json/bvt/ref/TestRef6.java +++ b/src/test/java/com/alibaba/json/bvt/ref/TestRef6.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.ref; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/ref/TestRef7.java b/src/test/java/com/alibaba/json/bvt/ref/TestRef7.java index 9d0844951..9d9e6ab0a 100755 --- a/src/test/java/com/alibaba/json/bvt/ref/TestRef7.java +++ b/src/test/java/com/alibaba/json/bvt/ref/TestRef7.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.ref; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/AppendableTest.java b/src/test/java/com/alibaba/json/bvt/serializer/AppendableTest.java index 317fe6e3d..45226dca7 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/AppendableTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/AppendableTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/BugTest0.java b/src/test/java/com/alibaba/json/bvt/serializer/BugTest0.java index 440aa3860..e9abec33c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/BugTest0.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/BugTest0.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.sql.Date; import java.sql.Timestamp; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/BugTest1.java b/src/test/java/com/alibaba/json/bvt/serializer/BugTest1.java index b5fd0e0f5..96c2cb314 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/BugTest1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/BugTest1.java @@ -5,7 +5,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ByteArrayFieldSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ByteArrayFieldSerializerTest.java index f13e18b07..51b569dba 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ByteArrayFieldSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ByteArrayFieldSerializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ByteArrayTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ByteArrayTest.java index ffca551a0..ece915c44 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ByteArrayTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ByteArrayTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/CharArraySerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/CharArraySerializerTest.java index 8e4f2df74..8b1e9d875 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/CharArraySerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/CharArraySerializerTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class CharArraySerializerTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/serializer/CharTest.java b/src/test/java/com/alibaba/json/bvt/serializer/CharTest.java index c05c5f9c1..4692aa09c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/CharTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/CharTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/CharsetTest.java b/src/test/java/com/alibaba/json/bvt/serializer/CharsetTest.java index 44c1d47d9..d3accfc07 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/CharsetTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/CharsetTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.nio.charset.Charset; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/CircularReferencesTest.java b/src/test/java/com/alibaba/json/bvt/serializer/CircularReferencesTest.java index 520b0f09f..62c721db7 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/CircularReferencesTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/CircularReferencesTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/CollectionSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/CollectionSerializerTest.java index b34c5f482..222ea94aa 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/CollectionSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/CollectionSerializerTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.CollectionSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ColorSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ColorSerializerTest.java index c57a59262..3b38a2fb5 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ColorSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ColorSerializerTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.awt.Color; import java.awt.Rectangle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/DateTest.java b/src/test/java/com/alibaba/json/bvt/serializer/DateTest.java index 67abb7cba..f29e882d3 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/DateTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/DateTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/DateTest2.java b/src/test/java/com/alibaba/json/bvt/serializer/DateTest2.java index f4ba51094..995869c1e 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/DateTest2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/DateTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/DoubleTest.java b/src/test/java/com/alibaba/json/bvt/serializer/DoubleTest.java index 990597a02..5c878b5cb 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/DoubleTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/DoubleTest.java @@ -1,10 +1,11 @@ package com.alibaba.json.bvt.serializer; -import com.alibaba.fastjson.JSON; - -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + +import com.alibaba.fastjson.JSON; + public class DoubleTest extends TestCase { public void test_double() throws Exception { diff --git a/src/test/java/com/alibaba/json/bvt/serializer/EnumTest.java b/src/test/java/com/alibaba/json/bvt/serializer/EnumTest.java index dea6bff5b..087311d11 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/EnumTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/EnumTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/EnumTest2.java b/src/test/java/com/alibaba/json/bvt/serializer/EnumTest2.java index 79d1f4660..5f2a813ac 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/EnumTest2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/EnumTest2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ExtendsTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ExtendsTest.java index b8485ebbd..a27018dce 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ExtendsTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ExtendsTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/FileTest.java b/src/test/java/com/alibaba/json/bvt/serializer/FileTest.java index 7c63bec55..1a2e0efa0 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/FileTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/FileTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.io.File; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/FloatTest.java b/src/test/java/com/alibaba/json/bvt/serializer/FloatTest.java index 457b8a147..c32ca3103 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/FloatTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/FloatTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/FontSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/FontSerializerTest.java index 8676b9286..80632284a 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/FontSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/FontSerializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.awt.Font; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/InetAddressTest.java b/src/test/java/com/alibaba/json/bvt/serializer/InetAddressTest.java index d614c081d..c39f68674 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/InetAddressTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/InetAddressTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.net.InetAddress; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/InetSocketAddressTest.java b/src/test/java/com/alibaba/json/bvt/serializer/InetSocketAddressTest.java index cc8a8151f..d2b334dd7 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/InetSocketAddressTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/InetSocketAddressTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.net.InetAddress; import java.net.InetSocketAddress; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/IntArrayEncodeTest.java b/src/test/java/com/alibaba/json/bvt/serializer/IntArrayEncodeTest.java index 585ae5e85..c9d7866be 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/IntArrayEncodeTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/IntArrayEncodeTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/IntegerArrayEncodeTest.java b/src/test/java/com/alibaba/json/bvt/serializer/IntegerArrayEncodeTest.java index fa70a9270..a5fcba460 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/IntegerArrayEncodeTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/IntegerArrayEncodeTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/IntegerArrayFieldSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/IntegerArrayFieldSerializerTest.java index 3fa9a57ec..a97e1272c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/IntegerArrayFieldSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/IntegerArrayFieldSerializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/IntegerSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/IntegerSerializerTest.java index 70e32ccf1..c77f890e8 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/IntegerSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/IntegerSerializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/InterfaceTest.java b/src/test/java/com/alibaba/json/bvt/serializer/InterfaceTest.java index e696313fb..62511d1b9 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/InterfaceTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/InterfaceTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest.java b/src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest.java index cbac4849c..3c52d2873 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest2.java b/src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest2.java index b91183b0a..b9f0731c7 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JSONFieldTest2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerContextTest.java b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerContextTest.java index dad4be8bd..e58740661 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerContextTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerContextTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializerContext; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerFeatureTest.java b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerFeatureTest.java index f932824e8..a6253882e 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerFeatureTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerFeatureTest.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerMapTest.java b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerMapTest.java index 68cc3fcf2..a647ce204 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerMapTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerMapTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.IntegerSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest.java index c72d6a873..8eee92f85 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.Date; import java.util.Iterator; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONAware; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest1.java b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest1.java index abff63489..9a8ecc38a 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest1.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest2.java b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest2.java index 411ee46aa..87151b5e7 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JSONSerializerTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.io.IOException; import java.io.Writer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/JavaBeanSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/JavaBeanSerializerTest.java index 58cdf5dfe..cd34aa3e3 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/JavaBeanSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/JavaBeanSerializerTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ListSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ListSerializerTest.java index 362ee3a13..c05d10b6c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ListSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ListSerializerTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ListSerializerTest2.java b/src/test/java/com/alibaba/json/bvt/serializer/ListSerializerTest2.java index 783edde53..b5659abc6 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ListSerializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ListSerializerTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ListTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ListTest.java index f42a235db..94f1c128c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ListTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ListTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/LocalTest.java b/src/test/java/com/alibaba/json/bvt/serializer/LocalTest.java index 6a5cdc8f3..eb234ce0c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/LocalTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/LocalTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.util.Locale; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/MapSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/MapSerializerTest.java index 7e2f463e1..3e39ed25c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/MapSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/MapSerializerTest.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/MapTest.java b/src/test/java/com/alibaba/json/bvt/serializer/MapTest.java index 0e666e296..37a070ff6 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/MapTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/MapTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest.java b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest.java index 52f3f15b0..8775cef56 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_boolean.java b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_boolean.java index fae936784..d9e5cdb39 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_boolean.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_boolean.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_byte.java b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_byte.java index c70a19d5b..132e54f95 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_byte.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_byte.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_char.java b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_char.java index 0719ed093..7f2a7f1e0 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_char.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_char.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_double.java b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_double.java index f757a5230..7bbf8228a 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_double.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_double.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_float.java b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_float.java index 1be3c8d90..c8742c9b9 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_float.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_float.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_long.java b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_long.java index 02221be15..f49e7a557 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_long.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_long.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_short.java b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_short.java index 7a2cc1ec4..2633ada38 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_short.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/NameFilterTest_short.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.FilterUtils; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PascalNameFilterTest.java b/src/test/java/com/alibaba/json/bvt/serializer/PascalNameFilterTest.java index f8e193c71..187a4b9df 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PascalNameFilterTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PascalNameFilterTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PatternTest.java b/src/test/java/com/alibaba/json/bvt/serializer/PatternTest.java index 1f18b827d..bde1f14f3 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PatternTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PatternTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PointSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/PointSerializerTest.java index c20cbd4a4..f600c7598 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PointSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PointSerializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.awt.Point; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PrettyFormatTest.java b/src/test/java/com/alibaba/json/bvt/serializer/PrettyFormatTest.java index 3fe0b4c21..11efc7269 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PrettyFormatTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PrettyFormatTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilterTest.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilterTest.java index 4ee18898e..87c5947a6 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilterTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilterTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_byte.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_byte.java index 4d5c96130..891125134 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_byte.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_byte.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_char.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_char.java index 2d82e57b4..4843be6a5 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_char.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_char.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_double.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_double.java index bf432d373..72af57853 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_double.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_double.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_float.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_float.java index e98da5b6b..0adc01592 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_float.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_float.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_long.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_long.java index abbe2ad08..2b397d333 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_long.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_long.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_short.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_short.java index 27e44b92b..4351ccd0f 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_short.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyFilter_short.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyPathTest.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyPathTest.java index 83d5efd2a..9cda93210 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyPathTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyPathTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/PropertyPathTest2.java b/src/test/java/com/alibaba/json/bvt/serializer/PropertyPathTest2.java index 9b48eae87..a3c604b3d 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/PropertyPathTest2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/PropertyPathTest2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/RectangleSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/RectangleSerializerTest.java index 269287b6a..d7c301a8b 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/RectangleSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/RectangleSerializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.awt.Rectangle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerialContextTest.java b/src/test/java/com/alibaba/json/bvt/serializer/SerialContextTest.java index 1bc5bc019..5e1feb3c6 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerialContextTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerialContextTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerialContext; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerialWriterStringEncoderTest.java b/src/test/java/com/alibaba/json/bvt/serializer/SerialWriterStringEncoderTest.java index fac468dea..807b61a2b 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerialWriterStringEncoderTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerialWriterStringEncoderTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.nio.charset.Charset; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerialWriterStringEncoder; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerialWriterStringEncoderTest2.java b/src/test/java/com/alibaba/json/bvt/serializer/SerialWriterStringEncoderTest2.java index 530811fdb..f21fbadaa 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerialWriterStringEncoderTest2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerialWriterStringEncoderTest2.java @@ -6,7 +6,7 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerialWriterStringEncoder; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerializeConfigTest.java b/src/test/java/com/alibaba/json/bvt/serializer/SerializeConfigTest.java index eccf14097..366093b48 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerializeConfigTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerializeConfigTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeConfig; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest.java b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest.java index daf65d6b6..2b7d4d5cf 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_1.java b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_1.java index 4293ecaca..b602a0c6c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_1.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.io.ByteArrayOutputStream; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_3.java b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_3.java index 7a18f55f7..7ca7f57e5 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_3.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_3.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_5.java b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_5.java index 114154187..c6e419ff4 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_5.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_5.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_6.java b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_6.java index bfb358ffc..a0a991ee3 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_6.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_6.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_7.java b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_7.java index aa2897f61..78ac19dd3 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_7.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerializeWriterTest_7.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SerializerFeatureTest.java b/src/test/java/com/alibaba/json/bvt/serializer/SerializerFeatureTest.java index 1639d3ecf..be82d8c41 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SerializerFeatureTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SerializerFeatureTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializerFeature; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ShortSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ShortSerializerTest.java index 88e150836..a5f354b49 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ShortSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ShortSerializerTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SimpleDataFormatSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/SimpleDataFormatSerializerTest.java index 606c63a38..fd3360f91 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SimpleDataFormatSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SimpleDataFormatSerializerTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SimplePropertyPreFilterTest.java b/src/test/java/com/alibaba/json/bvt/serializer/SimplePropertyPreFilterTest.java index e8a31e559..22cfe96cc 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SimplePropertyPreFilterTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SimplePropertyPreFilterTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/SpecicalStringTest.java b/src/test/java/com/alibaba/json/bvt/serializer/SpecicalStringTest.java index 4fa0ddee4..f56aab986 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/SpecicalStringTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/SpecicalStringTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/StringSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/StringSerializerTest.java index 02be2cff3..c50c9d823 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/StringSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/StringSerializerTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass.java b/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass.java index 67f9127f4..46aa81be3 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass1.java b/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass1.java index af92dc8ef..d3a5d0a52 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass1.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass2.java b/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass2.java index 2085c88ea..3550690b1 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TestInnerClass2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TestPivateStaticClass.java b/src/test/java/com/alibaba/json/bvt/serializer/TestPivateStaticClass.java index ea0d97ed0..2956726da 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/TestPivateStaticClass.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TestPivateStaticClass.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TestSortField.java b/src/test/java/com/alibaba/json/bvt/serializer/TestSortField.java index 8eeaf8222..fbfba5e5f 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/TestSortField.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TestSortField.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.LinkedHashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TestSpecial_entity.java b/src/test/java/com/alibaba/json/bvt/serializer/TestSpecial_entity.java index 2c6210ca1..465e05589 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/TestSpecial_entity.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TestSpecial_entity.java @@ -32,6 +32,26 @@ public class TestSpecial_entity extends TestCase { Assert.assertEquals("{\"name\":\"\\5\"}", JSON.toJSONString(new VO("\5"))); } + public void test_6() throws Exception { + Assert.assertEquals("{\"name\":\"\\6\"}", JSON.toJSONString(new VO("\6"))); + } + + public void test_7() throws Exception { + Assert.assertEquals("{\"name\":\"\\7\"}", JSON.toJSONString(new VO("\7"))); + } + + public void test_8() throws Exception { + Assert.assertEquals("{\"name\":\"\\b\"}", JSON.toJSONString(new VO("\b"))); + } + + public void test_9() throws Exception { + Assert.assertEquals("{\"name\":\"\\t\"}", JSON.toJSONString(new VO("\t"))); + } + + public void test_10() throws Exception { + Assert.assertEquals("{\"name\":\"\\n\"}", JSON.toJSONString(new VO("\n"))); + } + public static class VO { private String name; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TestSpecial_map.java b/src/test/java/com/alibaba/json/bvt/serializer/TestSpecial_map.java index 46691fdb1..ed13fd9f7 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/TestSpecial_map.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TestSpecial_map.java @@ -45,4 +45,14 @@ public class TestSpecial_map extends TestCase { public void test_8() throws Exception { Assert.assertEquals("{\"name\":\"\\b\"}", JSON.toJSONString(Collections.singletonMap("name", "\b"))); } + + public void test_9() throws Exception { + Assert.assertEquals("{\"name\":\"\\t\"}", JSON.toJSONString(Collections.singletonMap("name", "\t"))); + } + + public void test_10() throws Exception { + Assert.assertEquals("{\"name\":\"\\n\"}", JSON.toJSONString(Collections.singletonMap("name", "\n"))); + } + + } diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TimeZoneTest.java b/src/test/java/com/alibaba/json/bvt/serializer/TimeZoneTest.java index 5831979f9..f22503ed3 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/TimeZoneTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TimeZoneTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.util.TimeZone; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TransientTest.java b/src/test/java/com/alibaba/json/bvt/serializer/TransientTest.java index 325b10865..fb1b37926 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/TransientTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TransientTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/TreeSetTest.java b/src/test/java/com/alibaba/json/bvt/serializer/TreeSetTest.java index d961b00c2..ce012358c 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/TreeSetTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/TreeSetTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.Collection; import java.util.TreeSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/URITest.java b/src/test/java/com/alibaba/json/bvt/serializer/URITest.java index f7222a77d..286658ecb 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/URITest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/URITest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.net.URI; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/URLTest.java b/src/test/java/com/alibaba/json/bvt/serializer/URLTest.java index 3a97972f0..3b1166bc4 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/URLTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/URLTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.net.URI; import java.net.URL; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/UUIDTest.java b/src/test/java/com/alibaba/json/bvt/serializer/UUIDTest.java index d5c441d64..42c505fd9 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/UUIDTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/UUIDTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/ValueFilterTest.java b/src/test/java/com/alibaba/json/bvt/serializer/ValueFilterTest.java index 609a2a4a6..2a0e52a77 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/ValueFilterTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/ValueFilterTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.JSONSerializer; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/WriteNullListAsEmptyTest.java b/src/test/java/com/alibaba/json/bvt/serializer/WriteNullListAsEmptyTest.java index 08796f21d..2418bc306 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/WriteNullListAsEmptyTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/WriteNullListAsEmptyTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/WriteSlashAsSpecialTest.java b/src/test/java/com/alibaba/json/bvt/serializer/WriteSlashAsSpecialTest.java index 7c643660e..eb946b299 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/WriteSlashAsSpecialTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/WriteSlashAsSpecialTest.java @@ -6,7 +6,7 @@ import java.util.Map; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class WriteSlashAsSpecialTest extends TestCase { diff --git a/src/test/java/com/alibaba/json/bvt/serializer/exception/RuntimeExceptionTest.java b/src/test/java/com/alibaba/json/bvt/serializer/exception/RuntimeExceptionTest.java index ab59a984d..1a0ec8157 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/exception/RuntimeExceptionTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/exception/RuntimeExceptionTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.serializer.exception; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/prettyFormat/ArrayListTest.java b/src/test/java/com/alibaba/json/bvt/serializer/prettyFormat/ArrayListTest.java index c7160a393..ece91cf05 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/prettyFormat/ArrayListTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/prettyFormat/ArrayListTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.serializer.prettyFormat; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeArray.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeArray.java index 4814b87b7..fdbeceace 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeArray.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeArray.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeArray2.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeArray2.java index e0f1f6a18..4aa3dfd9d 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeArray2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeArray2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeBytes.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeBytes.java index 7e66ad823..43231536c 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeBytes.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeBytes.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeBytes1.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeBytes1.java index 1c0e653d6..34b2f7068 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeBytes1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeBytes1.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeChar.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeChar.java index 905d384ad..e6041903d 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeChar.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeChar.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeChar1.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeChar1.java index fbb3ef0fb..fbeb27598 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeChar1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeChar1.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue.java index 518b82bdf..01b18f446 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_int.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_int.java index 3b43f5d2d..5eda133cd 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_int.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_int.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_int_1.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_int_1.java index 382f752f5..3468e72dd 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_int_1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_int_1.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_long.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_long.java index d8729ca63..3c6725c7b 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_long.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_long.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_string.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_string.java index 28d32334d..659dcf169 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_string.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_string.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_string_singQuote.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_string_singQuote.java index 4d7194d0b..366d92079 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_string_singQuote.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeFieldValue_string_singQuote.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeInt.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeInt.java index 805a99499..65396bfa5 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeInt.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeInt.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeIntAndChar.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeIntAndChar.java index 71b623589..c3267346e 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeIntAndChar.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeIntAndChar.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeJSONStringTo.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeJSONStringTo.java index 363cc89e4..484dac114 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeJSONStringTo.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeJSONStringTo.java @@ -4,7 +4,7 @@ import java.io.StringWriter; import java.util.LinkedHashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeLong.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeLong.java index eec561ee3..b1e48a66c 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeLong.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeLong.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeLongAndChar.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeLongAndChar.java index d17b29fb7..26a472cbb 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeLongAndChar.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeLongAndChar.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeString.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeString.java index 266a5c4d5..bd8eab71b 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeString.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeString.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeString1.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeString1.java index d047a1f52..09a7f6c21 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeString1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeString1.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString.java index 20a1a1d80..c4cefbca9 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString1.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString1.java index 91b01a2b0..d76284030 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString1.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString1.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString2.java b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString2.java index 180d1aa67..545fa9f43 100644 --- a/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString2.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/stream/StreamWriterTest_writeValueString2.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.serializer.stream; import java.io.StringWriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.serializer.SerializeWriter; diff --git a/src/test/java/com/alibaba/json/bvt/util/FieldInfoTest.java b/src/test/java/com/alibaba/json/bvt/util/FieldInfoTest.java index 33de05d85..3192ec489 100755 --- a/src/test/java/com/alibaba/json/bvt/util/FieldInfoTest.java +++ b/src/test/java/com/alibaba/json/bvt/util/FieldInfoTest.java @@ -5,7 +5,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.annotation.JSONField; diff --git a/src/test/java/com/alibaba/json/bvt/util/JSONASMUtilTest.java b/src/test/java/com/alibaba/json/bvt/util/JSONASMUtilTest.java index 396cb4d54..4346883f1 100755 --- a/src/test/java/com/alibaba/json/bvt/util/JSONASMUtilTest.java +++ b/src/test/java/com/alibaba/json/bvt/util/JSONASMUtilTest.java @@ -2,7 +2,7 @@ package com.alibaba.json.bvt.util; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.util.ASMUtils; diff --git a/src/test/java/com/alibaba/json/bvt/util/ThreadLocalCacheTest.java b/src/test/java/com/alibaba/json/bvt/util/ThreadLocalCacheTest.java index e012681a8..fc390ec28 100755 --- a/src/test/java/com/alibaba/json/bvt/util/ThreadLocalCacheTest.java +++ b/src/test/java/com/alibaba/json/bvt/util/ThreadLocalCacheTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.util; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.util.ThreadLocalCache; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/MapTest.java b/src/test/java/com/alibaba/json/bvt/writeClassName/MapTest.java index 445c53921..de2d10bea 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/MapTest.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/MapTest.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest.java index d32362e09..65b7dffe7 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.writeClassName; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest2.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest2.java index 4ab414b1d..21fe54757 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest2.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest2.java @@ -1,6 +1,6 @@ package com.alibaba.json.bvt.writeClassName; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Collection.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Collection.java index 1a29c0ec8..b67c81b2e 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Collection.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Collection.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.writeClassName; import java.util.Collection; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Collection2.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Collection2.java index 90945047b..a8f591f17 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Collection2.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Collection2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.writeClassName; import java.util.Collection; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_List.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_List.java index 6cee3ea0c..97004b385 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_List.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_List.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.writeClassName; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_List2.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_List2.java index cf5d11be1..d6e18dd49 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_List2.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_List2.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.writeClassName; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set.java index 0a33c60ca..adb5c4c30 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set2.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set2.java index 063743809..5ed5852f0 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set2.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set2.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set3.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set3.java index 64eb57f50..8fb03636e 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set3.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set3.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set4.java b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set4.java index d0cc4d294..f5e5d2d06 100755 --- a/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set4.java +++ b/src/test/java/com/alibaba/json/bvt/writeClassName/WriteClassNameTest_Set4.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/bvtVO/DataTransaction2.java b/src/test/java/com/alibaba/json/bvtVO/DataTransaction2.java index f9fb4cfba..3994cac08 100755 --- a/src/test/java/com/alibaba/json/bvtVO/DataTransaction2.java +++ b/src/test/java/com/alibaba/json/bvtVO/DataTransaction2.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/demo/DateDemo.java b/src/test/java/com/alibaba/json/demo/DateDemo.java index 3ed30feb6..06799a02e 100755 --- a/src/test/java/com/alibaba/json/demo/DateDemo.java +++ b/src/test/java/com/alibaba/json/demo/DateDemo.java @@ -3,7 +3,7 @@ package com.alibaba.json.demo; import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/demo/JSONFeidDemo.java b/src/test/java/com/alibaba/json/demo/JSONFeidDemo.java index 0d6dcaa64..8265483d4 100755 --- a/src/test/java/com/alibaba/json/demo/JSONFeidDemo.java +++ b/src/test/java/com/alibaba/json/demo/JSONFeidDemo.java @@ -1,6 +1,6 @@ package com.alibaba.json.demo; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; diff --git a/src/test/java/com/alibaba/json/test/IntArrayFieldTest_primitive.java b/src/test/java/com/alibaba/json/test/IntArrayFieldTest_primitive.java index 93424d5f4..3694273fa 100755 --- a/src/test/java/com/alibaba/json/test/IntArrayFieldTest_primitive.java +++ b/src/test/java/com/alibaba/json/test/IntArrayFieldTest_primitive.java @@ -1,6 +1,6 @@ package com.alibaba.json.test; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON;