Fixed nested namespace handling

This commit is contained in:
Bartek Kryza
2021-05-02 20:24:30 +02:00
parent 56675a5d6f
commit 35ca011f9b
9 changed files with 229 additions and 54 deletions

12
tests/t00015/.clanguml Normal file
View File

@@ -0,0 +1,12 @@
compilation_database_dir: ..
output_directory: puml
diagrams:
t00015_class:
type: class
glob:
- ../../tests/t00015/t00015.cc
using_namespace:
- clanguml::t00015
include:
namespaces:
- clanguml::t00015

25
tests/t00015/t00015.cc Normal file
View File

@@ -0,0 +1,25 @@
namespace clanguml {
namespace t00015 {
namespace ns1::ns2 {
class A {
};
namespace {
class Anon final : public A {
};
}
}
namespace ns3 {
namespace ns1::ns2 {
class Anon : public t00015::ns1::ns2::A {
};
}
class B : public ns1::ns2::Anon {
};
}
}
}

50
tests/t00015/test_case.h Normal file
View File

@@ -0,0 +1,50 @@
/**
* tests/t00015/test_case.cc
*
* Copyright (c) 2021 Bartek Kryza <bkryza@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
TEST_CASE("t00015", "[test-case][class]")
{
auto [config, db] = load_config("t00015");
auto diagram = config.diagrams["t00015_class"];
REQUIRE(diagram->name == "t00015_class");
REQUIRE(diagram->include.namespaces.size() == 1);
REQUIRE_THAT(diagram->include.namespaces,
VectorContains(std::string{"clanguml::t00015"}));
REQUIRE(diagram->exclude.namespaces.size() == 0);
REQUIRE(diagram->should_include("clanguml::t00015::ns1::ns2::A"));
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name == "t00015_class");
auto puml = generate_class_puml(diagram, model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));
REQUIRE_THAT(puml, EndsWith("@enduml\n"));
REQUIRE_THAT(puml, IsClass(_A("ns1::ns2::A")));
REQUIRE_THAT(puml, IsClass(_A("ns1::ns2::Anon")));
REQUIRE_THAT(puml, IsClass(_A("ns3::B")));
save_puml(
"./" + config.output_directory + "/" + diagram->name + ".puml", puml);
}

View File

@@ -118,6 +118,7 @@ using namespace clanguml::test::matchers;
#include "t00012/test_case.h"
#include "t00013/test_case.h"
#include "t00014/test_case.h"
#include "t00015/test_case.h"
//
// Sequence diagram tests

View File

@@ -39,6 +39,9 @@ test_cases:
- name: t00014
title: Alias template instantiation
description:
- name: t00015
title: Namespace fun
description:
Sequence diagrams:
- name: t20001
title: Basic sequence diagram