diff --git a/tests/src/Mod/Material/App/TestMaterialCards.cpp b/tests/src/Mod/Material/App/TestMaterialCards.cpp index 67ab9269eb..435ba19822 100644 --- a/tests/src/Mod/Material/App/TestMaterialCards.cpp +++ b/tests/src/Mod/Material/App/TestMaterialCards.cpp @@ -53,18 +53,18 @@ protected: void SetUp() override { // Create a temporary library - QString libPath = QDir::tempPath() + QString::fromStdString("/TestMaterialCards"); + QString libPath = QDir::tempPath() + QStringLiteral("/TestMaterialCards"); QDir libDir(libPath); libDir.removeRecursively(); // Clear old run data libDir.mkdir(libPath); - _library = std::make_shared(QString::fromStdString("Testing"), + _library = std::make_shared(QStringLiteral("Testing"), libPath, - QString::fromStdString(":/icons/preferences-general.svg"), + QStringLiteral(":/icons/preferences-general.svg"), false); _modelManager = new Materials::ModelManager(); _materialManager = new Materials::MaterialManager(); - _testMaterialUUID = QString::fromStdString("c6c64159-19c1-40b5-859c-10561f20f979"); + _testMaterialUUID = QStringLiteral("c6c64159-19c1-40b5-859c-10561f20f979"); } // void TearDown() override {} @@ -89,92 +89,92 @@ TEST_F(TestMaterialCards, TestCopy) // Save the material _materialManager->saveMaterial(_library, newMaterial, - QString::fromStdString("/Test Material2.FCMat"), + QStringLiteral("/Test Material2.FCMat"), false, // overwrite true, // saveAsCopy false); // saveInherited EXPECT_EQ(newMaterial->getUUID(), _testMaterialUUID); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material2")); // Save it when it already exists throwing an error EXPECT_THROW(_materialManager->saveMaterial(_library, newMaterial, - QString::fromStdString("/Test Material2.FCMat"), + QStringLiteral("/Test Material2.FCMat"), false, // overwrite true, // saveAsCopy false) // saveInherited , Materials::MaterialExists); EXPECT_EQ(newMaterial->getUUID(), _testMaterialUUID); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material2")); // Overwrite the existing file _materialManager->saveMaterial(_library, newMaterial, - QString::fromStdString("/Test Material2.FCMat"), + QStringLiteral("/Test Material2.FCMat"), true, // overwrite true, // saveAsCopy false);// saveInherited EXPECT_EQ(newMaterial->getUUID(), _testMaterialUUID); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material2")); // Save to a new file, inheritance mode _materialManager->saveMaterial(_library, newMaterial, - QString::fromStdString("/Test Material3.FCMat"), + QStringLiteral("/Test Material3.FCMat"), false, // overwrite true, // saveAsCopy true);// saveInherited EXPECT_EQ(newMaterial->getUUID(), _testMaterialUUID); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material3")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material3")); // Save to a new file, inheritance mode. no copy _materialManager->saveMaterial(_library, newMaterial, - QString::fromStdString("/Test Material4.FCMat"), + QStringLiteral("/Test Material4.FCMat"), false, // overwrite false, // saveAsCopy true);// saveInherited EXPECT_NE(newMaterial->getUUID(), _testMaterialUUID); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material4")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("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"), + QStringLiteral("/Test Material5.FCMat"), false, // overwrite true, // saveAsCopy true);// saveInherited EXPECT_EQ(newMaterial->getUUID(), uuid1); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material5")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material5")); _materialManager->saveMaterial(_library, newMaterial, - QString::fromStdString("/Test Material5.FCMat"), + QStringLiteral("/Test Material5.FCMat"), true, // overwrite true, // saveAsCopy true);// saveInherited EXPECT_EQ(newMaterial->getUUID(), uuid1); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material5")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("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"), + QStringLiteral("/Test Material6.FCMat"), false, // overwrite true, // saveAsCopy true);// saveInherited EXPECT_EQ(newMaterial->getUUID(), uuid1); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material6")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material6")); _materialManager->saveMaterial(_library, newMaterial, - QString::fromStdString("/Test Material6.FCMat"), + QStringLiteral("/Test Material6.FCMat"), true, // overwrite false, // saveAsCopy true);// saveInherited EXPECT_EQ(newMaterial->getUUID(), uuid1); - EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material6")); + EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material6")); } TEST_F(TestMaterialCards, TestColumns) @@ -184,18 +184,18 @@ TEST_F(TestMaterialCards, TestColumns) auto testMaterial = _materialManager->getMaterial(_testMaterialUUID); - EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray2D"))); - auto array2d = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray2D"))->getMaterialValue(); + EXPECT_TRUE(testMaterial->hasPhysicalProperty(QStringLiteral("TestArray2D"))); + auto array2d = testMaterial->getPhysicalProperty(QStringLiteral("TestArray2D"))->getMaterialValue(); EXPECT_TRUE(array2d); EXPECT_EQ(dynamic_cast(*array2d).columns(), 2); - EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray2D3Column"))); - auto array2d3Column = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray2D3Column"))->getMaterialValue(); + EXPECT_TRUE(testMaterial->hasPhysicalProperty(QStringLiteral("TestArray2D3Column"))); + auto array2d3Column = testMaterial->getPhysicalProperty(QStringLiteral("TestArray2D3Column"))->getMaterialValue(); EXPECT_TRUE(array2d3Column); EXPECT_EQ(dynamic_cast(*array2d3Column).columns(), 3); - EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray3D"))); - auto array3d = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray3D"))->getMaterialValue(); + EXPECT_TRUE(testMaterial->hasPhysicalProperty(QStringLiteral("TestArray3D"))); + auto array3d = testMaterial->getPhysicalProperty(QStringLiteral("TestArray3D"))->getMaterialValue(); EXPECT_TRUE(array3d); EXPECT_EQ(dynamic_cast(*array3d).columns(), 2); } diff --git a/tests/src/Mod/Material/App/TestMaterialProperties.cpp b/tests/src/Mod/Material/App/TestMaterialProperties.cpp index b41294160b..c1f4a2a26e 100644 --- a/tests/src/Mod/Material/App/TestMaterialProperties.cpp +++ b/tests/src/Mod/Material/App/TestMaterialProperties.cpp @@ -48,56 +48,56 @@ protected: void SetUp() override { // 2D Properties - modelProp = Materials::ModelProperty(QString::fromStdString("Density"), // Name - QString::fromStdString("D"), // Header - QString::fromStdString("2DArray"), // Type - QString::fromStdString(""), // Units - QString::fromStdString(""), // URL - QString::fromStdString("desc")); // Description - modelProp1 = Materials::ModelProperty(QString::fromStdString("Temperature"), - QString::fromStdString("T"), - QString::fromStdString("Quantity"), - QString::fromStdString("C"), - QString::fromStdString(""), - QString::fromStdString("desc1")); - modelProp2 = Materials::ModelProperty( - QString::fromStdString("Density"), - QString::fromStdString("D"), - QString::fromStdString("Quantity"), - QString::fromStdString("kg/m^3"), - QString::fromStdString("https://en.wikipedia.org/wiki/Density"), - QString::fromStdString("desc2")); + modelProp = Materials::ModelProperty(QStringLiteral("Density"), // Name + QStringLiteral("D"), // Header + QStringLiteral("2DArray"), // Type + QStringLiteral(""), // Units + QStringLiteral(""), // URL + QStringLiteral("desc")); // Description + modelProp1 = Materials::ModelProperty(QStringLiteral("Temperature"), + QStringLiteral("T"), + QStringLiteral("Quantity"), + QStringLiteral("C"), + QStringLiteral(""), + QStringLiteral("desc1")); + modelProp2 = + Materials::ModelProperty(QStringLiteral("Density"), + QStringLiteral("D"), + QStringLiteral("Quantity"), + QStringLiteral("kg/m^3"), + QStringLiteral("https://en.wikipedia.org/wiki/Density"), + QStringLiteral("desc2")); modelProp.addColumn(modelProp1); modelProp.addColumn(modelProp2); // 3D properties model3DProp = Materials::ModelProperty( - QString::fromStdString("StressStrain"), // Name - QString::fromStdString("Stress / Strain"), // Header - QString::fromStdString("3DArray"), // Type - QString::fromStdString(""), // Units - QString::fromStdString(""), // URL - QString::fromStdString("3 Dimensional array showing stress and strain as a function of " - "temperature")); // Description - model3DProp1 = Materials::ModelProperty(QString::fromStdString("Temperature"), - QString::fromStdString("T"), - QString::fromStdString("Quantity"), - QString::fromStdString("C"), - QString::fromStdString(""), - QString::fromStdString("desc1")); - model3DProp2 = Materials::ModelProperty(QString::fromStdString("Stress"), - QString::fromStdString("Stress"), - QString::fromStdString("Quantity"), - QString::fromStdString("MPa"), - QString::fromStdString(""), - QString::fromStdString("desc2")); - model3DProp3 = Materials::ModelProperty(QString::fromStdString("Strain"), - QString::fromStdString("Strain"), - QString::fromStdString("Quantity"), - QString::fromStdString("MPa"), - QString::fromStdString(""), - QString::fromStdString("desc3")); + QStringLiteral("StressStrain"), // Name + QStringLiteral("Stress / Strain"), // Header + QStringLiteral("3DArray"), // Type + QStringLiteral(""), // Units + QStringLiteral(""), // URL + QStringLiteral("3 Dimensional array showing stress and strain as a function of " + "temperature")); // Description + model3DProp1 = Materials::ModelProperty(QStringLiteral("Temperature"), + QStringLiteral("T"), + QStringLiteral("Quantity"), + QStringLiteral("C"), + QStringLiteral(""), + QStringLiteral("desc1")); + model3DProp2 = Materials::ModelProperty(QStringLiteral("Stress"), + QStringLiteral("Stress"), + QStringLiteral("Quantity"), + QStringLiteral("MPa"), + QStringLiteral(""), + QStringLiteral("desc2")); + model3DProp3 = Materials::ModelProperty(QStringLiteral("Strain"), + QStringLiteral("Strain"), + QStringLiteral("Quantity"), + QStringLiteral("MPa"), + QStringLiteral(""), + QStringLiteral("desc3")); model3DProp.addColumn(model3DProp1); model3DProp.addColumn(model3DProp2); diff --git a/tests/src/Mod/Material/App/TestMaterialValue.cpp b/tests/src/Mod/Material/App/TestMaterialValue.cpp index 15c8afcc2e..b31fd82d99 100644 --- a/tests/src/Mod/Material/App/TestMaterialValue.cpp +++ b/tests/src/Mod/Material/App/TestMaterialValue.cpp @@ -82,7 +82,7 @@ TEST_F(TestMaterialValue, TestBooleanType) EXPECT_FALSE(variant.toString().isNull()); EXPECT_FALSE(variant.toString().isEmpty()); EXPECT_EQ(variant.toString().size(), 5); - EXPECT_EQ(variant.toString(), QString::fromStdString("false")); + EXPECT_EQ(variant.toString(), QStringLiteral("false")); EXPECT_EQ(variant.toBool(), false); } @@ -97,7 +97,7 @@ TEST_F(TestMaterialValue, TestIntegerType) EXPECT_FALSE(variant.toString().isNull()); EXPECT_FALSE(variant.toString().isEmpty()); EXPECT_EQ(variant.toString().size(), 1); - EXPECT_EQ(variant.toString(), QString::fromStdString("0")); + EXPECT_EQ(variant.toString(), QStringLiteral("0")); EXPECT_EQ(variant.toInt(), 0); } @@ -112,7 +112,7 @@ TEST_F(TestMaterialValue, TestFloatType) EXPECT_FALSE(variant.toString().isNull()); EXPECT_FALSE(variant.toString().isEmpty()); EXPECT_EQ(variant.toString().size(), 1); - EXPECT_EQ(variant.toString(), QString::fromStdString("0")); + EXPECT_EQ(variant.toString(), QStringLiteral("0")); EXPECT_EQ(variant.toFloat(), 0); } diff --git a/tests/src/Mod/Material/App/TestMaterials.cpp b/tests/src/Mod/Material/App/TestMaterials.cpp index 3843d5f199..b1940c7d2e 100644 --- a/tests/src/Mod/Material/App/TestMaterials.cpp +++ b/tests/src/Mod/Material/App/TestMaterials.cpp @@ -85,15 +85,15 @@ TEST_F(TestMaterial, TestMaterialsWithModel) ASSERT_NE(_materialManager, nullptr); auto materials = _materialManager->materialsWithModel( - QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic + QStringLiteral("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic EXPECT_GT(materials->size(), 0); auto materialsComplete = _materialManager->materialsWithModelComplete( - QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic + QStringLiteral("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic EXPECT_LE(materialsComplete->size(), materials->size()); auto materialsLinearElastic = _materialManager->materialsWithModel( - QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); // LinearElastic + QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); // LinearElastic // All LinearElastic models should be in IsotropicLinearElastic since it is inherited EXPECT_LE(materialsLinearElastic->size(), materials->size()); @@ -108,27 +108,27 @@ TEST_F(TestMaterial, TestMaterialByPath) ASSERT_NE(_materialManager, nullptr); auto steel = _materialManager->getMaterialByPath( - QString::fromStdString("Standard/Metal/Steel/CalculiX-Steel.FCMat"), - QString::fromStdString("System")); + QStringLiteral("Standard/Metal/Steel/CalculiX-Steel.FCMat"), + QStringLiteral("System")); EXPECT_NE(&steel, nullptr); - EXPECT_EQ(steel->getName(), QString::fromStdString("CalculiX-Steel")); - EXPECT_EQ(steel->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d")); + EXPECT_EQ(steel->getName(), QStringLiteral("CalculiX-Steel")); + EXPECT_EQ(steel->getUUID(), QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d")); // The same but with a leading '/' auto steel2 = _materialManager->getMaterialByPath( - QString::fromStdString("/Standard/Metal/Steel/CalculiX-Steel.FCMat"), - QString::fromStdString("System")); + QStringLiteral("/Standard/Metal/Steel/CalculiX-Steel.FCMat"), + QStringLiteral("System")); EXPECT_NE(&steel2, nullptr); - EXPECT_EQ(steel2->getName(), QString::fromStdString("CalculiX-Steel")); - EXPECT_EQ(steel2->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d")); + EXPECT_EQ(steel2->getName(), QStringLiteral("CalculiX-Steel")); + EXPECT_EQ(steel2->getUUID(), QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d")); // Same with the library name as a prefix auto steel3 = _materialManager->getMaterialByPath( - QString::fromStdString("/System/Standard/Metal/Steel/CalculiX-Steel.FCMat"), - QString::fromStdString("System")); + QStringLiteral("/System/Standard/Metal/Steel/CalculiX-Steel.FCMat"), + QStringLiteral("System")); EXPECT_NE(&steel3, nullptr); - EXPECT_EQ(steel3->getName(), QString::fromStdString("CalculiX-Steel")); - EXPECT_EQ(steel3->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d")); + EXPECT_EQ(steel3->getName(), QStringLiteral("CalculiX-Steel")); + EXPECT_EQ(steel3->getUUID(), QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d")); } TEST_F(TestMaterial, TestAddPhysicalModel) @@ -232,9 +232,9 @@ TEST_F(TestMaterial, TestCalculiXSteel) { ASSERT_NE(_materialManager, nullptr); - auto steel = _materialManager->getMaterial(QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d")); - EXPECT_EQ(steel->getName(), QString::fromStdString("CalculiX-Steel")); - EXPECT_EQ(steel->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d")); + auto steel = _materialManager->getMaterial(QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d")); + EXPECT_EQ(steel->getName(), QStringLiteral("CalculiX-Steel")); + EXPECT_EQ(steel->getUUID(), QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d")); EXPECT_TRUE(steel->hasPhysicalModel(Materials::ModelUUIDs::ModelUUID_Mechanical_Density)); // Density EXPECT_TRUE(steel->hasPhysicalModel(Materials::ModelUUIDs::ModelUUID_Mechanical_IsotropicLinearElastic)); // IsotropicLinearElastic @@ -248,105 +248,105 @@ TEST_F(TestMaterial, TestCalculiXSteel) EXPECT_FALSE(steel->isPhysicalModelComplete(Materials::ModelUUIDs::ModelUUID_Mechanical_LinearElastic)); // Legacy linear elastic - Not in the model EXPECT_TRUE(steel->isAppearanceModelComplete(Materials::ModelUUIDs::ModelUUID_Rendering_Basic)); // BasicRendering - inherited from Steel.FCMat - EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("Density"))); - EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("BulkModulus"))); - EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("PoissonRatio"))); - EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("YoungsModulus"))); - EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("ShearModulus"))); - EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("SpecificHeat"))); - EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("ThermalConductivity"))); - EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("ThermalExpansionCoefficient"))); - EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("AmbientColor"))); - EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("DiffuseColor"))); - EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("EmissiveColor"))); - EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("Shininess"))); - EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("SpecularColor"))); - EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("Transparency"))); + EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("Density"))); + EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("BulkModulus"))); + EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("PoissonRatio"))); + EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("YoungsModulus"))); + EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("ShearModulus"))); + EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("SpecificHeat"))); + EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("ThermalConductivity"))); + EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("ThermalExpansionCoefficient"))); + EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("AmbientColor"))); + EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("DiffuseColor"))); + EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("EmissiveColor"))); + EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("Shininess"))); + EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("SpecularColor"))); + EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("Transparency"))); auto& properties = steel->getPhysicalProperties(); - EXPECT_NO_THROW(properties.at(QString::fromStdString("Density"))); - EXPECT_NO_THROW(properties.at(QString::fromStdString("BulkModulus"))); // This is different from the Python behaviour - EXPECT_NO_THROW(properties.at(QString::fromStdString("PoissonRatio"))); - EXPECT_NO_THROW(properties.at(QString::fromStdString("YoungsModulus"))); - EXPECT_NO_THROW(properties.at(QString::fromStdString("ShearModulus"))); - EXPECT_NO_THROW(properties.at(QString::fromStdString("SpecificHeat"))); - EXPECT_NO_THROW(properties.at(QString::fromStdString("ThermalConductivity"))); - EXPECT_NO_THROW(properties.at(QString::fromStdString("ThermalExpansionCoefficient"))); - EXPECT_THROW(properties.at(QString::fromStdString("AmbientColor")), std::out_of_range); - EXPECT_THROW(properties.at(QString::fromStdString("DiffuseColor")), std::out_of_range); - EXPECT_THROW(properties.at(QString::fromStdString("EmissiveColor")), std::out_of_range); - EXPECT_THROW(properties.at(QString::fromStdString("Shininess")), std::out_of_range); - EXPECT_THROW(properties.at(QString::fromStdString("SpecularColor")), std::out_of_range); - EXPECT_THROW(properties.at(QString::fromStdString("Transparency")), std::out_of_range); + EXPECT_NO_THROW(properties.at(QStringLiteral("Density"))); + EXPECT_NO_THROW(properties.at(QStringLiteral("BulkModulus"))); // This is different from the Python behaviour + EXPECT_NO_THROW(properties.at(QStringLiteral("PoissonRatio"))); + EXPECT_NO_THROW(properties.at(QStringLiteral("YoungsModulus"))); + EXPECT_NO_THROW(properties.at(QStringLiteral("ShearModulus"))); + EXPECT_NO_THROW(properties.at(QStringLiteral("SpecificHeat"))); + EXPECT_NO_THROW(properties.at(QStringLiteral("ThermalConductivity"))); + EXPECT_NO_THROW(properties.at(QStringLiteral("ThermalExpansionCoefficient"))); + EXPECT_THROW(properties.at(QStringLiteral("AmbientColor")), std::out_of_range); + EXPECT_THROW(properties.at(QStringLiteral("DiffuseColor")), std::out_of_range); + EXPECT_THROW(properties.at(QStringLiteral("EmissiveColor")), std::out_of_range); + EXPECT_THROW(properties.at(QStringLiteral("Shininess")), std::out_of_range); + EXPECT_THROW(properties.at(QStringLiteral("SpecularColor")), std::out_of_range); + EXPECT_THROW(properties.at(QStringLiteral("Transparency")), std::out_of_range); auto& properties1 = steel->getAppearanceProperties(); - EXPECT_THROW(properties1.at(QString::fromStdString("Density")), std::out_of_range); - EXPECT_THROW(properties1.at(QString::fromStdString("BulkModulus")), std::out_of_range); - EXPECT_THROW(properties1.at(QString::fromStdString("PoissonRatio")), std::out_of_range); - EXPECT_THROW(properties1.at(QString::fromStdString("YoungsModulus")), std::out_of_range); - EXPECT_THROW(properties1.at(QString::fromStdString("ShearModulus")), std::out_of_range); - EXPECT_THROW(properties1.at(QString::fromStdString("SpecificHeat")), std::out_of_range); - EXPECT_THROW(properties1.at(QString::fromStdString("ThermalConductivity")), std::out_of_range); - EXPECT_THROW(properties1.at(QString::fromStdString("ThermalExpansionCoefficient")), std::out_of_range); - EXPECT_NO_THROW(properties1.at(QString::fromStdString("AmbientColor"))); - EXPECT_NO_THROW(properties1.at(QString::fromStdString("DiffuseColor"))); - EXPECT_NO_THROW(properties1.at(QString::fromStdString("EmissiveColor"))); - EXPECT_NO_THROW(properties1.at(QString::fromStdString("Shininess"))); - EXPECT_NO_THROW(properties1.at(QString::fromStdString("SpecularColor"))); - EXPECT_NO_THROW(properties1.at(QString::fromStdString("Transparency"))); + EXPECT_THROW(properties1.at(QStringLiteral("Density")), std::out_of_range); + EXPECT_THROW(properties1.at(QStringLiteral("BulkModulus")), std::out_of_range); + EXPECT_THROW(properties1.at(QStringLiteral("PoissonRatio")), std::out_of_range); + EXPECT_THROW(properties1.at(QStringLiteral("YoungsModulus")), std::out_of_range); + EXPECT_THROW(properties1.at(QStringLiteral("ShearModulus")), std::out_of_range); + EXPECT_THROW(properties1.at(QStringLiteral("SpecificHeat")), std::out_of_range); + EXPECT_THROW(properties1.at(QStringLiteral("ThermalConductivity")), std::out_of_range); + EXPECT_THROW(properties1.at(QStringLiteral("ThermalExpansionCoefficient")), std::out_of_range); + EXPECT_NO_THROW(properties1.at(QStringLiteral("AmbientColor"))); + EXPECT_NO_THROW(properties1.at(QStringLiteral("DiffuseColor"))); + EXPECT_NO_THROW(properties1.at(QStringLiteral("EmissiveColor"))); + EXPECT_NO_THROW(properties1.at(QStringLiteral("Shininess"))); + EXPECT_NO_THROW(properties1.at(QStringLiteral("SpecularColor"))); + EXPECT_NO_THROW(properties1.at(QStringLiteral("Transparency"))); - EXPECT_FALSE(properties[QString::fromStdString("Density")]->isNull()); - EXPECT_TRUE(properties[QString::fromStdString("BulkModulus")]->isNull()); - EXPECT_FALSE(properties[QString::fromStdString("PoissonRatio")]->isNull()); - EXPECT_FALSE(properties[QString::fromStdString("YoungsModulus")]->isNull()); - EXPECT_TRUE(properties[QString::fromStdString("ShearModulus")]->isNull()); - EXPECT_FALSE(properties[QString::fromStdString("SpecificHeat")]->isNull()); - EXPECT_FALSE(properties[QString::fromStdString("ThermalConductivity")]->isNull()); - EXPECT_FALSE(properties[QString::fromStdString("ThermalExpansionCoefficient")]->isNull()); - EXPECT_FALSE(properties1[QString::fromStdString("AmbientColor")]->isNull()); - EXPECT_FALSE(properties1[QString::fromStdString("DiffuseColor")]->isNull()); - EXPECT_FALSE(properties1[QString::fromStdString("EmissiveColor")]->isNull()); - EXPECT_FALSE(properties1[QString::fromStdString("Shininess")]->isNull()); - EXPECT_FALSE(properties1[QString::fromStdString("SpecularColor")]->isNull()); - EXPECT_FALSE(properties1[QString::fromStdString("Transparency")]->isNull()); + EXPECT_FALSE(properties[QStringLiteral("Density")]->isNull()); + EXPECT_TRUE(properties[QStringLiteral("BulkModulus")]->isNull()); + EXPECT_FALSE(properties[QStringLiteral("PoissonRatio")]->isNull()); + EXPECT_FALSE(properties[QStringLiteral("YoungsModulus")]->isNull()); + EXPECT_TRUE(properties[QStringLiteral("ShearModulus")]->isNull()); + EXPECT_FALSE(properties[QStringLiteral("SpecificHeat")]->isNull()); + EXPECT_FALSE(properties[QStringLiteral("ThermalConductivity")]->isNull()); + EXPECT_FALSE(properties[QStringLiteral("ThermalExpansionCoefficient")]->isNull()); + EXPECT_FALSE(properties1[QStringLiteral("AmbientColor")]->isNull()); + EXPECT_FALSE(properties1[QStringLiteral("DiffuseColor")]->isNull()); + EXPECT_FALSE(properties1[QStringLiteral("EmissiveColor")]->isNull()); + EXPECT_FALSE(properties1[QStringLiteral("Shininess")]->isNull()); + EXPECT_FALSE(properties1[QStringLiteral("SpecularColor")]->isNull()); + EXPECT_FALSE(properties1[QStringLiteral("Transparency")]->isNull()); QLocale locale; - EXPECT_EQ(properties[QString::fromStdString("Density")]->getString(), parseQuantity("7900.00 kg/m^3")); - EXPECT_EQ(properties[QString::fromStdString("PoissonRatio")]->getString(), locale.toString(0.3)); - EXPECT_EQ(properties[QString::fromStdString("YoungsModulus")]->getString(), parseQuantity("210.00 GPa")); - EXPECT_EQ(properties[QString::fromStdString("SpecificHeat")]->getString(), parseQuantity("590.00 J/kg/K")); - EXPECT_EQ(properties[QString::fromStdString("ThermalConductivity")]->getString(), parseQuantity("43.00 W/m/K")); - EXPECT_EQ(properties[QString::fromStdString("ThermalExpansionCoefficient")]->getString(), parseQuantity("12.00 µm/m/K")); - EXPECT_EQ(properties1[QString::fromStdString("AmbientColor")]->getString(), QString::fromStdString("(0.0020, 0.0020, 0.0020, 1.0)")); - EXPECT_EQ(properties1[QString::fromStdString("DiffuseColor")]->getString(), QString::fromStdString("(0.0000, 0.0000, 0.0000, 1.0)")); - EXPECT_EQ(properties1[QString::fromStdString("EmissiveColor")]->getString(), QString::fromStdString("(0.0000, 0.0000, 0.0000, 1.0)")); - EXPECT_EQ(properties1[QString::fromStdString("Shininess")]->getString(), locale.toString(0.06)); - EXPECT_EQ(properties1[QString::fromStdString("SpecularColor")]->getString(), QString::fromStdString("(0.9800, 0.9800, 0.9800, 1.0)")); - EXPECT_EQ(properties1[QString::fromStdString("Transparency")]->getString(), QString::fromStdString("0")); + EXPECT_EQ(properties[QStringLiteral("Density")]->getString(), parseQuantity("7900.00 kg/m^3")); + EXPECT_EQ(properties[QStringLiteral("PoissonRatio")]->getString(), locale.toString(0.3)); + EXPECT_EQ(properties[QStringLiteral("YoungsModulus")]->getString(), parseQuantity("210.00 GPa")); + EXPECT_EQ(properties[QStringLiteral("SpecificHeat")]->getString(), parseQuantity("590.00 J/kg/K")); + EXPECT_EQ(properties[QStringLiteral("ThermalConductivity")]->getString(), parseQuantity("43.00 W/m/K")); + EXPECT_EQ(properties[QStringLiteral("ThermalExpansionCoefficient")]->getString(), parseQuantity("12.00 µm/m/K")); + EXPECT_EQ(properties1[QStringLiteral("AmbientColor")]->getString(), QStringLiteral("(0.0020, 0.0020, 0.0020, 1.0)")); + EXPECT_EQ(properties1[QStringLiteral("DiffuseColor")]->getString(), QStringLiteral("(0.0000, 0.0000, 0.0000, 1.0)")); + EXPECT_EQ(properties1[QStringLiteral("EmissiveColor")]->getString(), QStringLiteral("(0.0000, 0.0000, 0.0000, 1.0)")); + EXPECT_EQ(properties1[QStringLiteral("Shininess")]->getString(), locale.toString(0.06)); + EXPECT_EQ(properties1[QStringLiteral("SpecularColor")]->getString(), QStringLiteral("(0.9800, 0.9800, 0.9800, 1.0)")); + EXPECT_EQ(properties1[QStringLiteral("Transparency")]->getString(), QStringLiteral("0")); - EXPECT_TRUE(properties[QString::fromStdString("BulkModulus")]->getString().isEmpty()); - EXPECT_TRUE(properties[QString::fromStdString("ShearModulus")]->getString().isEmpty()); + EXPECT_TRUE(properties[QStringLiteral("BulkModulus")]->getString().isEmpty()); + EXPECT_TRUE(properties[QStringLiteral("ShearModulus")]->getString().isEmpty()); // These are the preferred method of access // - EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("Density")).getValue(), 7.9e-06); - EXPECT_NEAR(steel->getPhysicalValue(QString::fromStdString("PoissonRatio")).toDouble(), 0.3, 1e-6); - EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("YoungsModulus")).getValue(), 210000000.0); - EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("SpecificHeat")).getValue(), 590000000.0); - EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("ThermalConductivity")).getValue(), 43000.0); - EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("ThermalExpansionCoefficient")).getValue(), 1.2e-05); - EXPECT_EQ(steel->getAppearanceValue(QString::fromStdString("AmbientColor")), QString::fromStdString("(0.0020, 0.0020, 0.0020, 1.0)")); - EXPECT_EQ(steel->getAppearanceValue(QString::fromStdString("DiffuseColor")), QString::fromStdString("(0.0000, 0.0000, 0.0000, 1.0)")); - EXPECT_EQ(steel->getAppearanceValue(QString::fromStdString("EmissiveColor")), QString::fromStdString("(0.0000, 0.0000, 0.0000, 1.0)")); - EXPECT_NEAR(steel->getAppearanceValue(QString::fromStdString("Shininess")).toDouble(), 0.06, 1e-6); - EXPECT_EQ(steel->getAppearanceValue(QString::fromStdString("SpecularColor")), QString::fromStdString("(0.9800, 0.9800, 0.9800, 1.0)")); - EXPECT_DOUBLE_EQ(steel->getAppearanceValue(QString::fromStdString("Transparency")).toDouble(), 0.0); + EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("Density")).getValue(), 7.9e-06); + EXPECT_NEAR(steel->getPhysicalValue(QStringLiteral("PoissonRatio")).toDouble(), 0.3, 1e-6); + EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("YoungsModulus")).getValue(), 210000000.0); + EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("SpecificHeat")).getValue(), 590000000.0); + EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("ThermalConductivity")).getValue(), 43000.0); + EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("ThermalExpansionCoefficient")).getValue(), 1.2e-05); + EXPECT_EQ(steel->getAppearanceValue(QStringLiteral("AmbientColor")), QStringLiteral("(0.0020, 0.0020, 0.0020, 1.0)")); + EXPECT_EQ(steel->getAppearanceValue(QStringLiteral("DiffuseColor")), QStringLiteral("(0.0000, 0.0000, 0.0000, 1.0)")); + EXPECT_EQ(steel->getAppearanceValue(QStringLiteral("EmissiveColor")), QStringLiteral("(0.0000, 0.0000, 0.0000, 1.0)")); + EXPECT_NEAR(steel->getAppearanceValue(QStringLiteral("Shininess")).toDouble(), 0.06, 1e-6); + EXPECT_EQ(steel->getAppearanceValue(QStringLiteral("SpecularColor")), QStringLiteral("(0.9800, 0.9800, 0.9800, 1.0)")); + EXPECT_DOUBLE_EQ(steel->getAppearanceValue(QStringLiteral("Transparency")).toDouble(), 0.0); - EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("Density")).getUserString(), parseQuantity("7900.00 kg/m^3").toStdString()); - EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("YoungsModulus")).getUserString(), parseQuantity("210.00 GPa").toStdString()); - EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("SpecificHeat")).getUserString(), parseQuantity("590.00 J/kg/K").toStdString()); - EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("ThermalConductivity")).getUserString(), parseQuantity("43.00 W/m/K").toStdString()); - EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("ThermalExpansionCoefficient")).getUserString(), parseQuantity("12.00 µm/m/K").toStdString()); + EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("Density")).getUserString(), parseQuantity("7900.00 kg/m^3").toStdString()); + EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("YoungsModulus")).getUserString(), parseQuantity("210.00 GPa").toStdString()); + EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("SpecificHeat")).getUserString(), parseQuantity("590.00 J/kg/K").toStdString()); + EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("ThermalConductivity")).getUserString(), parseQuantity("43.00 W/m/K").toStdString()); + EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("ThermalExpansionCoefficient")).getUserString(), parseQuantity("12.00 µm/m/K").toStdString()); } TEST_F(TestMaterial, TestColumns) @@ -362,18 +362,18 @@ TEST_F(TestMaterial, TestColumns) models = testMaterial.getPhysicalModels(); EXPECT_EQ(models->size(), 1); - EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray2D"))); - auto array2d = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray2D"))->getMaterialValue(); + EXPECT_TRUE(testMaterial.hasPhysicalProperty(QStringLiteral("TestArray2D"))); + auto array2d = testMaterial.getPhysicalProperty(QStringLiteral("TestArray2D"))->getMaterialValue(); EXPECT_TRUE(array2d); EXPECT_EQ(dynamic_cast(*array2d).columns(), 2); - EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray2D3Column"))); - auto array2d3Column = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray2D3Column"))->getMaterialValue(); + EXPECT_TRUE(testMaterial.hasPhysicalProperty(QStringLiteral("TestArray2D3Column"))); + auto array2d3Column = testMaterial.getPhysicalProperty(QStringLiteral("TestArray2D3Column"))->getMaterialValue(); EXPECT_TRUE(array2d3Column); EXPECT_EQ(dynamic_cast(*array2d3Column).columns(), 3); - EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray3D"))); - auto array3d = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray3D"))->getMaterialValue(); + EXPECT_TRUE(testMaterial.hasPhysicalProperty(QStringLiteral("TestArray3D"))); + auto array3d = testMaterial.getPhysicalProperty(QStringLiteral("TestArray3D"))->getMaterialValue(); EXPECT_TRUE(array3d); EXPECT_EQ(dynamic_cast(*array3d).columns(), 2); } diff --git a/tests/src/Mod/Material/App/TestModel.cpp b/tests/src/Mod/Material/App/TestModel.cpp index 0af1dcd4c4..d4db24220a 100644 --- a/tests/src/Mod/Material/App/TestModel.cpp +++ b/tests/src/Mod/Material/App/TestModel.cpp @@ -88,12 +88,12 @@ TEST_F(TestModel, TestModelLoad) { ASSERT_NE(_modelManager, nullptr); - auto density = _modelManager->getModel(QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af")); - EXPECT_EQ(density->getName(), QString::fromStdString("Density")); - EXPECT_EQ(density->getUUID(), QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af")); + auto density = _modelManager->getModel(QStringLiteral("454661e5-265b-4320-8e6f-fcf6223ac3af")); + EXPECT_EQ(density->getName(), QStringLiteral("Density")); + EXPECT_EQ(density->getUUID(), QStringLiteral("454661e5-265b-4320-8e6f-fcf6223ac3af")); - auto& prop = (*density)[QString::fromStdString("Density")]; - EXPECT_EQ(prop.getName(), QString::fromStdString("Density")); + auto& prop = (*density)[QStringLiteral("Density")]; + EXPECT_EQ(prop.getName(), QStringLiteral("Density")); } TEST_F(TestModel, TestModelByPath) @@ -101,40 +101,40 @@ TEST_F(TestModel, TestModelByPath) ASSERT_NE(_modelManager, nullptr); auto linearElastic = _modelManager->getModelByPath( - QString::fromStdString("Mechanical/LinearElastic.yml"), - QString::fromStdString("System")); + QStringLiteral("Mechanical/LinearElastic.yml"), + QStringLiteral("System")); EXPECT_NE(&linearElastic, nullptr); - EXPECT_EQ(linearElastic->getName(), QString::fromStdString("Linear Elastic")); - EXPECT_EQ(linearElastic->getUUID(), QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); + EXPECT_EQ(linearElastic->getName(), QStringLiteral("Linear Elastic")); + EXPECT_EQ(linearElastic->getUUID(), QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); // The same but with a leading '/' auto linearElastic2 = _modelManager->getModelByPath( - QString::fromStdString("/Mechanical/LinearElastic.yml"), - QString::fromStdString("System")); + QStringLiteral("/Mechanical/LinearElastic.yml"), + QStringLiteral("System")); EXPECT_NE(&linearElastic2, nullptr); - EXPECT_EQ(linearElastic2->getName(), QString::fromStdString("Linear Elastic")); - EXPECT_EQ(linearElastic2->getUUID(), QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); + EXPECT_EQ(linearElastic2->getName(), QStringLiteral("Linear Elastic")); + EXPECT_EQ(linearElastic2->getUUID(), QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); // Same with the library name as a prefix auto linearElastic3 = _modelManager->getModelByPath( - QString::fromStdString("/System/Mechanical/LinearElastic.yml"), - QString::fromStdString("System")); + QStringLiteral("/System/Mechanical/LinearElastic.yml"), + QStringLiteral("System")); EXPECT_NE(&linearElastic3, nullptr); - EXPECT_EQ(linearElastic3->getName(), QString::fromStdString("Linear Elastic")); - EXPECT_EQ(linearElastic3->getUUID(), QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); + EXPECT_EQ(linearElastic3->getName(), QStringLiteral("Linear Elastic")); + EXPECT_EQ(linearElastic3->getUUID(), QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); // Test with the file system path ASSERT_NO_THROW(linearElastic->getLibrary()); ASSERT_NO_THROW(linearElastic->getLibrary()->getName()); ASSERT_NO_THROW(linearElastic->getLibrary()->getDirectoryPath()); - EXPECT_EQ(linearElastic->getLibrary()->getName(), QString::fromStdString("System")); - QString path = linearElastic->getLibrary()->getDirectoryPath() + QString::fromStdString("/Mechanical/LinearElastic.yml"); + EXPECT_EQ(linearElastic->getLibrary()->getName(), QStringLiteral("System")); + QString path = linearElastic->getLibrary()->getDirectoryPath() + QStringLiteral("/Mechanical/LinearElastic.yml"); ASSERT_NO_THROW(_modelManager->getModelByPath(path)); auto linearElastic4 = _modelManager->getModelByPath(path); EXPECT_NE(&linearElastic4, nullptr); - EXPECT_EQ(linearElastic4->getName(), QString::fromStdString("Linear Elastic")); - EXPECT_EQ(linearElastic4->getUUID(), QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); + EXPECT_EQ(linearElastic4->getName(), QStringLiteral("Linear Elastic")); + EXPECT_EQ(linearElastic4->getUUID(), QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); } // clang-format on diff --git a/tests/src/Mod/Material/App/TestModelProperties.cpp b/tests/src/Mod/Material/App/TestModelProperties.cpp index f5f37f24f2..59fab7a253 100644 --- a/tests/src/Mod/Material/App/TestModelProperties.cpp +++ b/tests/src/Mod/Material/App/TestModelProperties.cpp @@ -60,47 +60,47 @@ TEST_F(TestModelProperties, TestEmpty) TEST_F(TestModelProperties, TestBasic) { - auto prop = Materials::ModelProperty(QString::fromStdString("1"), - QString::fromStdString("2"), - QString::fromStdString("3"), - QString::fromStdString("4"), - QString::fromStdString("5"), - QString::fromStdString("6")); - EXPECT_EQ(prop.getName(), QString::fromStdString("1")); - EXPECT_EQ(prop.getDisplayName(), QString::fromStdString("2")); - EXPECT_EQ(prop.getPropertyType(), QString::fromStdString("3")); - EXPECT_EQ(prop.getUnits(), QString::fromStdString("4")); - EXPECT_EQ(prop.getURL(), QString::fromStdString("5")); - EXPECT_EQ(prop.getDescription(), QString::fromStdString("6")); + auto prop = Materials::ModelProperty(QStringLiteral("1"), + QStringLiteral("2"), + QStringLiteral("3"), + QStringLiteral("4"), + QStringLiteral("5"), + QStringLiteral("6")); + EXPECT_EQ(prop.getName(), QStringLiteral("1")); + EXPECT_EQ(prop.getDisplayName(), QStringLiteral("2")); + EXPECT_EQ(prop.getPropertyType(), QStringLiteral("3")); + EXPECT_EQ(prop.getUnits(), QStringLiteral("4")); + EXPECT_EQ(prop.getURL(), QStringLiteral("5")); + EXPECT_EQ(prop.getDescription(), QStringLiteral("6")); EXPECT_TRUE(prop.getInheritance().isNull()); EXPECT_FALSE(prop.isInherited()); EXPECT_EQ(prop.columns(), 0); - prop.setInheritance(QString::fromStdString("12345")); - EXPECT_EQ(prop.getInheritance(), QString::fromStdString("12345")); + prop.setInheritance(QStringLiteral("12345")); + EXPECT_EQ(prop.getInheritance(), QStringLiteral("12345")); EXPECT_TRUE(prop.isInherited()); } TEST_F(TestModelProperties, TestAddColumns) { - auto prop = Materials::ModelProperty(QString::fromStdString("1"), - QString::fromStdString("2"), - QString::fromStdString("3"), - QString::fromStdString("4"), - QString::fromStdString("5"), - QString::fromStdString("6")); - auto prop1 = Materials::ModelProperty(QString::fromStdString("10"), - QString::fromStdString("9"), - QString::fromStdString("8"), - QString::fromStdString("7"), - QString::fromStdString("6"), - QString::fromStdString("5")); - auto prop2 = Materials::ModelProperty(QString::fromStdString("a"), - QString::fromStdString("b"), - QString::fromStdString("c"), - QString::fromStdString("d"), - QString::fromStdString("e"), - QString::fromStdString("f")); + auto prop = Materials::ModelProperty(QStringLiteral("1"), + QStringLiteral("2"), + QStringLiteral("3"), + QStringLiteral("4"), + QStringLiteral("5"), + QStringLiteral("6")); + auto prop1 = Materials::ModelProperty(QStringLiteral("10"), + QStringLiteral("9"), + QStringLiteral("8"), + QStringLiteral("7"), + QStringLiteral("6"), + QStringLiteral("5")); + auto prop2 = Materials::ModelProperty(QStringLiteral("a"), + QStringLiteral("b"), + QStringLiteral("c"), + QStringLiteral("d"), + QStringLiteral("e"), + QStringLiteral("f")); EXPECT_EQ(prop.columns(), 0); prop.addColumn(prop1); @@ -110,23 +110,23 @@ TEST_F(TestModelProperties, TestAddColumns) auto columns = prop.getColumns(); auto entry1 = columns.at(0); - EXPECT_EQ(entry1.getName(), QString::fromStdString("10")); - EXPECT_EQ(entry1.getDisplayName(), QString::fromStdString("9")); - EXPECT_EQ(entry1.getPropertyType(), QString::fromStdString("8")); - EXPECT_EQ(entry1.getUnits(), QString::fromStdString("7")); - EXPECT_EQ(entry1.getURL(), QString::fromStdString("6")); - EXPECT_EQ(entry1.getDescription(), QString::fromStdString("5")); + EXPECT_EQ(entry1.getName(), QStringLiteral("10")); + EXPECT_EQ(entry1.getDisplayName(), QStringLiteral("9")); + EXPECT_EQ(entry1.getPropertyType(), QStringLiteral("8")); + EXPECT_EQ(entry1.getUnits(), QStringLiteral("7")); + EXPECT_EQ(entry1.getURL(), QStringLiteral("6")); + EXPECT_EQ(entry1.getDescription(), QStringLiteral("5")); EXPECT_TRUE(entry1.getInheritance().isNull()); EXPECT_FALSE(entry1.isInherited()); EXPECT_EQ(entry1.columns(), 0); auto entry2 = columns.at(1); - EXPECT_EQ(entry2.getName(), QString::fromStdString("a")); - EXPECT_EQ(entry2.getDisplayName(), QString::fromStdString("b")); - EXPECT_EQ(entry2.getPropertyType(), QString::fromStdString("c")); - EXPECT_EQ(entry2.getUnits(), QString::fromStdString("d")); - EXPECT_EQ(entry2.getURL(), QString::fromStdString("e")); - EXPECT_EQ(entry2.getDescription(), QString::fromStdString("f")); + EXPECT_EQ(entry2.getName(), QStringLiteral("a")); + EXPECT_EQ(entry2.getDisplayName(), QStringLiteral("b")); + EXPECT_EQ(entry2.getPropertyType(), QStringLiteral("c")); + EXPECT_EQ(entry2.getUnits(), QStringLiteral("d")); + EXPECT_EQ(entry2.getURL(), QStringLiteral("e")); + EXPECT_EQ(entry2.getDescription(), QStringLiteral("f")); EXPECT_TRUE(entry2.getInheritance().isNull()); EXPECT_FALSE(entry2.isInherited()); EXPECT_EQ(entry2.columns(), 0);