From 6ccacc818be4fed34afbe2b881911f458d7964a4 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 11 Dec 2017 15:35:05 +0100
Subject: [PATCH] Reenabled test for MaterialPropetryController
---
Tests/UnitTests/GUI/TestMaterialPropertyController.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tests/UnitTests/GUI/TestMaterialPropertyController.h b/Tests/UnitTests/GUI/TestMaterialPropertyController.h
index a3eb83a66f3..bc4ee32cefd 100644
--- a/Tests/UnitTests/GUI/TestMaterialPropertyController.h
+++ b/Tests/UnitTests/GUI/TestMaterialPropertyController.h
@@ -39,7 +39,7 @@ TEST_F(TestMaterialPropertyController, test_ControllerForLayer)
// changing name of MaterialItem in MaterialModel, looking for MaterialProperty change
mat1->setItemName("newname");
- // EXPECT_EQ(property_changed, 1);
+ EXPECT_EQ(property_changed, 1);
ExternalProperty property
= layer->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
EXPECT_EQ(property.identifier(), mat1->getIdentifier());
@@ -49,7 +49,7 @@ TEST_F(TestMaterialPropertyController, test_ControllerForLayer)
// changing color of MaterialItem
ExternalProperty colorProperty = MaterialItemUtils::colorProperty(QColor(Qt::red));
mat1->setItemValue(MaterialItem::P_COLOR, colorProperty.variant());
- // EXPECT_EQ(property_changed, 2);
+ EXPECT_EQ(property_changed, 2);
property = layer->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
EXPECT_EQ(property.identifier(), mat1->getIdentifier());
EXPECT_EQ(property.text(), mat1->itemName());
@@ -58,7 +58,7 @@ TEST_F(TestMaterialPropertyController, test_ControllerForLayer)
// removing material from the model, property should become undefined
materialModel.removeRows(0, 1, QModelIndex());
- // EXPECT_EQ(property_changed, 3);
+ EXPECT_EQ(property_changed, 3);
property = layer->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
EXPECT_TRUE(property.isValid() == false);
}
--
GitLab