matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed JSON generator paths to relative

Browse Source
This commit is contained in:
Bartek Kryza
2023-03-17 00:39:52 +01:00
parent f13ce56840
commit 4e404a362e
9 changed files with 172 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/t00002/test_case.h
View File

@@ -144,7 +144,7 @@ TEST_CASE("t00002", "[test-case][class]")
"name": "A",
"namespace": "clanguml::t00002",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00002/t00002.cc",
"file": "../../tests/t00002/t00002.cc",
"line": 7
},
"template_parameters": [],
@@ -195,7 +195,7 @@ TEST_CASE("t00002", "[test-case][class]")
"name": "B",
"namespace": "clanguml::t00002",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00002/t00002.cc",
"file": "../../tests/t00002/t00002.cc",
"line": 16
},
"template_parameters": [],
@@ -255,7 +255,7 @@ TEST_CASE("t00002", "[test-case][class]")
"name": "C",
"namespace": "clanguml::t00002",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00002/t00002.cc",
"file": "../../tests/t00002/t00002.cc",
"line": 27
},
"template_parameters": [],
@@ -305,7 +305,7 @@ TEST_CASE("t00002", "[test-case][class]")
"is_static": false,
"name": "as",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00002/t00002.cc",
"file": "../../tests/t00002/t00002.cc",
"line": 58
},
"type": "std::vector<A *>"
@@ -356,7 +356,7 @@ TEST_CASE("t00002", "[test-case][class]")
"name": "D",
"namespace": "clanguml::t00002",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00002/t00002.cc",
"file": "../../tests/t00002/t00002.cc",
"line": 36
},
"template_parameters": [],
@@ -398,7 +398,7 @@ TEST_CASE("t00002", "[test-case][class]")
"is_static": false,
"name": "as",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00002/t00002.cc",
"file": "../../tests/t00002/t00002.cc",
"line": 83
},
"type": "std::vector<A *>"
@@ -449,7 +449,7 @@ TEST_CASE("t00002", "[test-case][class]")
"name": "E",
"namespace": "clanguml::t00002",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00002/t00002.cc",
"file": "../../tests/t00002/t00002.cc",
"line": 61
},
"template_parameters": [],
@@ -512,7 +512,7 @@ TEST_CASE("t00002", "[test-case][class]")
)##";
auto j = generate_class_json(diagram, *model);
// REQUIRE(j == nlohmann::json::parse(expected_json));
REQUIRE(j == nlohmann::json::parse(expected_json));
save_json(config.output_directory() + "/" + diagram->name + ".json", j);
}

236
tests/t00014/test_case.h
View File

File diff suppressed because it is too large Load Diff

26
tests/t00036/test_case.h
View File

@@ -64,7 +64,7 @@ TEST_CASE("t00036", "[test-case][class]")
"name": "E",
"namespace": "clanguml::t00036::ns1",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00036/t00036.cc",
"file": "../../tests/t00036/t00036.cc",
"line": 6
},
"type": "enum"
@@ -87,7 +87,7 @@ TEST_CASE("t00036", "[test-case][class]")
"is_static": false,
"name": "a",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00036/t00036.cc",
"file": "../../tests/t00036/t00036.cc",
"line": 11
},
"type": "T"
@@ -97,16 +97,14 @@ TEST_CASE("t00036", "[test-case][class]")
"name": "A",
"namespace": "clanguml::t00036::ns1::ns11",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00036/t00036.cc",
"file": "../../tests/t00036/t00036.cc",
"line": 10
},
"template_parameters": [
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T",
"type": ""
"kind": "template_type",
"name": "T"
}
],
"type": "class"
@@ -129,7 +127,7 @@ TEST_CASE("t00036", "[test-case][class]")
"is_static": false,
"name": "a_int",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00036/t00036.cc",
"file": "../../tests/t00036/t00036.cc",
"line": 17
},
"type": "A<int>"
@@ -139,7 +137,7 @@ TEST_CASE("t00036", "[test-case][class]")
"name": "B",
"namespace": "clanguml::t00036::ns1::ns11::ns111",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00036/t00036.cc",
"file": "../../tests/t00036/t00036.cc",
"line": 16
},
"template_parameters": [],
@@ -164,11 +162,9 @@ TEST_CASE("t00036", "[test-case][class]")
"namespace": "clanguml::t00036::ns1::ns11",
"template_parameters": [
{
"is_template_parameter": false,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "int",
"type": ""
"kind": "argument",
"type": "int"
}
],
"type": "class"
@@ -201,7 +197,7 @@ TEST_CASE("t00036", "[test-case][class]")
"name": "C",
"namespace": "clanguml::t00036::ns2::ns22",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00036/t00036.cc",
"file": "../../tests/t00036/t00036.cc",
"line": 28
},
"template_parameters": [],
@@ -236,7 +232,7 @@ TEST_CASE("t00036", "[test-case][class]")
auto j = generate_class_json(diagram, *model);
// REQUIRE(j == nlohmann::json::parse(expected_json));
REQUIRE(j == nlohmann::json::parse(expected_json));
save_json(config.output_directory() + "/" + diagram->name + ".json", j);
}

136
tests/t00056/test_case.h
View File

@@ -125,7 +125,7 @@ TEST_CASE("t00056", "[test-case][class]")
"namespace": "clanguml::t00056",
"parameters": [],
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 7
},
"statements": [],
@@ -147,7 +147,7 @@ TEST_CASE("t00056", "[test-case][class]")
}
],
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 10
},
"statements": [
@@ -162,7 +162,7 @@ TEST_CASE("t00056", "[test-case][class]")
"namespace": "clanguml::t00056",
"parameters": [],
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 15
},
"statements": [],
@@ -180,7 +180,7 @@ TEST_CASE("t00056", "[test-case][class]")
}
],
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 19
},
"statements": [
@@ -196,7 +196,7 @@ TEST_CASE("t00056", "[test-case][class]")
"namespace": "clanguml::t00056",
"parameters": [],
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 26
},
"statements": [
@@ -216,7 +216,7 @@ TEST_CASE("t00056", "[test-case][class]")
}
],
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 29
},
"statements": [
@@ -233,7 +233,7 @@ TEST_CASE("t00056", "[test-case][class]")
"namespace": "clanguml::t00056",
"parameters": [],
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 45
},
"statements": [],
@@ -246,7 +246,7 @@ TEST_CASE("t00056", "[test-case][class]")
"namespace": "clanguml::t00056",
"parameters": [],
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 48
},
"statements": [],
@@ -267,7 +267,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "a",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 53
},
"type": "T"
@@ -277,17 +277,14 @@ TEST_CASE("t00056", "[test-case][class]")
"name": "A",
"namespace": "clanguml::t00056",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 52
},
"template_parameters": [
{
"concept_constraint": "clanguml::t00056::max_four_bytes",
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T",
"type": ""
"kind": "template_type",
"name": "T"
}
],
"type": "class"
@@ -307,7 +304,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "b",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 60
},
"type": "T"
@@ -317,16 +314,14 @@ TEST_CASE("t00056", "[test-case][class]")
"name": "B",
"namespace": "clanguml::t00056",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 59
},
"template_parameters": [
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T",
"type": ""
"kind": "template_type",
"name": "T"
}
],
"type": "class"
@@ -346,7 +341,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "c",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 70
},
"type": "T"
@@ -356,17 +351,14 @@ TEST_CASE("t00056", "[test-case][class]")
"name": "C",
"namespace": "clanguml::t00056",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 69
},
"template_parameters": [
{
"concept_constraint": "clanguml::t00056::convertible_to_string",
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T",
"type": ""
"kind": "template_type",
"name": "T"
}
],
"type": "class"
@@ -385,46 +377,34 @@ TEST_CASE("t00056", "[test-case][class]")
"name": "D",
"namespace": "clanguml::t00056",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 75
},
"template_parameters": [
{
"concept_constraint": "clanguml::t00056::iterable",
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T1",
"type": ""
"kind": "template_type",
"name": "T1"
},
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T2",
"type": ""
"kind": "template_type",
"name": "T2"
},
{
"concept_constraint": "clanguml::t00056::iterable",
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T3",
"type": ""
"kind": "template_type",
"name": "T3"
},
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T4",
"type": ""
"kind": "template_type",
"name": "T4"
},
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T5",
"type": ""
"kind": "template_type",
"name": "T5"
}
],
"type": "class"
@@ -444,7 +424,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "e1",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 80
},
"type": "T1"
@@ -454,7 +434,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "e2",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 81
},
"type": "T2"
@@ -464,7 +444,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "e3",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 82
},
"type": "T3"
@@ -474,30 +454,24 @@ TEST_CASE("t00056", "[test-case][class]")
"name": "E",
"namespace": "clanguml::t00056",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 79
},
"template_parameters": [
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T1",
"type": ""
"kind": "template_type",
"name": "T1"
},
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T2",
"type": ""
"kind": "template_type",
"name": "T2"
},
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T3",
"type": ""
"kind": "template_type",
"name": "T3"
}
],
"type": "class"
@@ -517,7 +491,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "f1",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 88
},
"type": "T1"
@@ -527,7 +501,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "f2",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 89
},
"type": "T2"
@@ -537,7 +511,7 @@ TEST_CASE("t00056", "[test-case][class]")
"is_static": false,
"name": "f3",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 90
},
"type": "T3"
@@ -547,30 +521,24 @@ TEST_CASE("t00056", "[test-case][class]")
"name": "F",
"namespace": "clanguml::t00056",
"source_location": {
"file": "/home/bartek/devel/clang-uml/tests/t00056/t00056.cc",
"file": "../../tests/t00056/t00056.cc",
"line": 87
},
"template_parameters": [
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T1",
"type": ""
"kind": "template_type",
"name": "T1"
},
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T2",
"type": ""
"kind": "template_type",
"name": "T2"
},
{
"is_template_parameter": true,
"is_template_template_parameter": false,
"is_variadic": false,
"name": "T3",
"type": ""
"kind": "template_type",
"name": "T3"
}
],
"type": "class"
@@ -666,7 +634,7 @@ TEST_CASE("t00056", "[test-case][class]")
)##";
auto j = generate_class_json(diagram, *model);
// REQUIRE(j == nlohmann::json::parse(expected_json));
REQUIRE(j == nlohmann::json::parse(expected_json));
save_json(config.output_directory() + "/" + diagram->name + ".json", j);
}