diff --git a/README.md b/README.md index 8708f725..e64f1156 100644 --- a/README.md +++ b/README.md @@ -167,13 +167,16 @@ template using ASharedPtr = std::shared_ptr>; template using AAPtr = std::unique_ptr, A>>; -template using GeneralCallback = std::function; -using VoidCallback = GeneralCallback<>; +template using SimpleCallback = std::function; +template using GenericCallback = std::function; +using VoidCallback = GenericCallback; using BVector = std::vector; using BVector2 = BVector; using AIntString = AString; +using ACharString = AString; +using AWCharString = AString; using AStringString = AString; using BStringString = AStringString; @@ -194,7 +197,8 @@ protected: public: BVector2 bs2; - GeneralCallback cb; + SimpleCallback cb; + GenericCallback gcb; VoidCallback vcb; VectorPtr vps; }; diff --git a/tests/t00014/t00014.cc b/tests/t00014/t00014.cc index e9b11839..880f7d0b 100644 --- a/tests/t00014/t00014.cc +++ b/tests/t00014/t00014.cc @@ -39,14 +39,16 @@ template using ASharedPtr = std::shared_ptr>; template using AAPtr = std::unique_ptr, A>>; -template using GeneralCallback = std::function; -using VoidCallback = GeneralCallback; +template using SimpleCallback = std::function; +template using GenericCallback = std::function; +using VoidCallback = GenericCallback; using BVector = std::vector; using BVector2 = BVector; using AIntString = AString; using ACharString = AString; +using AWCharString = AString; using AStringString = AString; using BStringString = AStringString; @@ -67,7 +69,8 @@ protected: public: BVector2 bs2; - GeneralCallback cb; + SimpleCallback cb; + GenericCallback gcb; VoidCallback vcb; VectorPtr vps; }; diff --git a/tests/t00014/test_case.h b/tests/t00014/test_case.h index a7427ad3..7b5c0299 100644 --- a/tests/t00014/test_case.h +++ b/tests/t00014/test_case.h @@ -60,7 +60,8 @@ TEST_CASE("t00014", "[test-case][class]") REQUIRE_THAT(puml, IsField("bs", "BVector")); - REQUIRE_THAT(puml, IsField("cb", "GeneralCallback")); + REQUIRE_THAT(puml, IsField("cb", "SimpleCallback")); + REQUIRE_THAT(puml, IsField("gcb", "GenericCallback")); REQUIRE_THAT(puml, IsField("vcb", "VoidCallback")); REQUIRE_THAT( @@ -82,6 +83,8 @@ TEST_CASE("t00014", "[test-case][class]") IsInstantiation(_A("A"), _A("A"))); REQUIRE_THAT(puml, IsInstantiation(_A("A"), _A("A"))); + REQUIRE_THAT(puml, + IsInstantiation(_A("A"), _A("A"))); REQUIRE_THAT(puml, IsInstantiation(_A("A>"), @@ -104,6 +107,7 @@ TEST_CASE("t00014", "[test-case][class]") IsAggregation(_A("R"), _A("A>"), "-floatstring")); REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A"))); + REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A"))); save_puml( "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);