Material: Continued Material enahncements
Continues the work of the material subsystem improvements. Several important items are included in this merge. In terms of new capabilities, this merge adds List and MultiLineString as valid property types, complete with editing dialogs. This will help with backwards compatibility for external workbenches, such as Render. Stability has been a big focus. New unit tests help to verify features work as expected. Bugs have been fixed and crashes avoided. Material cards have had a renaming to their tree structure. For example, 'StandardMeterials' is redundant, so this was renamed to 'Standard'. The cards themselves are more compliant fully passing the yamllint tests. More soon.
This commit is contained in:
David Carter
committed by
Chris Hennes
Chris Hennes
parent
c81bd982b5
commit
332bf7ed08
178
tests/src/Mod/Material/App/TestMaterialCards.cpp
Normal file
178
tests/src/Mod/Material/App/TestMaterialCards.cpp
Normal file
@@ -0,0 +1,178 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
/***************************************************************************
|
||||
* Copyright (c) 2023 David Carter <dcarter@david.carter.ca> *
|
||||
* *
|
||||
* This file is part of FreeCAD. *
|
||||
* *
|
||||
* FreeCAD is free software: you can redistribute it and/or modify it *
|
||||
* under the terms of the GNU Lesser General Public License as *
|
||||
* published by the Free Software Foundation, either version 2.1 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* FreeCAD is distributed in the hope that it will be useful, but *
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
|
||||
* Lesser General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU Lesser General Public *
|
||||
* License along with FreeCAD. If not, see *
|
||||
* <https://www.gnu.org/licenses/>. *
|
||||
* *
|
||||
**************************************************************************/
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
#include <Mod/Material/App/PreCompiled.h>
|
||||
#ifndef _PreComp_
|
||||
#endif
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <Base/Quantity.h>
|
||||
#include <Gui/MetaTypes.h>
|
||||
|
||||
#include <Mod/Material/App/MaterialLibrary.h>
|
||||
#include <Mod/Material/App/MaterialManager.h>
|
||||
#include <Mod/Material/App/Model.h>
|
||||
#include <Mod/Material/App/ModelManager.h>
|
||||
#include <Mod/Material/App/ModelUuids.h>
|
||||
|
||||
// clang-format off
|
||||
|
||||
class TestMaterialCards : public ::testing::Test {
|
||||
protected:
|
||||
static void SetUpTestSuite() {
|
||||
if (App::Application::GetARGC() == 0) {
|
||||
constexpr int argc = 1;
|
||||
std::array<char*, argc> argv {"FreeCAD"};
|
||||
App::Application::Config()["ExeName"] = "FreeCAD";
|
||||
App::Application::init(argc, argv.data());
|
||||
}
|
||||
}
|
||||
|
||||
void SetUp() override {
|
||||
// Create a temporary library
|
||||
QString libPath = QDir::tempPath() + QString::fromStdString("/TestMaterialCards");
|
||||
QDir libDir(libPath);
|
||||
libDir.removeRecursively(); // Clear old run data
|
||||
libDir.mkdir(libPath);
|
||||
_library = std::make_shared<Materials::MaterialLibrary>(QString::fromStdString("Testing"),
|
||||
libPath,
|
||||
QString::fromStdString(":/icons/preferences-general.svg"),
|
||||
false);
|
||||
_modelManager = new Materials::ModelManager();
|
||||
_materialManager = new Materials::MaterialManager();
|
||||
}
|
||||
|
||||
// void TearDown() override {}
|
||||
Materials::ModelManager* _modelManager;
|
||||
Materials::MaterialManager* _materialManager;
|
||||
std::shared_ptr<Materials::MaterialLibrary> _library;
|
||||
};
|
||||
|
||||
TEST_F(TestMaterialCards, TestCopy)
|
||||
{
|
||||
EXPECT_NE(_modelManager, nullptr);
|
||||
EXPECT_TRUE(_library);
|
||||
// FAIL() << "Test library " << _library->getDirectoryPath().toStdString() << "\n";
|
||||
|
||||
auto testMaterial = _materialManager->getMaterial(Materials::ModelUUIDs::ModelUUID_Test_Material);
|
||||
auto newMaterial = std::make_shared<Materials::Material>(*testMaterial);
|
||||
|
||||
EXPECT_EQ(testMaterial->getUUID(), Materials::ModelUUIDs::ModelUUID_Test_Material);
|
||||
EXPECT_EQ(newMaterial->getUUID(), Materials::ModelUUIDs::ModelUUID_Test_Material);
|
||||
|
||||
// Save the material
|
||||
_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material2.FCMat"),
|
||||
false, // overwrite
|
||||
true, // saveAsCopy
|
||||
false); // saveInherited
|
||||
EXPECT_EQ(newMaterial->getUUID(), Materials::ModelUUIDs::ModelUUID_Test_Material);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2"));
|
||||
|
||||
// Save it when it already exists throwing an error
|
||||
EXPECT_THROW(_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material2.FCMat"),
|
||||
false, // overwrite
|
||||
true, // saveAsCopy
|
||||
false) // saveInherited
|
||||
, Materials::MaterialExists);
|
||||
EXPECT_EQ(newMaterial->getUUID(), Materials::ModelUUIDs::ModelUUID_Test_Material);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2"));
|
||||
|
||||
// Overwrite the existing file
|
||||
_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material2.FCMat"),
|
||||
true, // overwrite
|
||||
true, // saveAsCopy
|
||||
false);// saveInherited
|
||||
EXPECT_EQ(newMaterial->getUUID(), Materials::ModelUUIDs::ModelUUID_Test_Material);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2"));
|
||||
|
||||
// Save to a new file, inheritance mode
|
||||
_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material3.FCMat"),
|
||||
false, // overwrite
|
||||
true, // saveAsCopy
|
||||
true);// saveInherited
|
||||
EXPECT_EQ(newMaterial->getUUID(), Materials::ModelUUIDs::ModelUUID_Test_Material);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material3"));
|
||||
|
||||
// Save to a new file, inheritance mode. no copy
|
||||
_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material4.FCMat"),
|
||||
false, // overwrite
|
||||
false, // saveAsCopy
|
||||
true);// saveInherited
|
||||
EXPECT_NE(newMaterial->getUUID(), Materials::ModelUUIDs::ModelUUID_Test_Material);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material4"));
|
||||
QString uuid1 = newMaterial->getUUID();
|
||||
|
||||
// Save to a new file, inheritance mode, testing overwrite, new copy
|
||||
_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material5.FCMat"),
|
||||
false, // overwrite
|
||||
true, // saveAsCopy
|
||||
true);// saveInherited
|
||||
EXPECT_EQ(newMaterial->getUUID(), uuid1);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material5"));
|
||||
|
||||
_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material5.FCMat"),
|
||||
true, // overwrite
|
||||
true, // saveAsCopy
|
||||
true);// saveInherited
|
||||
EXPECT_EQ(newMaterial->getUUID(), uuid1);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material5"));
|
||||
|
||||
// Save to a new file, inheritance mode, testing overwrite as no copy, new copy
|
||||
_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material6.FCMat"),
|
||||
false, // overwrite
|
||||
true, // saveAsCopy
|
||||
true);// saveInherited
|
||||
EXPECT_EQ(newMaterial->getUUID(), uuid1);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material6"));
|
||||
|
||||
_materialManager->saveMaterial(_library,
|
||||
newMaterial,
|
||||
QString::fromStdString("/Test Material6.FCMat"),
|
||||
true, // overwrite
|
||||
false, // saveAsCopy
|
||||
true);// saveInherited
|
||||
EXPECT_EQ(newMaterial->getUUID(), uuid1);
|
||||
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material6"));
|
||||
}
|
||||
|
||||
// clang-format on
|
||||
Reference in New Issue
Block a user