diff --git a/Makefile b/Makefile index 6fa445bc..b01ed963 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ document_test_cases: test_plantuml clanguml_diagrams: debug mkdir -p docs/diagrams - debug/src/clang-uml + debug/src/clang-uml -g plantuml -g json plantuml -tsvg -nometadata docs/diagrams/*.puml python3 util/format_svg.py docs/diagrams/*.svg diff --git a/src/class_diagram/generators/json/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc index 451ec035..a4b889fe 100644 --- a/src/class_diagram/generators/json/class_diagram_generator.cc +++ b/src/class_diagram/generators/json/class_diagram_generator.cc @@ -25,7 +25,7 @@ using nlohmann::json; void to_json(nlohmann::json &j, const source_location &sl) { - j = json{{"file", sl.file()}, {"line", sl.line()}}; + j = json{{"file", sl.file_relative()}, {"line", sl.line()}}; } void to_json(nlohmann::json &j, const element &c) @@ -37,9 +37,10 @@ void to_json(nlohmann::json &j, const element &c) if (const auto &comment = c.comment(); comment) j["comment"] = comment.value(); - if (!c.file().empty()) + if (!c.file().empty()) { j["source_location"] = dynamic_cast(c); + } } void to_json(nlohmann::json &j, const template_parameter &c) diff --git a/src/common/model/source_location.h b/src/common/model/source_location.h index ee96c4f3..3b2e89f5 100644 --- a/src/common/model/source_location.h +++ b/src/common/model/source_location.h @@ -36,6 +36,10 @@ public: void set_file(const std::string &file) { file_ = file; } + const std::string &file_relative() const { return file_relative_; } + + void set_file_relative(const std::string &file) { file_relative_ = file; } + unsigned int line() const { return line_; } void set_line(const unsigned line) { line_ = line; } @@ -46,6 +50,7 @@ public: private: std::string file_; + std::string file_relative_; unsigned int line_{0}; unsigned int hash_{0}; }; diff --git a/src/common/visitor/translation_unit_visitor.cc b/src/common/visitor/translation_unit_visitor.cc index bfbb178b..d786db7e 100644 --- a/src/common/visitor/translation_unit_visitor.cc +++ b/src/common/visitor/translation_unit_visitor.cc @@ -26,6 +26,7 @@ namespace clanguml::common::visitor { translation_unit_visitor::translation_unit_visitor( clang::SourceManager &sm, const clanguml::config::diagram &config) : source_manager_{sm} + , relative_to_path_{config.relative_to()} { if (config.comment_parser() == config::comment_parser_t::plain) { comment_visitor_ = @@ -86,6 +87,9 @@ void translation_unit_visitor::set_source_location( { if (location.isValid()) { element.set_file(source_manager_.getFilename(location).str()); + element.set_file_relative(util::path_to_url( + std::filesystem::relative(element.file(), relative_to_path_) + .string())); element.set_line(source_manager_.getSpellingLineNumber(location)); element.set_location_id(location.getHashValue()); } diff --git a/src/common/visitor/translation_unit_visitor.h b/src/common/visitor/translation_unit_visitor.h index 8faa8b8a..5b0d920f 100644 --- a/src/common/visitor/translation_unit_visitor.h +++ b/src/common/visitor/translation_unit_visitor.h @@ -106,5 +106,7 @@ private: clang::SourceManager &source_manager_; std::unique_ptr comment_visitor_; + + std::filesystem::path relative_to_path_; }; } // namespace clanguml::common::visitor diff --git a/tests/t00002/test_case.h b/tests/t00002/test_case.h index c11ace9b..95e9e94b 100644 --- a/tests/t00002/test_case.h +++ b/tests/t00002/test_case.h @@ -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" @@ -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" @@ -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); } \ No newline at end of file diff --git a/tests/t00014/test_case.h b/tests/t00014/test_case.h index d14b9221..17b6f38d 100644 --- a/tests/t00014/test_case.h +++ b/tests/t00014/test_case.h @@ -134,7 +134,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "t", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 22 }, "type": "T" @@ -144,7 +144,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "p", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 23 }, "type": "P" @@ -154,23 +154,19 @@ TEST_CASE("t00014", "[test-case][class]") "name": "A", "namespace": "clanguml::t00014", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 21 }, "template_parameters": [ { - "is_template_parameter": true, - "is_template_template_parameter": false, "is_variadic": false, - "name": "T", - "type": "" + "kind": "template_type", + "name": "T" }, { - "is_template_parameter": true, - "is_template_template_parameter": false, "is_variadic": false, - "name": "P", - "type": "" + "kind": "template_type", + "name": "P" } ], "type": "class" @@ -190,7 +186,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "value", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 27 }, "type": "std::string" @@ -200,7 +196,7 @@ TEST_CASE("t00014", "[test-case][class]") "name": "B", "namespace": "clanguml::t00014", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 26 }, "template_parameters": [], @@ -221,18 +217,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": true, - "is_template_template_parameter": false, "is_variadic": false, - "name": "T", - "type": "" + "kind": "argument", + "type": "T" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::string", - "type": "" + "kind": "argument", + "type": "std::string" } ], "type": "class" @@ -252,18 +244,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": true, - "is_template_template_parameter": false, "is_variadic": false, - "name": "T", - "type": "" + "kind": "argument", + "type": "T" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::unique_ptr", - "type": "" + "kind": "argument", + "type": "std::unique_ptr" } ], "type": "class" @@ -283,18 +271,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "long", - "type": "" + "kind": "argument", + "type": "long" }, { - "is_template_parameter": true, - "is_template_template_parameter": false, "is_variadic": false, - "name": "T", - "type": "" + "kind": "argument", + "type": "T" } ], "type": "class" @@ -314,18 +298,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "double", - "type": "" + "kind": "argument", + "type": "double" }, { - "is_template_parameter": true, - "is_template_template_parameter": false, "is_variadic": false, - "name": "T", - "type": "" + "kind": "argument", + "type": "T" } ], "type": "class" @@ -345,18 +325,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "long", - "type": "" + "kind": "argument", + "type": "long" }, { - "is_template_parameter": true, - "is_template_template_parameter": false, "is_variadic": false, - "name": "U", - "type": "" + "kind": "argument", + "type": "U" } ], "type": "class" @@ -376,18 +352,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "long", - "type": "" + "kind": "argument", + "type": "long" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "bool", - "type": "" + "kind": "argument", + "type": "bool" } ], "type": "class" @@ -407,18 +379,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "double", - "type": "" + "kind": "argument", + "type": "double" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "bool", - "type": "" + "kind": "argument", + "type": "bool" } ], "type": "class" @@ -438,18 +406,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "long", - "type": "" + "kind": "argument", + "type": "long" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "float", - "type": "" + "kind": "argument", + "type": "float" } ], "type": "class" @@ -469,18 +433,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "double", - "type": "" + "kind": "argument", + "type": "double" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "float", - "type": "" + "kind": "argument", + "type": "float" } ], "type": "class" @@ -500,18 +460,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "bool", - "type": "" + "kind": "argument", + "type": "bool" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::string", - "type": "" + "kind": "argument", + "type": "std::string" } ], "type": "class" @@ -531,18 +487,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "float", - "type": "" + "kind": "argument", + "type": "float" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::unique_ptr", - "type": "" + "kind": "argument", + "type": "std::unique_ptr" } ], "type": "class" @@ -562,18 +514,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "int", - "type": "" + "kind": "argument", + "type": "int" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::string", - "type": "" + "kind": "argument", + "type": "std::string" } ], "type": "class" @@ -593,18 +541,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::string", - "type": "" + "kind": "argument", + "type": "std::string" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::string", - "type": "" + "kind": "argument", + "type": "std::string" } ], "type": "class" @@ -624,18 +568,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "char", - "type": "" + "kind": "argument", + "type": "char" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::string", - "type": "" + "kind": "argument", + "type": "std::string" } ], "type": "class" @@ -655,18 +595,14 @@ TEST_CASE("t00014", "[test-case][class]") "namespace": "clanguml::t00014", "template_parameters": [ { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "wchar_t", - "type": "" + "kind": "argument", + "type": "wchar_t" }, { - "is_template_parameter": false, - "is_template_template_parameter": false, "is_variadic": false, - "name": "std::string", - "type": "" + "kind": "argument", + "type": "std::string" } ], "type": "class" @@ -686,7 +622,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "bapair", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 58 }, "type": "PairPairBA" @@ -696,7 +632,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "abool", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 60 }, "type": "APtr" @@ -706,7 +642,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "aboolfloat", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 61 }, "type": "AAPtr" @@ -716,7 +652,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "afloat", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 62 }, "type": "ASharedPtr" @@ -726,7 +662,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "boolstring", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 63 }, "type": "A" @@ -736,7 +672,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "floatstring", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 64 }, "type": "AStringPtr" @@ -746,7 +682,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "intstring", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 65 }, "type": "clanguml::t00014::AIntString" @@ -756,7 +692,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "stringstring", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 66 }, "type": "clanguml::t00014::AStringString" @@ -766,7 +702,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "bstringstring", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 67 }, "type": "clanguml::t00014::BStringString" @@ -776,7 +712,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "bs", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 70 }, "type": "clanguml::t00014::BVector" @@ -786,7 +722,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "bs2", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 73 }, "type": "clanguml::t00014::BVector2" @@ -796,7 +732,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "cb", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 74 }, "type": "SimpleCallback" @@ -806,7 +742,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "gcb", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 75 }, "type": "GenericCallback" @@ -816,7 +752,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "vcb", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 76 }, "type": "clanguml::t00014::VoidCallback" @@ -826,7 +762,7 @@ TEST_CASE("t00014", "[test-case][class]") "is_static": false, "name": "vps", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 77 }, "type": "VectorPtr" @@ -836,7 +772,7 @@ TEST_CASE("t00014", "[test-case][class]") "name": "R", "namespace": "clanguml::t00014", "source_location": { - "file": "/home/bartek/devel/clang-uml/tests/t00014/t00014.cc", + "file": "../../tests/t00014/t00014.cc", "line": 55 }, "template_parameters": [], @@ -1073,7 +1009,7 @@ TEST_CASE("t00014", "[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); } diff --git a/tests/t00036/test_case.h b/tests/t00036/test_case.h index f526f6fb..b9b43ec9 100644 --- a/tests/t00036/test_case.h +++ b/tests/t00036/test_case.h @@ -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" @@ -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); } diff --git a/tests/t00056/test_case.h b/tests/t00056/test_case.h index c30f9ccf..655f3dff 100644 --- a/tests/t00056/test_case.h +++ b/tests/t00056/test_case.h @@ -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); } \ No newline at end of file