first commit

test_suite/simgear_tests/props/CMakeLists.txt

@@ -0,0 +1,12 @@
+set(TESTSUITE_SOURCES
+    ${TESTSUITE_SOURCES}
+    ${CMAKE_CURRENT_SOURCE_DIR}/TestSuite.cxx
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_props.cxx
+    PARENT_SCOPE
+)
+
+set(TESTSUITE_HEADERS
+    ${TESTSUITE_HEADERS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_props.hxx
+    PARENT_SCOPE
+)

test_suite/simgear_tests/props/TestSuite.cxx

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2016 Edward d'Auvergne
+ *
+ * This file is part of the program FlightGear.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "test_props.hxx"
+
+
+// Set up the tests.
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SimgearPropsTests, "Simgear unit tests");

test_suite/simgear_tests/props/test_props.cxx

@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2016 Edward d'Auvergne
+ *
+ * This file is part of the program FlightGear.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "test_props.hxx"
+
+#include <simgear/props/props_io.hxx>
+
+// Set up function for each test.
+void SimgearPropsTests::setUp()
+{
+    // Create a property tree.
+    tree = new SGPropertyNode;
+}
+
+
+// Clean up after each test.
+void SimgearPropsTests::tearDown()
+{
+    // Delete the tree (avoiding the memory leak).
+    delete tree;
+}
+
+
+// Test property aliasing, to catch possible memory leaks.
+void SimgearPropsTests::testAliasLeak()
+{
+    // Declarations.
+    SGPropertyNode *alias;
+
+    // Create a new node.
+    tree->getNode("test-node", true);
+
+    // Aliased node.
+    alias = tree->getNode("test-alias", true);
+    alias->alias("test-node");
+}
+
+void SimgearPropsTests::testPropsCopyIf()
+{
+// dummy property tree structure
+    tree->setIntValue("a/a/a", 42);
+    tree->setStringValue("a/a/b", "foo");
+    tree->setIntValue("a/a/c[2]", 99);
+    tree->setIntValue("a/a/d", 1);
+    tree->setIntValue("a/b/a[0]", 50);
+    tree->setIntValue("a/b/a[1]", 100);
+    tree->setStringValue("a/b/b", "foo");
+
+    SGPropertyNode_ptr destA(new SGPropertyNode);
+
+    copyPropertiesIf(tree, destA, [](const SGPropertyNode* src) {
+        // always copy non-leaf nodes
+        if (src->nChildren() > 0) 
+            return true;
+
+        return (src->getType() == simgear::props::INT) &&
+            src->getIntValue() > 50;
+    });
+
+    CPPUNIT_ASSERT_EQUAL(1, destA->getNode("a/a")->nChildren()); // only 99
+    CPPUNIT_ASSERT_EQUAL(99, destA->getIntValue("a/a/c[2]"));
+    CPPUNIT_ASSERT_EQUAL(1, destA->getNode("a/b")->nChildren()); // only 100
+    CPPUNIT_ASSERT_EQUAL(100, destA->getIntValue("a/b/a[1]"));
+}

test_suite/simgear_tests/props/test_props.hxx

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016 Edward d'Auvergne
+ *
+ * This file is part of the program FlightGear.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _FG_SIMGEAR_PROPS_SIMGEAR_UNIT_TESTS_HXX
+#define _FG_SIMGEAR_PROPS_SIMGEAR_UNIT_TESTS_HXX
+
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestFixture.h>
+
+#include <simgear/props/props.hxx>
+
+
+// The unit tests of the simgear property tree.
+class SimgearPropsTests : public CppUnit::TestFixture
+{
+    // Set up the test suite.
+    CPPUNIT_TEST_SUITE(SimgearPropsTests);
+    CPPUNIT_TEST(testAliasLeak);
+    CPPUNIT_TEST(testPropsCopyIf);
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    // Set up function for each test.
+    void setUp();
+
+    // Clean up after each test.
+    void tearDown();
+
+    // The tests.
+    void testAliasLeak();
+    void testPropsCopyIf();
+private:
+    // A property tree.
+    SGPropertyNode *tree;
+};
+
+#endif  // _FG_SIMGEAR_PROPS_SIMGEAR_UNIT_TESTS_HXX