Skip to content

Commit 93e34d1

Browse files
grasci-armedriouk
andauthored
Fix GetHierarchicalGroupName() (#1267) (#2148)
for the case the top group name is empty Co-authored-by: Evgueni Driouk <[email protected]>
1 parent 7f1f911 commit 93e34d1

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

libs/rtemodel/src/RteFile.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,8 @@ string RteFileContainer::GetHierarchicalGroupName() const
388388
string groupName = parentGroup->GetHierarchicalGroupName();
389389
if(!name.empty() && !groupName.empty()) {
390390
groupName += ":" + name;
391+
} else {
392+
groupName += name;
391393
}
392394
return groupName;
393395
}

libs/rtemodel/test/src/RteItemTest.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,11 @@ TEST(RteItemTest, GetYamlDeviceAttribute) {
186186
}
187187

188188
TEST(RteItemTest, GetHierarchicalGroupName) {
189-
unique_ptr<RteFileContainer> g0(new RteFileContainer(nullptr));
189+
unique_ptr<RteFileContainer> files(new RteFileContainer(nullptr));
190+
RteFileContainer* g0 = new RteFileContainer(files.get());
190191
g0->AddAttribute("group", "G0");
191-
RteFileContainer* g1 = new RteFileContainer(g0.get());
192+
files->AddChild(g0);
193+
RteFileContainer* g1 = new RteFileContainer(g0);
192194
g1->AddAttribute("name", "G1");
193195
g0->AddChild(g1);
194196
RteFileContainer* g2 = new RteFileContainer(g1); // no name
@@ -201,6 +203,8 @@ TEST(RteItemTest, GetHierarchicalGroupName) {
201203
g3->AddChild(g4);
202204

203205
EXPECT_EQ(g4->GetHierarchicalGroupName(), "G0:G1:G3");
206+
files->AddAttribute("name", "Files");
207+
EXPECT_EQ(g4->GetHierarchicalGroupName(), "Files:G0:G1:G3");
204208
}
205209

206210
TEST(RteItemTest, GetInstancePathName) {

0 commit comments

Comments
 (0)