test: fixed GraphFilterConductorTestSuite to not use full filepath of file node for comparision

This commit is contained in:
Eberhard Graether
2015-03-04 10:36:29 +01:00
parent 89d3a9ab9f
commit d3ac8bfbcf
2 changed files with 12 additions and 4 deletions
+8 -1
View File
@@ -52,7 +52,14 @@ void FilterableGraph::printBasic(std::ostream& ostream) const
forEachNode( forEachNode(
[&ostream](Node* n) [&ostream](Node* n)
{ {
ostream << ' ' << n->getTypeString() << ':' << n->getFullName(); if (n->isType(Node::NODE_FILE))
{
ostream << ' ' << n->getTypeString() << ':' << n->getName();
}
else
{
ostream << ' ' << n->getTypeString() << ':' << n->getFullName();
}
} }
); );
ostream << '\n'; ostream << '\n';
+4 -3
View File
@@ -98,9 +98,10 @@ public:
printedFilteredTestGraph("!'method'"), printedFilteredTestGraph("!'method'"),
"8 nodes: " "8 nodes: "
"file:/Users/ebsi/Documents/masterproject/bin/test/input.cc class:A field:A::count undefined_type:int " "file:input.cc class:A field:A::count undefined_type:int undefined_type:void class:B function:_main_ "
"undefined_type:void class:B function:_main_ undefined_function:B::B\n" "undefined_function:B::B\n"
"14 edges: child:A->A::count aggregation:A->int aggregation:A->void type_use:A::count->int inheritance:B->A " "14 edges: "
"child:A->A::count aggregation:A->int aggregation:A->void type_use:A::count->int inheritance:B->A "
"aggregation:B->void aggregation:A->B aggregation:B->int return_type:_main_->int type_usage:_main_->B " "aggregation:B->void aggregation:A->B aggregation:B->int return_type:_main_->int type_usage:_main_->B "
"child:B->B::B call:_main_->B::B aggregation:_main_->B aggregation:_main_->A\n" "child:B->B::B call:_main_->B::B aggregation:_main_->B aggregation:_main_->A\n"
); );