Move test files into src/

KredeGC · KredeGC · commit 5292326a6f97 · 2023-02-28T18:37:40.000+01:00
Change test to use constructor initialization
diff --git a/Doxyfile b/Doxyfile
@@ -173,7 +173,7 @@ FILE_PATTERNS          = *.c \
                          *.qsf \
                          *.ice
 RECURSIVE              = YES
-EXCLUDE                = test \
+EXCLUDE                = src \
                          doxygen-awesome-css
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ If you really want it to work with earlier versions, you should just be able to
 As this is a header-only library, you can simply copy the header files directly into your project and include them where relevant.
 The header files can either be downloaded from the [releases page](https://github.com/KredeGC/BitStream/releases) or from the [`include/`](https://github.com/KredeGC/BitStream/tree/master/include/bitstream) directory on the master branch.
 
-The source and header files inside the `test/` directory are only tests and should not be included into your project, unless you wish to test the library as part of your pipeline.
+The source and header files inside the `src/` directory are only tests and should not be included into your project, unless you wish to test the library as part of your pipeline.
 
 # Usage
 The library has a global header file ([`bitstream/bitstream.h`](https://github.com/KredeGC/BitStream/tree/master/include/bitstream/bitstream.h)) which includes every other header file in the library.
diff --git a/premake5.lua b/premake5.lua
@@ -71,13 +71,13 @@ project "Test"
     objdir ("bin-obj/%{outputdir}")
 
     files {
-        "test/src/**.cpp",
-        "test/include/**.h",
+        "src/**.cpp",
+        "src/**.h",
         "include/**.h"
     }
 
     includedirs {
-        "test/include",
+        "src",
         "include"
     }
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,12 +1,8 @@
-#include "test.h"
-
-int main(int argc, const char** argv)
-{
-    bitstream::test::unit::run_all_tests();
-
-#ifdef _WIN32
-        system("pause");
-#endif
-    
-    return 0;
+#include "shared/test.h"
+
+int main(int argc, const char** argv)
+{
+    bitstream::test::unit::run_all_tests();
+    
+    return 0;
 }
diff --git a/src/shared/assert.h b/src/shared/assert.h
diff --git a/src/shared/test.h b/src/shared/test.h
@@ -4,7 +4,8 @@
 #include <string>
 
 #define BS_ADD_TEST3(func_ptr, line) void func_ptr(); \
-	static int test_##line = (::bitstream::test::unit::add_test(#func_ptr, func_ptr), 0); \
+	struct test_struct_##func_ptr##_##line { test_struct_##func_ptr##_##line() { ::bitstream::test::unit::add_test(#func_ptr, func_ptr); } }; \
+	static test_struct_##func_ptr##_##line test_var_##func_ptr##_##line; \
 	void func_ptr()
 
 #define BS_ADD_TEST2(func_ptr, line) BS_ADD_TEST3(func_ptr, line)
diff --git a/src/shared/test_types.h b/src/shared/test_types.h
diff --git a/src/test.cpp b/src/test.cpp
@@ -1,4 +1,4 @@
-#include "test.h"
+#include "shared/test.h"
 
 #include <bitstream/bitstream.h>
 
diff --git a/src/test/quantization_test.cpp b/src/test/quantization_test.cpp
@@ -1,6 +1,6 @@
-#include "test_assert.h"
-#include "test.h"
-#include "test_types.h"
+#include "../shared/assert.h"
+#include "../shared/test.h"
+#include "../shared/test_types.h"
 
 #include <bitstream/quantization/bounded_range.h>
 #include <bitstream/quantization/half_precision.h>
diff --git a/src/test/serialize_array_traits.cpp b/src/test/serialize_array_traits.cpp
@@ -1,5 +1,5 @@
-#include "test_assert.h"
-#include "test.h"
+#include "../shared/assert.h"
+#include "../shared/test.h"
 
 #include <bitstream/stream/bit_reader.h>
 #include <bitstream/stream/bit_writer.h>
diff --git a/src/test/serialize_bool_test.cpp b/src/test/serialize_bool_test.cpp
@@ -1,5 +1,5 @@
-#include "test_assert.h"
-#include "test.h"
+#include "../shared/assert.h"
+#include "../shared/test.h"
 
 #include <bitstream/stream/bit_reader.h>
 #include <bitstream/stream/bit_writer.h>
diff --git a/src/test/serialize_integral_test.cpp b/src/test/serialize_integral_test.cpp
@@ -1,5 +1,5 @@
-#include "test_assert.h"
-#include "test.h"
+#include "../shared/assert.h"
+#include "../shared/test.h"
 
 #include <bitstream/stream/bit_reader.h>
 #include <bitstream/stream/bit_writer.h>
diff --git a/src/test/serialize_quantization_test.cpp b/src/test/serialize_quantization_test.cpp
@@ -1,114 +1,114 @@
-#include "test_assert.h"
-#include "test.h"
-#include "test_types.h"
-
-#include <bitstream/stream/bit_reader.h>
-#include <bitstream/stream/bit_writer.h>
-
-#include <bitstream/traits/quantization_traits.h>
-
-#include <cmath>
-
-namespace bitstream::test::traits
-{
-	BS_ADD_TEST(test_serialize_float)
-	{
-		// Test float
-		float value_in = 3.141592f;
-
-		uint8_t buffer[16]{ 0 };
-		bit_writer writer(buffer, 16);
-
-		BS_TEST_ASSERT(writer.serialize<float>(value_in));
-		uint32_t num_bytes = writer.flush();
-
-		BS_TEST_ASSERT_OPERATION(num_bytes, == , 4);
-
-
-		float value_out;
-		bit_reader reader(buffer, num_bytes);
-
-		BS_TEST_ASSERT(reader.serialize<float>(value_out));
-
-		BS_TEST_ASSERT_OPERATION(value_in, ==, value_out);
-	}
-
-    BS_ADD_TEST(test_serialize_half_precision)
-	{
-		// Test half precision float
-		float value_in = 3.141592f;
-
-		uint8_t buffer[16]{ 0 };
-		bit_writer writer(buffer, 16);
-
-		BS_TEST_ASSERT(writer.serialize<half_precision>(value_in));
-		uint32_t num_bytes = writer.flush();
-
-		BS_TEST_ASSERT_OPERATION(num_bytes, ==, 2);
-
-
-		float value_out;
-		bit_reader reader(buffer, num_bytes);
-
-		BS_TEST_ASSERT(reader.serialize<half_precision>(value_out));
-        
-        constexpr float epsilon = 1e-3f;
-
-		BS_TEST_ASSERT_OPERATION(std::abs(value_in - value_out), <=, epsilon);
-	}
-
-	BS_ADD_TEST(test_serialize_bounded_range)
-	{
-		// Test bounded float
-		float value_in = 3.141592f;
-		bounded_range range(0.0f, 5.0f, 0.0001f);
-
-		uint8_t buffer[16]{ 0 };
-		bit_writer writer(buffer, 16);
-
-		BS_TEST_ASSERT(writer.serialize<bounded_range>(range, value_in));
-		uint32_t num_bytes = writer.flush();
-
-		BS_TEST_ASSERT_OPERATION(num_bytes, == , 2);
-
-
-		float value_out;
-		bit_reader reader(buffer, num_bytes);
-
-		BS_TEST_ASSERT(reader.serialize<bounded_range>(range, value_out));
-
-		BS_TEST_ASSERT_OPERATION(std::abs(value_in - value_out), <= , range.get_precision());
-		BS_TEST_ASSERT_OPERATION(range.get_bits_required(), < , 32);
-	}
-
-	BS_ADD_TEST(test_serialize_smallest_three)
-	{
-		using trait = smallest_three<quaternion, 11>;
-
-		// Test smallest three
-		quaternion value_in(0.0f, std::sin(2.0f), std::cos(2.0f), 0.0f);
-
-		uint8_t buffer[16]{ 0 };
-		bit_writer writer(buffer, 16);
-
-		BS_TEST_ASSERT(writer.serialize<trait>(value_in));
-		uint32_t num_bytes = writer.flush();
-
-		BS_TEST_ASSERT_OPERATION(num_bytes, == , 5);
-
-
-		quaternion value_out;
-		bit_reader reader(buffer, num_bytes);
-
-		BS_TEST_ASSERT(reader.serialize<trait>(value_out));
-
-		float dot = value_in.x * value_out.x + value_in.y * value_out.y + value_in.z * value_out.z + value_in.w * value_out.w;
-
-		if (dot < 0.0f)
-			dot *= -1.0f;
-
-		constexpr float epsilon = 1e-5f;
-
-		BS_TEST_ASSERT_OPERATION(dot, >= , (1.0f - epsilon));
-	}
+#include "../shared/assert.h"
+#include "../shared/test.h"
+#include "../shared/test_types.h"
+
+#include <bitstream/stream/bit_reader.h>
+#include <bitstream/stream/bit_writer.h>
+
+#include <bitstream/traits/quantization_traits.h>
+
+#include <cmath>
+
+namespace bitstream::test::traits
+{
+	BS_ADD_TEST(test_serialize_float)
+	{
+		// Test float
+		float value_in = 3.141592f;
+
+		uint8_t buffer[16]{ 0 };
+		bit_writer writer(buffer, 16);
+
+		BS_TEST_ASSERT(writer.serialize<float>(value_in));
+		uint32_t num_bytes = writer.flush();
+
+		BS_TEST_ASSERT_OPERATION(num_bytes, == , 4);
+
+
+		float value_out;
+		bit_reader reader(buffer, num_bytes);
+
+		BS_TEST_ASSERT(reader.serialize<float>(value_out));
+
+		BS_TEST_ASSERT_OPERATION(value_in, ==, value_out);
+	}
+
+    BS_ADD_TEST(test_serialize_half_precision)
+	{
+		// Test half precision float
+		float value_in = 3.141592f;
+
+		uint8_t buffer[16]{ 0 };
+		bit_writer writer(buffer, 16);
+
+		BS_TEST_ASSERT(writer.serialize<half_precision>(value_in));
+		uint32_t num_bytes = writer.flush();
+
+		BS_TEST_ASSERT_OPERATION(num_bytes, ==, 2);
+
+
+		float value_out;
+		bit_reader reader(buffer, num_bytes);
+
+		BS_TEST_ASSERT(reader.serialize<half_precision>(value_out));
+        
+        constexpr float epsilon = 1e-3f;
+
+		BS_TEST_ASSERT_OPERATION(std::abs(value_in - value_out), <=, epsilon);
+	}
+
+	BS_ADD_TEST(test_serialize_bounded_range)
+	{
+		// Test bounded float
+		float value_in = 3.141592f;
+		bounded_range range(0.0f, 5.0f, 0.0001f);
+
+		uint8_t buffer[16]{ 0 };
+		bit_writer writer(buffer, 16);
+
+		BS_TEST_ASSERT(writer.serialize<bounded_range>(range, value_in));
+		uint32_t num_bytes = writer.flush();
+
+		BS_TEST_ASSERT_OPERATION(num_bytes, == , 2);
+
+
+		float value_out;
+		bit_reader reader(buffer, num_bytes);
+
+		BS_TEST_ASSERT(reader.serialize<bounded_range>(range, value_out));
+
+		BS_TEST_ASSERT_OPERATION(std::abs(value_in - value_out), <= , range.get_precision());
+		BS_TEST_ASSERT_OPERATION(range.get_bits_required(), < , 32);
+	}
+
+	BS_ADD_TEST(test_serialize_smallest_three)
+	{
+		using trait = smallest_three<quaternion, 11>;
+
+		// Test smallest three
+		quaternion value_in(0.0f, std::sin(2.0f), std::cos(2.0f), 0.0f);
+
+		uint8_t buffer[16]{ 0 };
+		bit_writer writer(buffer, 16);
+
+		BS_TEST_ASSERT(writer.serialize<trait>(value_in));
+		uint32_t num_bytes = writer.flush();
+
+		BS_TEST_ASSERT_OPERATION(num_bytes, == , 5);
+
+
+		quaternion value_out;
+		bit_reader reader(buffer, num_bytes);
+
+		BS_TEST_ASSERT(reader.serialize<trait>(value_out));
+
+		float dot = value_in.x * value_out.x + value_in.y * value_out.y + value_in.z * value_out.z + value_in.w * value_out.w;
+
+		if (dot < 0.0f)
+			dot *= -1.0f;
+
+		constexpr float epsilon = 1e-5f;
+
+		BS_TEST_ASSERT_OPERATION(dot, >= , (1.0f - epsilon));
+	}
 }
diff --git a/src/test/serialize_string_test.cpp b/src/test/serialize_string_test.cpp
@@ -1,5 +1,5 @@
-#include "test_assert.h"
-#include "test.h"
+#include "../shared/assert.h"
+#include "../shared/test.h"
 
 #include <bitstream/stream/bit_reader.h>
 #include <bitstream/stream/bit_writer.h>
diff --git a/src/test/stream_test.cpp b/src/test/stream_test.cpp
@@ -1,5 +1,5 @@
-#include "test_assert.h"
-#include "test.h"
+#include "../shared/assert.h"
+#include "../shared/test.h"
 
 #include <bitstream/stream/bit_reader.h>
 #include <bitstream/stream/bit_writer.h>

Original file line number	Diff line number	Diff line change
`@@ -71,13 +71,13 @@ project "Test"`
`71`	`71`	`objdir ("bin-obj/%{outputdir}")`
`72`	`72`
`73`	`73`	`files {`
`74`		`- "test/src/**.cpp",`
`75`		`- "test/include/**.h",`
	`74`	`+ "src/**.cpp",`
	`75`	`+ "src/**.h",`
`76`	`76`	`"include/**.h"`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`includedirs {`
`80`		`- "test/include",`
	`80`	`+ "src",`
`81`	`81`	`"include"`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "test.h"`
	`1`	`+#include "shared/test.h"`
`2`	`2`
`3`	`3`	`#include <bitstream/bitstream.h>`
`4`	`4`