diff --git a/src/package_diagram/generators/plantuml/package_diagram_generator.cc b/src/package_diagram/generators/plantuml/package_diagram_generator.cc index 2dc04c9d..bd99e411 100644 --- a/src/package_diagram/generators/plantuml/package_diagram_generator.cc +++ b/src/package_diagram/generators/plantuml/package_diagram_generator.cc @@ -114,7 +114,7 @@ void generator::generate(const package &p, std::ostream &ostr) const { const auto uns = m_config.using_namespace; - ostr << "component [" << p.name() << "] as " << p.alias(); + ostr << "package [" << p.name() << "] as " << p.alias(); if (!p.style().empty()) ostr << " " << p.style(); diff --git a/tests/t30001/test_case.h b/tests/t30001/test_case.h index 7c5af2af..deb80a36 100644 --- a/tests/t30001/test_case.h +++ b/tests/t30001/test_case.h @@ -46,9 +46,9 @@ TEST_CASE("t30001", "[test-case][package]") REQUIRE_THAT(puml, StartsWith("@startuml")); REQUIRE_THAT(puml, EndsWith("@enduml\n")); - REQUIRE_THAT(puml, Contains("component [A]")); - REQUIRE_THAT(puml, Contains("component [AA]")); - REQUIRE_THAT(puml, Contains("component [AAA]")); + REQUIRE_THAT(puml, IsPackage("A")); + REQUIRE_THAT(puml, IsPackage("AAA")); + REQUIRE_THAT(puml, IsPackage("AAA")); save_puml( "./" + config.output_directory + "/" + diagram->name + ".puml", puml); diff --git a/tests/t30002/test_case.h b/tests/t30002/test_case.h index 9161a9ac..0bbd26ad 100644 --- a/tests/t30002/test_case.h +++ b/tests/t30002/test_case.h @@ -46,19 +46,18 @@ TEST_CASE("t30002", "[test-case][package]") REQUIRE_THAT(puml, StartsWith("@startuml")); REQUIRE_THAT(puml, EndsWith("@enduml\n")); - REQUIRE_THAT(puml, Contains("component [A1]")); - REQUIRE_THAT(puml, Contains("component [A2]")); - REQUIRE_THAT(puml, Contains("component [A3]")); - REQUIRE_THAT(puml, Contains("component [A4]")); - REQUIRE_THAT(puml, Contains("component [A5]")); - REQUIRE_THAT(puml, Contains("component [A6]")); - REQUIRE_THAT(puml, Contains("component [A7]")); - REQUIRE_THAT(puml, Contains("component [A8]")); - REQUIRE_THAT(puml, Contains("component [A9]")); - REQUIRE_THAT(puml, Contains("component [A10]")); - REQUIRE_THAT(puml, Contains("component [A11]")); - REQUIRE_THAT(puml, Contains("component [A12]")); - REQUIRE_THAT(puml, Contains("component [A13]")); + REQUIRE_THAT(puml, IsPackage("A1")); + REQUIRE_THAT(puml, IsPackage("A2")); + REQUIRE_THAT(puml, IsPackage("A3")); + REQUIRE_THAT(puml, IsPackage("A4")); + REQUIRE_THAT(puml, IsPackage("A5")); + REQUIRE_THAT(puml, IsPackage("A6")); + REQUIRE_THAT(puml, IsPackage("A7")); + REQUIRE_THAT(puml, IsPackage("A8")); + REQUIRE_THAT(puml, IsPackage("A9")); + REQUIRE_THAT(puml, IsPackage("A11")); + REQUIRE_THAT(puml, IsPackage("A12")); + REQUIRE_THAT(puml, IsPackage("A13")); REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A1"))); REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A2"))); diff --git a/tests/test_cases.h b/tests/test_cases.h index afe8d85b..3fa34dd2 100644 --- a/tests/test_cases.h +++ b/tests/test_cases.h @@ -179,9 +179,9 @@ struct AliasMatcher { patterns.push_back( std::regex{"enum\\s\"" + name + "\"\\sas\\s" + alias_regex}); patterns.push_back( - std::regex{"component\\s\"" + name + "\"\\sas\\s" + alias_regex}); + std::regex{"package\\s\"" + name + "\"\\sas\\s" + alias_regex}); patterns.push_back( - std::regex{"component\\s\\[" + name + "\\]\\sas\\s" + alias_regex}); + std::regex{"package\\s\\[" + name + "\\]\\sas\\s" + alias_regex}); std::smatch base_match; @@ -419,7 +419,7 @@ ContainsMatcher IsPackage(std::string const &str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) { return ContainsMatcher( - CasedString("component [" + str + "]", caseSensitivity)); + CasedString("package [" + str + "]", caseSensitivity)); } } }