Improved tests

Author: ankane

test/halfvec_test.cpp

@@ -8,12 +8,12 @@ using pgvector::HalfVector;
 
 static void test_constructor_vector() {
     auto vec = HalfVector({1, 2, 3});
-    assert_equal(vec.dimensions(), static_cast<size_t>(3));
+    assert_equal(vec.dimensions(), 3u);
 }
 
 static void test_constructor_span() {
     auto vec = HalfVector(std::span<const float>({1, 2, 3}));
-    assert_equal(vec.dimensions(), static_cast<size_t>(3));
+    assert_equal(vec.dimensions(), 3u);
 }
 
 void test_halfvec() {

test/helper.hpp

@@ -6,8 +6,8 @@
 #include <sstream>
 #include <string_view>
 
-template<typename T>
-void assert_equal(const T& left, const T& right, const std::source_location& loc = std::source_location::current()) {
+template<typename T, typename U>
+void assert_equal(const T& left, const U& right, const std::source_location& loc = std::source_location::current()) {
     if (left != right) {
         std::ostringstream message;
         message << left << " != " << right;

test/pqxx_test.cpp

@@ -124,8 +124,8 @@ void test_stream_to(pqxx::connection &conn) {
     stream.write_values(pgvector::Vector({4, 5, 6}));
     stream.complete();
     pqxx::result res = tx.exec("SELECT embedding FROM items ORDER BY id");
-    assert_equal(res[0][0].as<std::string>(), std::string("[1,2,3]"));
-    assert_equal(res[1][0].as<std::string>(), std::string("[4,5,6]"));
+    assert_equal(res[0][0].as<std::string>(), "[1,2,3]");
+    assert_equal(res[1][0].as<std::string>(), "[4,5,6]");
 }
 
 void test_precision(pqxx::connection &conn) {
@@ -140,8 +140,8 @@ void test_precision(pqxx::connection &conn) {
 }
 
 void test_vector_to_string() {
-    assert_equal(pqxx::to_string(pgvector::Vector({1, 2, 3})), std::string("[1,2,3]"));
-    assert_equal(pqxx::to_string(pgvector::Vector({-1.234567890123})), std::string("[-1.2345679]"));
+    assert_equal(pqxx::to_string(pgvector::Vector({1, 2, 3})), "[1,2,3]");
+    assert_equal(pqxx::to_string(pgvector::Vector({-1.234567890123})), "[-1.2345679]");
 
     assert_exception<pqxx::conversion_overrun>([] {
         auto unused = pqxx::to_string(pgvector::Vector(std::vector<float>(16001)));
@@ -178,8 +178,8 @@ void test_vector_from_string() {
 }
 
 void test_halfvec_to_string() {
-    assert_equal(pqxx::to_string(pgvector::HalfVector({1, 2, 3})), std::string("[1,2,3]"));
-    assert_equal(pqxx::to_string(pgvector::HalfVector({-1.234567890123})), std::string("[-1.2345679]"));
+    assert_equal(pqxx::to_string(pgvector::HalfVector({1, 2, 3})), "[1,2,3]");
+    assert_equal(pqxx::to_string(pgvector::HalfVector({-1.234567890123})), "[-1.2345679]");
 
     assert_exception<pqxx::conversion_overrun>([] {
         auto unused = pqxx::to_string(pgvector::HalfVector(std::vector<float>(16001)));
@@ -216,9 +216,9 @@ void test_halfvec_from_string() {
 }
 
 void test_sparsevec_to_string() {
-    assert_equal(pqxx::to_string(pgvector::SparseVector({1, 0, 2, 0, 3, 0})), std::string("{1:1,3:2,5:3}/6"));
+    assert_equal(pqxx::to_string(pgvector::SparseVector({1, 0, 2, 0, 3, 0})), "{1:1,3:2,5:3}/6");
     std::unordered_map<int, float> map = {{999999999, -1.234567890123}};
-    assert_equal(pqxx::to_string(pgvector::SparseVector(map, 1000000000)), std::string("{1000000000:-1.2345679}/1000000000"));
+    assert_equal(pqxx::to_string(pgvector::SparseVector(map, 1000000000)), "{1000000000:-1.2345679}/1000000000");
 }
 
 void test_sparsevec_from_string() {

test/vector_test.cpp

@@ -8,12 +8,12 @@ using pgvector::Vector;
 
 static void test_constructor_vector() {
     auto vec = Vector({1, 2, 3});
-    assert_equal(vec.dimensions(), static_cast<size_t>(3));
+    assert_equal(vec.dimensions(), 3u);
 }
 
 static void test_constructor_span() {
     auto vec = Vector(std::span<const float>({1, 2, 3}));
-    assert_equal(vec.dimensions(), static_cast<size_t>(3));
+    assert_equal(vec.dimensions(), 3u);
 }
 
 void test_vector() {