j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merged upstream/develop into feature/locale_independent_str_to_num

Browse source
This commit is contained in:
Alex Astashyn 2016-12-12 20:27:15 -05:00
commit 6fba52b6da
307 changed files with 6078 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/CMakeLists.txt
View file

@ -6,6 +6,7 @@ add_executable(${JSON_UNITTEST_TARGET_NAME}
"src/unit-algorithms.cpp"
"src/unit-allocator.cpp"
"src/unit-capacity.cpp"
"src/unit-cbor.cpp"
"src/unit-class_const_iterator.cpp"
"src/unit-class_iterator.cpp"
"src/unit-class_lexer.cpp"
@ -26,6 +27,7 @@ add_executable(${JSON_UNITTEST_TARGET_NAME}
"src/unit-json_patch.cpp"
"src/unit-json_pointer.cpp"
"src/unit-modifiers.cpp"
"src/unit-msgpack.cpp"
"src/unit-pointer_access.cpp"
"src/unit-readme.cpp"
"src/unit-reference_access.cpp"

32
test/Makefile
View file

@ -10,6 +10,7 @@ SOURCES = src/unit.cpp \
src/unit-algorithms.cpp \
src/unit-allocator.cpp \
src/unit-capacity.cpp \
src/unit-cbor.cpp \
src/unit-class_const_iterator.cpp \
src/unit-class_iterator.cpp \
src/unit-class_lexer.cpp \
@ -30,6 +31,7 @@ SOURCES = src/unit.cpp \
src/unit-json_patch.cpp \
src/unit-json_pointer.cpp \
src/unit-modifiers.cpp \
src/unit-msgpack.cpp \
src/unit-pointer_access.cpp \
src/unit-readme.cpp \
src/unit-reference_access.cpp \
@ -40,7 +42,20 @@ SOURCES = src/unit.cpp \
OBJECTS = $(SOURCES:.cpp=.o)
all: json_unit
TESTCASES = $(patsubst src/unit-%.cpp,test-%,$(wildcard src/unit-*.cpp))
##############################################################################
# main rules
##############################################################################
all: $(TESTCASES)
clean:
rm -fr json_unit $(OBJECTS) $(SOURCES:.cpp=.gcno) $(SOURCES:.cpp=.gcda) $(TESTCASES)
##############################################################################
# single test file
##############################################################################
json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp
@echo "[CXXLD] $@"
@ -50,5 +65,16 @@ json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp
@echo "[CXX] $@"
@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
clean:
rm -fr json_unit $(OBJECTS) $(SOURCES:.cpp=.gcno) $(SOURCES:.cpp=.gcda)
##############################################################################
# individual test cases
##############################################################################
test-%: src/unit-%.cpp ../src/json.hpp src/catch.hpp
@echo "[CXXLD] $@"
@$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -DCATCH_CONFIG_MAIN $< -o $@
TEST_PATTERN = "*"
TEST_PREFIX = ""
check: $(TESTCASES)
@cd .. ; for testcase in $(TESTCASES); do echo "Executing $$testcase..."; $(TEST_PREFIX)test/$$testcase $(TEST_PATTERN) || exit 1; done

1
test/data/json.org/1.json.cbor Normal file
View file

@ -0,0 +1 @@
¡hglossary¢hGlossDiv¢iGlossList¡jGlossEntry§hGlossDef¢lGlossSeeAlso‚cGMLcXMLdparaxHA meta-markup language, used to create markup languages such as DocBook.hGlossSeefmarkupgAcronymdSGMLiGlossTermx$Standard Generalized Markup LanguagefAbbrevmISO 8879:1986fSortAsdSGMLbIDdSGMLetitleaSetitlepexample glossary

BIN
test/data/json.org/1.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json.org/2.json.cbor Normal file
View file

@ -0,0 +1 @@
¡dmenu£epopup¡hmenuitemƒ¢gonclicknCreateNewDoc()evaluecNew¢gonclickiOpenDoc()evaluedOpen¢gonclickjCloseDoc()evalueeClosebiddfileevaluedFile

1
test/data/json.org/2.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD>menu<EFBFBD>popup<EFBFBD>menuitem<EFBFBD>吶nclick哽reateNewDoc()史alueΛew<65>onclick呢penDoc()史alue力pen<65>onclick杭loseDoc()史alue丘lose█d口ile史alue了ile

1
test/data/json.org/3.json.cbor Normal file
View file

@ -0,0 +1 @@
¡fwidget¤edebugbondtext¨gvOffsetdestyledbolddnameetext1ghOffsetúionMouseUpx)sun1.opacity = (sun1.opacity / 100) * 90;ddatajClick Hereialignmentfcenterdsize$fwindow¤ewidthôfheightôdnamekmain_windowetitlexSample Konfabulator Widgeteimage¥gvOffsetúcsrcnImages/Sun.pngialignmentfcenterdnamedsun1ghOffsetú

BIN
test/data/json.org/3.json.msgpack Normal file
View file

Binary file not shown.

4
test/data/json.org/4.json.cbor Normal file
View file

@ -0,0 +1,4 @@
¡gweb-app£oservlet-mapping¥jcofaxToolsh/tools/*hcofaxCDSa/kfileServleti/static/*jcofaxAdminh/admin/*jcofaxEmails/cofaxutil/aemail/*ftaglib¢otaglib-locationw/WEB-INF/tlds/cofax.tldjtaglib-uriicofax.tldgservlet…£lservlet-namehcofaxCDSjinit-param¸*ocachePagesStoredxsearchEngineListTemplatexforSearchEnginesList.htmxconfigGlossary:adminEmailmksm@pobox.comlmaxUrlLengthôrdataStoreTestQueryx"SET NOCOUNT ON;select test='test';sdefaultFileTemplatesarticleTemplate.htmpdataStoreLogFilex$/usr/local/tomcat/logs/datastore.logstemplateLoaderClassxorg.cofax.FilesTemplateLoaderndataStoreClassvorg.cofax.SqlDataStorepredirectionClassxorg.cofax.SqlRedirectionttemplateOverridePath`scacheTemplatesStore2ldataStoreUrlx;jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goonxsearchEngineFileTemplatetforSearchEngines.htmocachePagesTrackÈucachePackageTagsStoreÈmdataStoreNameecofaxqdataStorePasswordrdataStoreTestQueryfuseJSPôsdefaultListTemplateplistTemplate.htmxconfigGlossary:poweredByeCofaxmdataStoreUserbsaojspListTemplateplistTemplate.jspojspFileTemplatesarticleTemplate.jspqdataStoreMaxConnsdscachePagesDirtyRead
qcachePagesRefresh
scacheTemplatesTrackdwdataStoreConnUsageLimitdxconfigGlossary:installationAtpPhiladelphia, PAtsearchEngineRobotsDbqWEB-INF/robots.dbvtemplateProcessorClassxorg.cofax.WysiwygTemplatewcachePackageTagsRefresh<xconfigGlossary:staticPatho/content/staticltemplatePathitemplatesluseDataStoreõucacheTemplatesRefreshodataStoreDriverx,com.microsoft.jdbc.sqlserver.SQLServerDriverxconfigGlossary:poweredByIconq/images/cofax.gifucachePackageTagsTrackÈqdataStoreLogLeveledebugrdataStoreInitConns
mservlet-classxorg.cofax.cds.CDSServlet£lservlet-namejcofaxEmailjinit-param¢pmailHostOverrideemail2hmailHostemail1mservlet-classxorg.cofax.cds.EmailServlet¢lservlet-namejcofaxAdminmservlet-classxorg.cofax.cds.AdminServlet¢lservlet-namekfileServletmservlet-classxorg.cofax.cds.FileServlet£lservlet-namejcofaxToolsjinit-param­klogLocationx%/usr/local/tomcat/logs/CofaxTools.logrfileTransferFolderx4/usr/local/tomcat/webapps/content/fileTransferFoldercloggdataLogodataLogLocationx"/usr/local/tomcat/logs/dataLog.logladminGroupIDmlookInContextoremovePageCachex%/content/admin/remove?cache=pages&id=sremoveTemplateCachex)/content/admin/remove?cache=templates&id=jlogMaxSize`ndataLogMaxSize`jbetaServerõltemplatePathotoolstemplates/mservlet-classxorg.cofax.cms.CofaxToolsServlet

BIN
test/data/json.org/4.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json.org/5.json.cbor Normal file
View file

@ -0,0 +1 @@
¡dmenu¢fheaderjSVG Viewereitems–¡biddOpen¢bidgOpenNewelabelhOpen Newö¢bidfZoomInelabelgZoom In¢bidgZoomOutelabelhZoom Out¢bidlOriginalViewelabelmOriginal Viewö¡bidgQuality¡bidePause¡biddMuteö¢biddFindelabelgFind...¢bidiFindAgainelabeljFind Again¡biddCopy¢bidiCopyAgainelabeljCopy Again¢bidgCopySVGelabelhCopy SVG¢bidgViewSVGelabelhView SVG¢bidjViewSourceelabelkView Source¢bidfSaveAselabelgSave Asö¡biddHelp¢bideAboutelabelxAbout Adobe CVG Viewer...

BIN
test/data/json.org/5.json.msgpack Normal file
View file

Binary file not shown.

BIN
test/data/json_nlohmann_tests/all_unicode.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_nlohmann_tests/all_unicode.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_roundtrip/roundtrip01.json.cbor Normal file
View file

@ -0,0 +1 @@
‡

1
test/data/json_roundtrip/roundtrip01.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘À

1
test/data/json_roundtrip/roundtrip02.json.cbor Normal file
View file

@ -0,0 +1 @@
†

1
test/data/json_roundtrip/roundtrip02.json.msgpack Normal file
View file

@ -0,0 +1 @@
妥

1
test/data/json_roundtrip/roundtrip03.json.cbor Normal file
View file

@ -0,0 +1 @@
♪

1
test/data/json_roundtrip/roundtrip03.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘В

BIN
test/data/json_roundtrip/roundtrip04.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip04.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_roundtrip/roundtrip05.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>cfoo

1
test/data/json_roundtrip/roundtrip05.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘£foo

1
test/data/json_roundtrip/roundtrip06.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

1
test/data/json_roundtrip/roundtrip06.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

1
test/data/json_roundtrip/roundtrip07.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

1
test/data/json_roundtrip/roundtrip07.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

BIN
test/data/json_roundtrip/roundtrip08.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip08.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_roundtrip/roundtrip09.json.cbor Normal file
View file

@ -0,0 +1 @@
¡cfoocbar

1
test/data/json_roundtrip/roundtrip09.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD>£foo£bar

1
test/data/json_roundtrip/roundtrip10.json.cbor Normal file
View file

@ -0,0 +1 @@
¢aaöcfoocbar

1
test/data/json_roundtrip/roundtrip10.json.msgpack Normal file
View file

@ -0,0 +1 @@
‚¡aÀ£foo£bar

1
test/data/json_roundtrip/roundtrip11.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

1
test/data/json_roundtrip/roundtrip11.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD><EFBFBD>

1
test/data/json_roundtrip/roundtrip12.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>:<><7F><EFBFBD>

BIN
test/data/json_roundtrip/roundtrip12.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_roundtrip/roundtrip13.json.cbor Normal file
View file

@ -0,0 +1 @@
│;"Т}И│

1
test/data/json_roundtrip/roundtrip13.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <0B>~<7E>

1
test/data/json_roundtrip/roundtrip14.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>;<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

BIN
test/data/json_roundtrip/roundtrip14.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_roundtrip/roundtrip15.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

1
test/data/json_roundtrip/roundtrip15.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

1
test/data/json_roundtrip/roundtrip16.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD><><7F><EFBFBD>

1
test/data/json_roundtrip/roundtrip16.json.msgpack Normal file
View file

@ -0,0 +1 @@
懳<EFBFBD><EFBFBD><EFBFBD>

1
test/data/json_roundtrip/roundtrip17.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD><1A><><EFBFBD><EFBFBD>

1
test/data/json_roundtrip/roundtrip17.json.msgpack Normal file
View file

@ -0,0 +1 @@
懳<EFBFBD><EFBFBD><EFBFBD><EFBFBD>

1
test/data/json_roundtrip/roundtrip18.json.cbor Normal file
View file

@ -0,0 +1 @@
│"Т}И│

1
test/data/json_roundtrip/roundtrip18.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘Ο"τ}ι<>

1
test/data/json_roundtrip/roundtrip19.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD><><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

1
test/data/json_roundtrip/roundtrip19.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘Ο<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

BIN
test/data/json_roundtrip/roundtrip20.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip20.json.msgpack Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip21.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip21.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_roundtrip/roundtrip22.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD><EFBFBD>?<3F><><EFBFBD>n<><6E>

1
test/data/json_roundtrip/roundtrip22.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD><EFBFBD>?鸚<>n<><6E>

1
test/data/json_roundtrip/roundtrip23.json.cbor Normal file
View file

@ -0,0 +1 @@
侞矿纼n棈

1
test/data/json_roundtrip/roundtrip23.json.msgpack Normal file
View file

@ -0,0 +1 @@
懰矿纼n棈

BIN
test/data/json_roundtrip/roundtrip24.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip24.json.msgpack Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip25.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip25.json.msgpack Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip26.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip26.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_roundtrip/roundtrip27.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>ϋο<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

1
test/data/json_roundtrip/roundtrip27.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘Λο<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

BIN
test/data/json_roundtrip/roundtrip28.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip28.json.msgpack Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip29.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_roundtrip/roundtrip29.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_roundtrip/roundtrip30.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>9ｹ 脉<>

1
test/data/json_roundtrip/roundtrip30.json.msgpack Normal file
View file

@ -0,0 +1 @@
騨9ｹ 脉<>

1
test/data/json_roundtrip/roundtrip31.json.cbor Normal file
View file

@ -0,0 +1 @@
ЃыF/)До±Uе

1
test/data/json_roundtrip/roundtrip31.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘ЛF/)До±Uе

1
test/data/json_roundtrip/roundtrip32.json.cbor Normal file
View file

@ -0,0 +1 @@
ЃыF/)До±Uе

1
test/data/json_roundtrip/roundtrip32.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘ЛF/)До±Uе

BIN
test/data/json_tests/pass1.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_tests/pass1.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/json_tests/pass2.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>lNot too deep

1
test/data/json_tests/pass2.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘¬Not too deep

1
test/data/json_tests/pass3.json.cbor Normal file
View file

@ -0,0 +1 @@
¡wJSON Test Pattern pass3¢lIn this testpIt is an object.sThe outermost valuexmust be an object or array.

1
test/data/json_tests/pass3.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD>·JSON Test Pattern pass3‚¬In this test°It is an object.³The outermost value»must be an object or array.

BIN
test/data/json_testsuite/sample.json.cbor Normal file
View file

Binary file not shown.

BIN
test/data/json_testsuite/sample.json.msgpack Normal file
View file

Binary file not shown.

1
test/data/nst_json_testsuite/test_parsing/y_array_arraysWithSpaces.json.cbor Normal file
View file

@ -0,0 +1 @@
÷

1
test/data/nst_json_testsuite/test_parsing/y_array_arraysWithSpaces.json.msgpack Normal file
View file

@ -0,0 +1 @@
草

1
test/data/nst_json_testsuite/test_parsing/y_array_empty-string.json.cbor Normal file
View file

@ -0,0 +1 @@
～

1
test/data/nst_json_testsuite/test_parsing/y_array_empty-string.json.msgpack Normal file
View file

@ -0,0 +1 @@
蔵

1
test/data/nst_json_testsuite/test_parsing/y_array_empty.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

1
test/data/nst_json_testsuite/test_parsing/y_array_empty.json.msgpack Normal file
View file

@ -0,0 +1 @@
<EFBFBD>

1
test/data/nst_json_testsuite/test_parsing/y_array_ending_with_newline.json.cbor Normal file
View file

@ -0,0 +1 @@
<EFBFBD>aa

1
test/data/nst_json_testsuite/test_parsing/y_array_ending_with_newline.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘¡a

1
test/data/nst_json_testsuite/test_parsing/y_array_false.json.cbor Normal file
View file

@ -0,0 +1 @@
♪

1
test/data/nst_json_testsuite/test_parsing/y_array_false.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘В

1
test/data/nst_json_testsuite/test_parsing/y_array_heterogeneous.json.cbor Normal file
View file

@ -0,0 +1 @@
„öa1 

1
test/data/nst_json_testsuite/test_parsing/y_array_heterogeneous.json.msgpack Normal file
View file

@ -0,0 +1 @@
”À¡1€

1
test/data/nst_json_testsuite/test_parsing/y_array_null.json.cbor Normal file
View file

@ -0,0 +1 @@
‡

1
test/data/nst_json_testsuite/test_parsing/y_array_null.json.msgpack Normal file
View file

@ -0,0 +1 @@
‘À

Some files were not shown because too many files have changed in this diff Show more