Consolidate tests

symengine/CMakeLists.txt

@@ -25,6 +25,7 @@ add_subdirectory(utilities/matchpycpp)
 
 set(SRC
     add.cpp
+    as_real_imag.cpp
     basic.cpp
     complex.cpp
     complex_double.cpp

symengine/solve.cpp

@@ -2,7 +2,6 @@
 #include <symengine/polys/basic_conversions.h>
 #include <symengine/logic.h>
 #include <symengine/mul.h>
-#include <symengine/as_real_imag.cpp>
 
 namespace SymEngine
 {

symengine/tests/basic/CMakeLists.txt

@@ -1,108 +1,48 @@
 project(test_basic)
 
-add_executable(${PROJECT_NAME} test_basic.cpp)
-target_link_libraries(${PROJECT_NAME} symengine catch)
-add_test(${PROJECT_NAME} ${PROJECT_BINARY_DIR}/${PROJECT_NAME})
-
-add_executable(test_arit test_arit.cpp)
-target_link_libraries(test_arit symengine catch)
-add_test(test_arit ${PROJECT_BINARY_DIR}/test_arit)
-
-add_executable(test_poly test_poly.cpp)
-target_link_libraries(test_poly symengine catch)
-add_test(test_poly ${PROJECT_BINARY_DIR}/test_poly)
-
-add_executable(test_series test_series.cpp)
-target_link_libraries(test_series symengine catch)
-add_test(test_series ${PROJECT_BINARY_DIR}/test_series)
-
-add_executable(test_series_generic test_series_generic.cpp)
-target_link_libraries(test_series_generic symengine catch)
-add_test(test_series_generic ${PROJECT_BINARY_DIR}/test_series_generic)
-
+set(SRC
+    test_arit.cpp
+    test_basic.cpp
+    test_poly.cpp
+    test_series.cpp
+    test_series_generic.cpp
+    test_functions.cpp
+    test_subs.cpp
+    test_integer.cpp
+    test_rational.cpp
+    test_relationals.cpp
+    test_number.cpp
+    test_as_numer_denom.cpp
+    test_parser.cpp
+    test_sets.cpp
+    test_fields.cpp
+    test_infinity.cpp
+    test_nan.cpp
+    test_solve.cpp
+    test_as_real_imag.cpp
+    test_cse.cpp
+    test_count_ops.cpp
+)
 if (WITH_PIRANHA)
-    add_executable(test_series_expansion_UP test_series_expansion_UP.cpp)
-    target_link_libraries(test_series_expansion_UP symengine catch)
-    add_test(test_series_expansion_UP ${PROJECT_BINARY_DIR}/test_series_expansion_UP)
-
-    add_executable(test_series_expansion_URatP test_series_expansion_URatP.cpp)
-    target_link_libraries(test_series_expansion_URatP symengine catch)
-    add_test(test_series_expansion_URatP ${PROJECT_BINARY_DIR}/test_series_expansion_URatP)
+    set(SRC ${SRC}
+        test_series_expansion_UP.cpp
+        test_series_expansion_URatP.cpp
+    )
 endif()
 
 if (WITH_FLINT)
-    add_executable(test_series_expansion_URatF test_series_expansion_URatF.cpp)
-    target_link_libraries(test_series_expansion_URatF symengine catch)
-    add_test(test_series_expansion_URatF ${PROJECT_BINARY_DIR}/test_series_expansion_URatF)
+    set(SRC ${SRC}
+        test_series_expansion_URatF.cpp
+    )
 endif()
 
-add_executable(test_functions test_functions.cpp)
-target_link_libraries(test_functions symengine catch)
-add_test(test_functions ${PROJECT_BINARY_DIR}/test_functions)
-
-add_executable(test_subs test_subs.cpp)
-target_link_libraries(test_subs symengine catch)
-add_test(test_subs ${PROJECT_BINARY_DIR}/test_subs)
-
-add_executable(test_integer test_integer.cpp)
-target_link_libraries(test_integer symengine catch)
-add_test(test_integer ${PROJECT_BINARY_DIR}/test_integer)
-
-add_executable(test_rational test_rational.cpp)
-target_link_libraries(test_rational symengine catch)
-add_test(test_rational ${PROJECT_BINARY_DIR}/test_rational)
-
-add_executable(test_relationals test_relationals.cpp)
-target_link_libraries(test_relationals symengine catch)
-add_test(test_relationals ${PROJECT_BINARY_DIR}/test_relationals)
-
-add_executable(test_number test_number.cpp)
-target_link_libraries(test_number symengine catch)
-add_test(test_number ${PROJECT_BINARY_DIR}/test_number)
-
-add_executable(test_as_numer_denom test_as_numer_denom.cpp)
-target_link_libraries(test_as_numer_denom symengine catch)
-add_test(test_as_numer_denom ${PROJECT_BINARY_DIR}/test_as_numer_denom)
-
-add_executable(test_parser test_parser.cpp)
-target_link_libraries(test_parser symengine catch)
-add_test(test_parser ${PROJECT_BINARY_DIR}/test_parser)
-
-add_executable(test_sets test_sets.cpp)
-target_link_libraries(test_sets symengine catch)
-add_test(test_sets ${PROJECT_BINARY_DIR}/test_sets)
-
-add_executable(test_fields test_fields.cpp)
-target_link_libraries(test_fields symengine catch)
-add_test(test_fields ${PROJECT_BINARY_DIR}/test_fields)
-
-add_executable(test_infinity test_infinity.cpp)
-target_link_libraries(test_infinity symengine catch)
-add_test(test_infinity ${PROJECT_BINARY_DIR}/test_infinity)
-
-add_executable(test_nan test_nan.cpp)
-target_link_libraries(test_nan symengine catch)
-add_test(test_nan ${PROJECT_BINARY_DIR}/test_nan)
-
-add_executable(test_solve test_solve.cpp)
-target_link_libraries(test_solve symengine catch)
-add_test(test_solve ${PROJECT_BINARY_DIR}/test_solve)
-
-add_executable(test_as_real_imag test_as_real_imag.cpp)
-target_link_libraries(test_as_real_imag symengine catch)
-add_test(test_as_real_imag ${PROJECT_BINARY_DIR}/test_as_real_imag)
-
 if ("${INTEGER_CLASS}" MATCHES "boostmp")
-	add_executable(test_integer_class test_integer_class.cpp)
-	target_link_libraries(test_integer_class symengine catch)
-	add_test(test_integer_class ${PROJECT_BINARY_DIR}/test_integer_class)
+    set(SRC ${SRC}
+        test_integer_class.cpp
+    )
 endif()
 
-add_executable(test_cse test_cse.cpp)
-target_link_libraries(test_cse symengine catch)
-add_test(test_cse ${PROJECT_BINARY_DIR}/test_cse)
-
 
-add_executable(test_count_ops test_count_ops.cpp)
-target_link_libraries(test_count_ops symengine catch)
-add_test(test_count_ops ${PROJECT_BINARY_DIR}/test_count_ops)
+add_executable(tests_main ${SRC})
+target_link_libraries(tests_main symengine catch)
+add_test(tests_main ${PROJECT_BINARY_DIR}/tests_main)

symengine/tests/basic/test_as_numer_denom.cpp

@@ -153,7 +153,7 @@ TEST_CASE("NumerDenom: Add", "[as_numer_denom]")
     REQUIRE(eq(*den, *mul(x, mul(y, z)))); // x*y*z
 }
 
-TEST_CASE("Complex: Basic", "[basic]")
+TEST_CASE("Complex: Basic (as_numer_denom)", "[basic]")
 {
     RCP<const Number> r1, r2, r3, c, cnum;
     RCP<const Basic> num, den;

symengine/tests/basic/test_as_real_imag.cpp

@@ -1,6 +1,12 @@
 #include "catch.hpp"
 
-#include <symengine/as_real_imag.cpp>
+#include <symengine/basic.h>
+#include <symengine/rational.h>
+#include <symengine/complex.h>
+#include <symengine/functions.h>
+#include <symengine/add.h>
+#include <symengine/pow.h>
+#include <symengine/mul.h>
 #include <symengine/symengine_casts.h>
 
 using SymEngine::Basic;

symengine/tests/basic/test_nan.cpp

@@ -57,7 +57,7 @@ TEST_CASE("Comparing NaN", "[NaN]")
     REQUIRE(neq(*a, *i1));
 }
 
-TEST_CASE("Check Derivative", "[NaN]")
+TEST_CASE("NaN: Check Derivative", "[NaN]")
 {
     RCP<const Symbol> x = symbol("x");
     RCP<const NaN> b = Nan;
@@ -171,4 +171,4 @@ TEST_CASE("Evaluate Class of NaN", "[NaN]")
     REQUIRE(eq(*n1, *Nan));
     n1 = erfc(a);
     REQUIRE(eq(*n1, *Nan));
-}
+}