Moved tests to separate files

Author: ankane

README.md

@@ -162,7 +162,7 @@ To get started with development:
 git clone https://github.com/pgvector/pgvector-cpp.git
 cd pgvector-cpp
 createdb pgvector_cpp_test
-g++ -std=c++17 -Wall -Wextra -Wno-unknown-attributes -Werror -o test/main test/main.cpp test/pqxx_test.cpp -lpqxx -lpq
+g++ -std=c++17 -Wall -Wextra -Wno-unknown-attributes -Werror -o test/main test/main.cpp test/vector_test.cpp test/halfvec_test.cpp test/sparsevec_test.cpp test/pqxx_test.cpp -lpqxx -lpq
 test/main
 ```
 

include/pgvector/sparsevec.hpp

@@ -10,6 +10,10 @@
 #include <unordered_map>
 #include <vector>
 
+#if __cplusplus >= 202002L
+#include <span>
+#endif
+
 namespace pgvector {
 /// A sparse vector.
 class SparseVector {

test/halfvec_test.cpp

@@ -0,0 +1,28 @@
+#include <cassert>
+
+#include "../include/pgvector/halfvec.hpp"
+
+#if __cplusplus >= 202002L
+#include <span>
+#endif
+
+using pgvector::HalfVector;
+
+static void test_constructor_vector() {
+    auto vec = HalfVector({1, 2, 3});
+    assert(vec.dimensions() == 3);
+}
+
+#if __cplusplus >= 202002L
+static void test_constructor_span() {
+    auto vec = HalfVector(std::span<const float>({1, 2, 3}));
+    assert(vec.dimensions() == 3);
+}
+#endif
+
+void test_halfvec() {
+    test_constructor_vector();
+#if __cplusplus >= 202002L
+    test_constructor_span();
+#endif
+}

test/main.cpp

@@ -1,79 +1,12 @@
-#include <cassert>
-#include <unordered_map>
-
-#include "../include/pgvector/halfvec.hpp"
-#include "../include/pgvector/sparsevec.hpp"
-#include "../include/pgvector/vector.hpp"
-
-#if __cplusplus >= 202002L
-#include <span>
-#endif
-
-using pgvector::HalfVector;
-using pgvector::SparseVector;
-using pgvector::Vector;
-
+void test_vector();
+void test_halfvec();
+void test_sparsevec();
 void test_pqxx();
 
-void test_vector() {
-    auto vec = Vector({1, 2, 3});
-    assert(vec.dimensions() == 3);
-}
-
-#if __cplusplus >= 202002L
-void test_vector_span() {
-    auto vec = Vector(std::span<const float>({1, 2, 3}));
-    assert(vec.dimensions() == 3);
-}
-#endif
-
-void test_halfvec() {
-    auto vec = HalfVector({1, 2, 3});
-    assert(vec.dimensions() == 3);
-}
-
-#if __cplusplus >= 202002L
-void test_halfvec_span() {
-    auto vec = HalfVector(std::span<const float>({1, 2, 3}));
-    assert(vec.dimensions() == 3);
-}
-#endif
-
-void test_sparsevec() {
-    auto vec = SparseVector({1, 0, 2, 0, 3, 0});
-    assert(vec.dimensions() == 6);
-    assert(vec.indices() == (std::vector<int>{0, 2, 4}));
-    assert(vec.values() == (std::vector<float>{1, 2, 3}));
-}
-
-#if __cplusplus >= 202002L
-void test_sparsevec_span() {
-    auto vec = SparseVector(std::span<const float>({1, 0, 2, 0, 3, 0}));
-    assert(vec.dimensions() == 6);
-}
-#endif
-
-void test_sparsevec_map() {
-    std::unordered_map<int, float> map = {{2, 2}, {4, 3}, {3, 0}, {0, 1}};
-    auto vec = SparseVector(map, 6);
-    assert(vec.dimensions() == 6);
-    assert(vec.indices() == (std::vector<int>{0, 2, 4}));
-    assert(vec.values() == (std::vector<float>{1, 2, 3}));
-}
-
 int main() {
-    test_pqxx();
     test_vector();
-#if __cplusplus >= 202002L
-    test_vector_span();
-#endif
     test_halfvec();
-#if __cplusplus >= 202002L
-    test_halfvec_span();
-#endif
     test_sparsevec();
-#if __cplusplus >= 202002L
-    test_sparsevec_span();
-#endif
+    test_pqxx();
     return 0;
 }

test/sparsevec_test.cpp

@@ -0,0 +1,40 @@
+#include <cassert>
+#include <unordered_map>
+
+#include "../include/pgvector/sparsevec.hpp"
+
+#if __cplusplus >= 202002L
+#include <span>
+#endif
+
+using pgvector::SparseVector;
+
+static void test_constructor_vector() {
+    auto vec = SparseVector({1, 0, 2, 0, 3, 0});
+    assert(vec.dimensions() == 6);
+    assert(vec.indices() == (std::vector<int>{0, 2, 4}));
+    assert(vec.values() == (std::vector<float>{1, 2, 3}));
+}
+
+#if __cplusplus >= 202002L
+static void test_constructor_span() {
+    auto vec = SparseVector(std::span<const float>({1, 0, 2, 0, 3, 0}));
+    assert(vec.dimensions() == 6);
+}
+#endif
+
+static void test_constructor_map() {
+    std::unordered_map<int, float> map = {{2, 2}, {4, 3}, {3, 0}, {0, 1}};
+    auto vec = SparseVector(map, 6);
+    assert(vec.dimensions() == 6);
+    assert(vec.indices() == (std::vector<int>{0, 2, 4}));
+    assert(vec.values() == (std::vector<float>{1, 2, 3}));
+}
+
+void test_sparsevec() {
+    test_constructor_vector();
+#if __cplusplus >= 202002L
+    test_constructor_span();
+#endif
+    test_constructor_map();
+}

test/vector_test.cpp

@@ -0,0 +1,28 @@
+#include <cassert>
+
+#include "../include/pgvector/vector.hpp"
+
+#if __cplusplus >= 202002L
+#include <span>
+#endif
+
+using pgvector::Vector;
+
+static void test_constructor_vector() {
+    auto vec = Vector({1, 2, 3});
+    assert(vec.dimensions() == 3);
+}
+
+#if __cplusplus >= 202002L
+static void test_constructor_span() {
+    auto vec = Vector(std::span<const float>({1, 2, 3}));
+    assert(vec.dimensions() == 3);
+}
+#endif
+
+void test_vector() {
+    test_constructor_vector();
+#if __cplusplus >= 202002L
+    test_constructor_span();
+#endif
+}