Skip to content

Provide different tests for JSON output #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcanal merged 11 commits into from
May 27, 2017
Merged

Provide different tests for JSON output #44

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7ccd24a
json: add tests for basic data types
linev May 17, 2017
8461904
json: add testing for string types
linev May 17, 2017
013d483
json: add objects as members testing
linev May 17, 2017
7cb397c
json: add tests for STL containers
linev May 17, 2017
682fd40
json: add test for kStreamerLoop members
linev May 17, 2017
aefb49d
json: add example with simple inheritance
linev May 17, 2017
6df8180
json: add tests for basic ROOT classes like TList or TClonesArray
linev May 17, 2017
da2f2e7
json: use destructor in basic types testing, delete allocated arrays
linev May 27, 2017
189e326
json: provide correct copy constructor for TJsonEx3
linev May 27, 2017
61a1453
json: improve Makefile to run tests in parallel jobs
linev May 27, 2017
7f5db04
json: use nullptr in test classes
linev May 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions root/io/json/BasicTypes.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@

Processing runBasicTypes.C...
====== basic data types TJsonEx1 =====
{
"_typename" : "TJsonEx1",
"fBool" : false,
"fChar" : 67,
"fShort" : 123,
"fInt" : 123456,
"fLong" : 7654321,
"fFloat" : 1.2,
"fDouble" : 3.8
}

====== inheritance from TJsonEx1, TJsonEx11 =====
{
"_typename" : "TJsonEx11",
"fBool" : false,
"fChar" : 67,
"fShort" : 123,
"fInt" : 123456,
"fLong" : 7654321,
"fFloat" : 1.2,
"fDouble" : 3.8,
"fInt2" : 22
}

====== arrays of basic data types TJsonEx2 =====
{
"_typename" : "TJsonEx2",
"fTest1" : [11111, 22222, 33333, 44444],
"fTest2" : [[1, 2], [3, 4]],
"fBool" : [[[false, false, false, false], [true, true, true, true], [false, false, false, false]], [[true, true, true, true], [false, false, false, false], [true, true, true, true]]],
"fChar" : [["0123", "1234", "2345"], ["1234", "2345", "3456"]],
"fShort" : [[[0, 1, 2, 3], [1, 2, 3, 4], [2, 3, 4, 5]], [[1, 2, 3, 4], [2, 3, 4, 5], [3, 4, 5, 6]]],
"fInt" : [[[0, 1, 2, 3], [0, 1, 2, 3], [0, 1, 2, 3]], [[0, 1, 2, 3], [1, 2, 3, 4], [2, 3, 4, 5]]],
"fLong" : [[[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]], [[0, 0, 0, 0], [0, 1, 2, 3], [0, 2, 4, 6]]],
"fFloat" : [[[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]], [[0, 0, 0, 0], [0, 1, 2, 3], [0, 2, 4, 6]]],
"fDouble" : [[[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]], [[0, 0, 0, 0], [0, 1, 2, 3], [0, 2, 4, 6]]]
}

====== dinamin arrays of basic data types TJsonEx3 =====
{
"_typename" : "TJsonEx3",
"fSize" : 5,
"fBool" : [false, false, false, false, false],
"fChar" : "12345",
"fShort" : [0, 2, 4, 6, 8],
"fInt" : [0, 5, 10, 15, 20],
"fLong" : [0, 123, 246, 369, 492],
"fFloat" : [0, 3, 6, 9, 12],
"fDouble" : [0, 7, 14, 21, 28]
}

============ selected data members ========
ex2.fInt = [[[0, 1, 2, 3], [0, 1, 2, 3], [0, 1, 2, 3]], [[0, 1, 2, 3], [1, 2, 3, 4], [2, 3, 4, 5]]]
ex3.fChar = "12345"
ex3.fLong = [0, 123, 246, 369, 492]
21 changes: 19 additions & 2 deletions root/io/json/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CLEAN_TARGETS += $(ALL_LIBRARIES) *.log *.clog
# only target added. If the name of the target is changed in the rules then
# the name should be changed accordingly in this list.

TEST_TARGETS += PolyMarker ArrayCompress mytest
TEST_TARGETS += PolyMarker ArrayCompress BasicTypes String Objects STL StreamerLoop RootClasses mytest

# Search for Rules.mk in roottest/scripts
# Algorithm: Find the current working directory and remove everything after
Expand Down Expand Up @@ -66,9 +66,26 @@ testWithDiff: testWithDiff.log testWithDiff.ref
$(TestDiff)



PolyMarker: PolyMarker.log
$(TestDiff)

ArrayCompress: ArrayCompress.log
$(TestDiff)

BasicTypes: BasicTypes.log
$(TestDiff)

String: String.log
$(TestDiff)

Objects: Objects.log
$(TestDiff)

STL: STL.log
$(TestDiff)

StreamerLoop: StreamerLoop.log
$(TestDiff)

RootClasses: RootClasses.log
$(TestDiff)
Copy link
Member

@pcanal pcanal May 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add

RootClasses.log: test_classes_h.$(DllSuf)

for all the cases that uses test_classes.h+ to allow for parallel builds.

Copy link
Member Author

@linev linev May 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I add correspondent rule in Makefile

Loading