Merge tests-utilities#541

Luca Geretti · web-flow · commit 28971fca33da · 2021-04-25T13:13:31.000+02:00
Supply better coverage for utilities module
diff --git a/python/tests/CMakeLists.txt b/python/tests/CMakeLists.txt
@@ -23,7 +23,7 @@ if(PYTHON_TESTS)
         add_custom_target(test_python_${TESTNAME} COMMAND ${Python3_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/test_${TESTNAME}.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
         add_test(NAME test_python_${TESTNAME} COMMAND ${Python3_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/test_${TESTNAME}.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
         set_property(TEST test_python_${TESTNAME} PROPERTY ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/python")
-        set_property(TEST test_python_${TESTNAME} PROPERTY LABELS "python;primary")
+        set_property(TEST test_python_${TESTNAME} PROPERTY LABELS "python")
     endforeach()
 
     add_dependencies(tests pyariadne)
diff --git a/source/utility/CMakeLists.txt b/source/utility/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(LIBRARY_NAME ariadne-utility)
 
 add_library(${LIBRARY_NAME} OBJECT
-    utility.cpp
+        stack_trace.cpp
 )
 
 foreach(WARN ${LIBRARY_EXCLUSIVE_WARN})
diff --git a/source/utility/stack_trace.cpp b/source/utility/stack_trace.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -4,6 +4,7 @@ add_custom_target(tests-kernel)
 
 add_dependencies(everything tests)
 
+add_subdirectory(utility)
 add_subdirectory(numeric)
 add_subdirectory(algebra)
 add_subdirectory(function)
diff --git a/tests/algebra/CMakeLists.txt b/tests/algebra/CMakeLists.txt
@@ -15,7 +15,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()
     target_link_libraries(${TEST} ariadne-core)
     add_test(${TEST} ${TEST})
-    set_property(TEST ${TEST} PROPERTY LABELS "algebra;primary;core;kernel")
+    set_property(TEST ${TEST} PROPERTY LABELS "algebra;core;kernel")
 endforeach()
 
 add_dependencies(tests-core ${UNIT_TESTS})
diff --git a/tests/dynamics/CMakeLists.txt b/tests/dynamics/CMakeLists.txt
@@ -20,7 +20,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()    
     target_link_libraries(${TEST} ariadne)
     add_test(${TEST} ${TEST})    
-    set_property(TEST ${TEST} PROPERTY LABELS "dynamics;primary")
+    set_property(TEST ${TEST} PROPERTY LABELS "dynamics")
 endforeach()
 
 add_dependencies(tests-cpp ${UNIT_TESTS})
diff --git a/tests/function/CMakeLists.txt b/tests/function/CMakeLists.txt
@@ -17,7 +17,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()
     target_link_libraries(${TEST} ariadne-kernel)
     add_test(${TEST} ${TEST})
-    set_property(TEST ${TEST} PROPERTY LABELS "function;primary;kernel")
+    set_property(TEST ${TEST} PROPERTY LABELS "function;kernel")
 endforeach()
 
 add_dependencies(tests-kernel ${UNIT_TESTS})
diff --git a/tests/geometry/CMakeLists.txt b/tests/geometry/CMakeLists.txt
@@ -17,7 +17,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()
     target_link_libraries(${TEST} ariadne-kernel)
     add_test(${TEST} ${TEST})
-    set_property(TEST ${TEST} PROPERTY LABELS "geometry;primary;kernel")
+    set_property(TEST ${TEST} PROPERTY LABELS "geometry;kernel")
 endforeach()
 
 add_dependencies(tests-kernel ${UNIT_TESTS})
diff --git a/tests/hybrid/CMakeLists.txt b/tests/hybrid/CMakeLists.txt
@@ -15,7 +15,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()    
     target_link_libraries(${TEST} ariadne)  
     add_test(${TEST} ${TEST})    
-    set_property(TEST ${TEST} PROPERTY LABELS "hybrid;primary")           
+    set_property(TEST ${TEST} PROPERTY LABELS "hybrid")
 endforeach()
 
 add_dependencies(tests-cpp ${UNIT_TESTS})
diff --git a/tests/numeric/CMakeLists.txt b/tests/numeric/CMakeLists.txt
@@ -23,7 +23,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()
     target_link_libraries(${TEST} ariadne-core)
     add_test(${TEST} ${TEST})
-    set_property(TEST ${TEST} PROPERTY LABELS "numeric;primary;core;kernel")
+    set_property(TEST ${TEST} PROPERTY LABELS "numeric;core;kernel")
 endforeach()
 
 add_dependencies(tests-core ${UNIT_TESTS})
diff --git a/tests/output/CMakeLists.txt b/tests/output/CMakeLists.txt
@@ -11,7 +11,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()    
     add_test(${TEST} ${TEST})
     target_link_libraries(${TEST} ariadne-kernel)
-    set_property(TEST ${TEST} PROPERTY LABELS "output;primary;kernel")         
+    set_property(TEST ${TEST} PROPERTY LABELS "output;kernel")
 endforeach()
 
 add_dependencies(tests-kernel ${UNIT_TESTS})
diff --git a/tests/solvers/CMakeLists.txt b/tests/solvers/CMakeLists.txt
@@ -14,7 +14,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()    
     target_link_libraries(${TEST} ariadne-kernel)
     add_test(${TEST} ${TEST})    
-    set_property(TEST ${TEST} PROPERTY LABELS "solvers;primary;kernel")      
+    set_property(TEST ${TEST} PROPERTY LABELS "solvers;kernel")
 endforeach()
 
 add_dependencies(tests-kernel ${UNIT_TESTS})
diff --git a/tests/symbolic/CMakeLists.txt b/tests/symbolic/CMakeLists.txt
@@ -10,7 +10,7 @@ foreach(TEST ${UNIT_TESTS})
     endif()    
     target_link_libraries(${TEST} ariadne-kernel)  
     add_test(${TEST} ${TEST})
-    set_property(TEST ${TEST} PROPERTY LABELS "symbolic;primary;kernel")           
+    set_property(TEST ${TEST} PROPERTY LABELS "symbolic;kernel")
 endforeach()
 
 add_dependencies(tests-kernel ${UNIT_TESTS})
diff --git a/tests/utility/CMakeLists.txt b/tests/utility/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(UNIT_TESTS
+    test_array
+    test_container
+    test_stack_trace
+)
+
+foreach(TEST ${UNIT_TESTS})
+    add_executable(${TEST} ${TEST}.cpp)
+    if(COVERAGE)
+        target_compile_options(${TEST} PUBLIC ${COVERAGE_COMPILER_FLAGS})
+    endif()    
+    target_link_libraries(${TEST} ariadne-kernel)  
+    add_test(${TEST} ${TEST})
+    set_property(TEST ${TEST} PROPERTY LABELS "utility;kernel")
+endforeach()
+
+add_dependencies(tests-kernel ${UNIT_TESTS})
+add_dependencies(tests-cpp ${UNIT_TESTS})
+add_dependencies(tests ${UNIT_TESTS})
diff --git a/tests/utility/test_array.cpp b/tests/utility/test_array.cpp
@@ -0,0 +1,72 @@
+/***************************************************************************
+ *            test_array.cpp
+ *
+ *  Copyright  2009-21  Luca Geretti
+ *
+ ****************************************************************************/
+
+/*
+ *  This file is part of Ariadne.
+ *
+ *  Ariadne 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Ariadne 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 Ariadne.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <iostream>
+
+#include "config.hpp"
+#include "utility/array.hpp"
+#include "utility/container.hpp"
+
+#include "../test.hpp"
+
+using namespace Ariadne;
+
+struct TestConvertibleTo {
+    TestConvertibleTo(int a_) : a(a_) { }
+    int a;
+};
+
+struct TestClass {
+    TestClass(int a_) : a(a_) { }
+    explicit TestClass(TestConvertibleTo const& c) : TestClass(c.a) { }
+    int a;
+};
+
+class TestArray {
+  public:
+
+    Void test_convert() {
+        Array<TestClass> tca = {TestClass(1), TestClass(2)};
+        Array<TestConvertibleTo> tcta = {TestConvertibleTo(1), TestConvertibleTo(2)};
+        ARIADNE_TEST_EXECUTE(Array<TestClass> tcac(tcta));
+    }
+
+    Void test_print() {
+        Array<int> a1;
+        ARIADNE_TEST_PRINT(a1);
+        Array<int> a2 = {1, 2};
+        ARIADNE_TEST_PRINT(a2);
+    }
+
+    Void test() {
+        ARIADNE_TEST_CALL(test_convert());
+        ARIADNE_TEST_CALL(test_print());
+    }
+
+};
+
+Int main() {
+    TestArray().test();
+    return ARIADNE_TEST_FAILURES;
+}
diff --git a/tests/utility/test_container.cpp b/tests/utility/test_container.cpp
@@ -0,0 +1,75 @@
+/***************************************************************************
+ *            test_container.cpp
+ *
+ *  Copyright  2009-21  Luca Geretti
+ *
+ ****************************************************************************/
+
+/*
+ *  This file is part of Ariadne.
+ *
+ *  Ariadne 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Ariadne 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 Ariadne.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.hpp"
+#include "utility/container.hpp"
+
+#include "../test.hpp"
+
+using namespace Ariadne;
+
+class TestContainer {
+  public:
+
+    Void test_map_get() {
+        Map<int,int> im = {{1,10},{2,20}};
+        ARIADNE_TEST_FAIL(im.get(3));
+        ARIADNE_TEST_EQUALS(im.get(2),20);
+    }
+
+    Void test_map_convert() {
+        Map<int,int> im = {{1,10},{2,20}};
+
+        Map<int,double> dm(im);
+        ARIADNE_TEST_ASSERT(dm.at(1) == im.at(1) and dm.at(2) == im.at(2));
+    }
+
+    Void test_map_restrict_keys() {
+        Set<int> s = {1,2};
+        Map<int,double> m = {{1,1.2},{2,1.5},{3,1.0},{5,0.1}};
+        auto restricted = restrict_keys(m,s);
+        ARIADNE_TEST_EQUALS(restricted.size(),2);
+        ARIADNE_TEST_ASSERT(restricted.has_key(1) and restricted.has_key(2));
+    }
+
+    Void test_make_list_of_set() {
+        Set<int> s = {1, 5, 3};
+        auto l = make_list(s);
+        ARIADNE_TEST_EQUALS(l.size(),3);
+        ARIADNE_TEST_ASSERT(l.at(0) == 1 and l.at(1) == 3 and l.at(2) == 5);
+    }
+
+    Void test() {
+        ARIADNE_TEST_CALL(test_map_get());
+        ARIADNE_TEST_CALL(test_map_convert());
+        ARIADNE_TEST_CALL(test_map_restrict_keys());
+        ARIADNE_TEST_CALL(test_make_list_of_set());
+    }
+
+};
+
+Int main() {
+    TestContainer().test();
+    return ARIADNE_TEST_FAILURES;
+}
diff --git a/tests/utility/test_stack_trace.cpp b/tests/utility/test_stack_trace.cpp
@@ -0,0 +1,61 @@
+/***************************************************************************
+ *            test_stack_trace.cpp
+ *
+ *  Copyright  2009-21  Luca Geretti
+ *
+ ****************************************************************************/
+
+/*
+ *  This file is part of Ariadne.
+ *
+ *  Ariadne 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Ariadne 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 Ariadne.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <iostream>
+
+#include "config.hpp"
+#include "utility/stack_trace.hpp"
+
+#include "../test.hpp"
+
+using namespace Ariadne;
+
+struct TestClass {
+    Void method() {
+        stack_trace();
+    }
+};
+
+class TestStackTrace {
+  public:
+
+    Void test_free_function() {
+        stack_trace();
+    }
+
+    Void test_class_method() {
+        TestClass().method();
+    }
+
+    Void test() {
+        ARIADNE_TEST_CALL(test_free_function());
+        ARIADNE_TEST_CALL(test_class_method());
+    }
+
+};
+
+Int main() {
+    TestStackTrace().test();
+    return ARIADNE_TEST_FAILURES;
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`set(LIBRARY_NAME ariadne-utility)`
`2`	`2`
`3`	`3`	`add_library(${LIBRARY_NAME} OBJECT`
`4`		`- utility.cpp`
	`4`	`+ stack_trace.cpp`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`foreach(WARN ${LIBRARY_EXCLUSIVE_WARN})`