From 6ab2e6044aa7e8dfbf5ad1e597200b318704fd94 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Thu, 13 Aug 2020 16:24:20 +1200 Subject: [PATCH] Fix connectionsPersistAfterImporting text in tests/variable/variable.cpp. --- tests/variable/variable.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/variable/variable.cpp b/tests/variable/variable.cpp index a6adfcd84..447d10605 100644 --- a/tests/variable/variable.cpp +++ b/tests/variable/variable.cpp @@ -1703,19 +1703,22 @@ TEST(Variable, variableInterfaceDontDowngrade) TEST(Variable, connectionsPersistAfterImporting) { auto model = libcellml::Model::create("model"); + auto importer = libcellml::Importer::create(); + auto importedComponent = libcellml::Component::create("importedComponent"); model->addComponent(importedComponent); - auto importer = libcellml::ImportSource::create(); - importer->setUrl("importedModelWithMaps.cellml"); - importedComponent->setImportSource(importer); + auto importSource = libcellml::ImportSource::create(); + importSource->setUrl("importedModelWithMaps.cellml"); + importedComponent->setImportSource(importSource); importedComponent->setImportReference("importMe"); EXPECT_TRUE(model->hasUnresolvedImports()); - model->resolveImports(resourcePath()); + importer->resolveImports(model, resourcePath()); EXPECT_FALSE(model->hasUnresolvedImports()); - model->flatten(); + model = importer->flattenModel(model); + EXPECT_NE(nullptr, model->component("importedComponent")); EXPECT_NE(nullptr, model->component("importedComponent")->component("child1")); EXPECT_NE(nullptr, model->component("importedComponent")->component("child2"));