From 6cdb723fcdf2b72981e7413dce0f99b857aa5b54 Mon Sep 17 00:00:00 2001 From: Alexander Favorov Date: Fri, 4 Oct 2024 02:29:21 -0400 Subject: [PATCH] all tests that are compilable now are added: 714406 assertions in 10 test cases --- configure | 4 ++++ configure.ac | 4 ++++ src/cpp_tests/testHashSets.cpp | 6 +++--- src/cpp_tests/testHybridMatrix.cpp | 2 +- src/cpp_tests/testHybridVector.cpp | 2 +- src/cpp_tests/testSparseIterator.cpp | 6 +++--- src/cpp_tests/testSparseVector.cpp | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 88a37168..3db9f66a 100755 --- a/configure +++ b/configure @@ -3368,6 +3368,10 @@ if test "x$cpp_tests_disable" != "xyes" ; then GAPS_CPP_FLAGS+=" -DGAPS_CPP_UNIT_TESTS " GAPS_SOURCE_FILES+=" cpp_tests/testVector.o" GAPS_SOURCE_FILES+=" cpp_tests/testSparseVector.o" + GAPS_SOURCE_FILES+=" cpp_tests/testHashSets.o" + GAPS_SOURCE_FILES+=" cpp_tests/testHybridMatrix.o" + GAPS_SOURCE_FILES+=" cpp_tests/testHybridVector.o" + GAPS_SOURCE_FILES+=" cpp_tests/testSparseIterator.o" # GAPS_SOURCE_FILES+=" cpp_tests/testConcurrentAtomicDomain.o" fi # commented files in the if above are to be reviwed diff --git a/configure.ac b/configure.ac index a0b6ddc8..6b6df1ee 100644 --- a/configure.ac +++ b/configure.ac @@ -108,6 +108,10 @@ if test "x$cpp_tests_disable" != "xyes" ; then GAPS_CPP_FLAGS+=" -DGAPS_CPP_UNIT_TESTS " GAPS_SOURCE_FILES+=" cpp_tests/testVector.o" GAPS_SOURCE_FILES+=" cpp_tests/testSparseVector.o" + GAPS_SOURCE_FILES+=" cpp_tests/testHashSets.o" + GAPS_SOURCE_FILES+=" cpp_tests/testHybridMatrix.o" + GAPS_SOURCE_FILES+=" cpp_tests/testHybridVector.o" + GAPS_SOURCE_FILES+=" cpp_tests/testSparseIterator.o" # GAPS_SOURCE_FILES+=" cpp_tests/testConcurrentAtomicDomain.o" fi # commented files in the if above are to be reviwed diff --git a/src/cpp_tests/testHashSets.cpp b/src/cpp_tests/testHashSets.cpp index 6d3980f0..300e3709 100755 --- a/src/cpp_tests/testHashSets.cpp +++ b/src/cpp_tests/testHashSets.cpp @@ -3,7 +3,7 @@ #include "../data_structures/HashSets.h" #include "../math/Random.h" -TEST_CASE("Test HashSets.h - FixedHashSetU32") +TEST_CASE("Test HashSets.h - FixedHashSetU32","[hashset][U32]") { GapsRandomState randState(123); @@ -27,7 +27,7 @@ TEST_CASE("Test HashSets.h - FixedHashSetU32") } } -TEST_CASE("Test HashSets.h - SmallHashSetU64") +TEST_CASE("Test HashSets.h - SmallHashSetU64","[hashset][U64]") { GapsRandomState randState(123); @@ -51,7 +51,7 @@ TEST_CASE("Test HashSets.h - SmallHashSetU64") } } -TEST_CASE("Test HashSets.h - SmallPairedHashSetU64") +TEST_CASE("Test HashSets.h - SmallPairedHashSetU64","[hashset][pairedU64]") { SmallPairedHashSetU64 hSet; REQUIRE(hSet.isEmpty()); diff --git a/src/cpp_tests/testHybridMatrix.cpp b/src/cpp_tests/testHybridMatrix.cpp index 22bf50b1..616347e3 100755 --- a/src/cpp_tests/testHybridMatrix.cpp +++ b/src/cpp_tests/testHybridMatrix.cpp @@ -5,7 +5,7 @@ #include "../math/VectorMath.h" #include "../math/MatrixMath.h" -TEST_CASE("Test HybridMatrix.h") +TEST_CASE("Test HybridMatrix.h","[hybridmatrix]") { HybridMatrix mat(100, 250); REQUIRE(mat.nRow() == 100); diff --git a/src/cpp_tests/testHybridVector.cpp b/src/cpp_tests/testHybridVector.cpp index 6510b600..c8e3d73c 100755 --- a/src/cpp_tests/testHybridVector.cpp +++ b/src/cpp_tests/testHybridVector.cpp @@ -5,7 +5,7 @@ #include "../math/Math.h" #include "../math/VectorMath.h" -TEST_CASE("Test HybridVector.h") +TEST_CASE("Test HybridVector.h","[hybridvector]") { GapsRandomState randState(123); diff --git a/src/cpp_tests/testSparseIterator.cpp b/src/cpp_tests/testSparseIterator.cpp index 424ab322..fe1c5ec3 100755 --- a/src/cpp_tests/testSparseIterator.cpp +++ b/src/cpp_tests/testSparseIterator.cpp @@ -10,7 +10,7 @@ #include -TEST_CASE("Test SparseIterator.h - One Dimensional") +TEST_CASE("Test SparseIterator.h - One Dimensional","[sparseiterator][1D]") { #if 0 SECTION("Simple Case") @@ -63,7 +63,7 @@ TEST_CASE("Test SparseIterator.h - One Dimensional") } } -TEST_CASE("Test SparseIterator.h - Two Dimensional") +TEST_CASE("Test SparseIterator.h - Two Dimensional","[sparseiterator][2D]") { #if 0 SECTION("Simple Case") @@ -241,7 +241,7 @@ static float tripleProduct(const Vector &v1, const Vector &v2, const Vector &v3) return prod; } -TEST_CASE("Test SparseIterator.h - Three Dimensional") +TEST_CASE("Test SparseIterator.h - Three Dimensional","[sparseiterator][3D]") { #if 0 SECTION("Simple Case") diff --git a/src/cpp_tests/testSparseVector.cpp b/src/cpp_tests/testSparseVector.cpp index b75086ab..dec77b84 100755 --- a/src/cpp_tests/testSparseVector.cpp +++ b/src/cpp_tests/testSparseVector.cpp @@ -5,7 +5,7 @@ #include "../math/Math.h" #include "../math/VectorMath.h" -TEST_CASE("Test SparseVector","[sparse]") +TEST_CASE("Test SparseVector","[sparsevector]") { GapsRandomState randState(123);