More tests

Author: kunitoki

modules/yup_core/containers/yup_PropertySet.h

@@ -176,6 +176,9 @@ class YUP_API PropertySet
     /** Returns the keys/value pair array containing all the properties. */
     StringPairArray& getAllProperties() noexcept { return properties; }
 
+    /** Returns the keys/value pair array containing all the properties. */
+    const StringPairArray& getAllProperties() const noexcept { return properties; }
+
     /** Returns the lock used when reading or writing to this set */
     const CriticalSection& getLock() const noexcept { return lock; }
 

tests/yup_core/yup_PropertySet.cpp

@@ -23,10 +23,32 @@
 
 #include <yup_core/yup_core.h>
 
+namespace
+{
+
+struct InvocablePropertySet : yup::PropertySet
+{
+    InvocablePropertySet (std::function<void()> callback)
+        : callback (callback)
+    {
+    }
+
+    void propertyChanged() override
+    {
+        callback();
+    }
+
+private:
+    std::function<void()> callback;
+};
+
+} // namespace
+
 class PropertySetTests : public ::testing::Test
 {
 protected:
     yup::PropertySet propertySet;
+    yup::PropertySet propertySetInsensitive { true };
 
     void SetUp() override
     {
@@ -35,18 +57,59 @@ class PropertySetTests : public ::testing::Test
         propertySet.setValue ("doubleKey", 45.67);
         propertySet.setValue ("boolKey", true);
 
+        propertySetInsensitive.setValue ("stringKey", "stringValue");
+        propertySetInsensitive.setValue ("intKey", 123);
+        propertySetInsensitive.setValue ("doubleKey", 45.67);
+        propertySetInsensitive.setValue ("boolKey", true);
+
         auto xml = std::make_unique<yup::XmlElement> ("root");
         xml->setAttribute ("attribute", "value");
         propertySet.setValue ("xmlKey", xml.get());
     }
 };
 
+TEST_F (PropertySetTests, Empty)
+{
+    yup::PropertySet emptyPropertySet (false);
+    EXPECT_EQ (emptyPropertySet.getAllProperties().size(), 0);
+
+    yup::PropertySet emptyPropertySet2 (true);
+    EXPECT_EQ (emptyPropertySet2.getAllProperties().size(), 0);
+}
+
+TEST_F (PropertySetTests, Copy)
+{
+    yup::PropertySet anotherPropertySet (propertySet);
+    EXPECT_EQ (anotherPropertySet.getAllProperties(), propertySet.getAllProperties());
+
+    yup::PropertySet anotherPropertySet2;
+    anotherPropertySet2 = anotherPropertySet;
+    EXPECT_EQ (anotherPropertySet2.getAllProperties(), anotherPropertySet.getAllProperties());
+}
+
+TEST_F (PropertySetTests, Move)
+{
+    auto allProperties = propertySet.getAllProperties();
+
+    yup::PropertySet anotherPropertySet (std::move (propertySet));
+    EXPECT_EQ (anotherPropertySet.getAllProperties(), allProperties);
+
+    yup::PropertySet anotherPropertySet2;
+    anotherPropertySet2 = std::move (anotherPropertySet);
+    EXPECT_EQ (anotherPropertySet2.getAllProperties(), allProperties);
+}
+
 TEST_F (PropertySetTests, GetValue)
 {
     EXPECT_EQ (propertySet.getValue ("stringKey"), "stringValue");
     EXPECT_EQ (propertySet.getIntValue ("intKey"), 123);
     EXPECT_DOUBLE_EQ (propertySet.getDoubleValue ("doubleKey"), 45.67);
     EXPECT_TRUE (propertySet.getBoolValue ("boolKey"));
+
+    EXPECT_EQ (propertySetInsensitive.getValue ("stringkey"), "stringValue");
+    EXPECT_EQ (propertySetInsensitive.getIntValue ("intkey"), 123);
+    EXPECT_DOUBLE_EQ (propertySetInsensitive.getDoubleValue ("doublekey"), 45.67);
+    EXPECT_TRUE (propertySetInsensitive.getBoolValue ("boolkey"));
 }
 
 TEST_F (PropertySetTests, GetFallbackValue)
@@ -76,6 +139,8 @@ TEST_F (PropertySetTests, NonExistingKey)
 {
     EXPECT_EQ (propertySet.getValue ("nonExistingKey", "default"), "default");
     EXPECT_EQ (propertySet.getIntValue ("nonExistingKey", 0), 0);
+    EXPECT_DOUBLE_EQ (propertySet.getDoubleValue ("nonExistingKey", 45.67), 45.67);
+    EXPECT_TRUE (propertySet.getBoolValue ("nonExistingKey", true));
 }
 
 TEST_F (PropertySetTests, RemoveAndClearValues)
@@ -92,14 +157,21 @@ TEST_F (PropertySetTests, RemoveAndClearValues)
     EXPECT_FALSE (propertySet.containsKey ("boolKey"));
 }
 
-TEST_F (PropertySetTests, CopyAndAssignment)
+TEST_F (PropertySetTests, AddAllPropertiesFrom)
 {
-    yup::PropertySet anotherPropertySet (propertySet);
-    EXPECT_EQ (anotherPropertySet.getValue ("stringKey"), "stringValue");
+    yup::PropertySet anotherPropertySet;
+    anotherPropertySet.setValue ("stringKey", "stringValue2");
+    anotherPropertySet.setValue ("intKey", 456);
+    anotherPropertySet.setValue ("double2Key", 45.67);
+    anotherPropertySet.setValue ("bool2Key", true);
+    anotherPropertySet.addAllPropertiesFrom (propertySet);
 
-    yup::PropertySet yetAnotherPropertySet;
-    yetAnotherPropertySet = propertySet;
-    EXPECT_EQ (yetAnotherPropertySet.getValue ("stringKey"), "stringValue");
+    EXPECT_EQ (anotherPropertySet.getValue ("stringKey"), "stringValue");
+    EXPECT_EQ (anotherPropertySet.getIntValue ("intKey"), 123);
+    EXPECT_DOUBLE_EQ (anotherPropertySet.getDoubleValue ("doubleKey"), 45.67);
+    EXPECT_TRUE (anotherPropertySet.getBoolValue ("boolKey"));
+    EXPECT_DOUBLE_EQ (anotherPropertySet.getDoubleValue ("double2Key"), 45.67);
+    EXPECT_TRUE (anotherPropertySet.getBoolValue ("bool2Key"));
 }
 
 TEST_F (PropertySetTests, CreateAndRestoreXml)
@@ -112,3 +184,17 @@ TEST_F (PropertySetTests, CreateAndRestoreXml)
     restoredSet.restoreFromXml (*xml);
     EXPECT_EQ (restoredSet.getValue ("stringKey"), "stringValue");
 }
+
+TEST_F (PropertySetTests, PropertyChanged)
+{
+    bool changed = false;
+
+    InvocablePropertySet anotherPropertySet ([&changed]
+    {
+        changed = true;
+    });
+
+    EXPECT_FALSE (changed);
+    anotherPropertySet.setValue ("abc", 1);
+    EXPECT_TRUE (changed);
+}