Translated tests for Random/RandomRange

Test/CMakeLists.txt

@@ -23,9 +23,11 @@ add_executable(Tests
         Vector2.cpp
         Vector3.cpp
         Vector4.cpp
+        VectorConversion.cpp
         Quaternion.cpp
         Random__RandomFloat.cpp
-        VectorConversion.cpp
+        Random__RandomInteger.cpp
+        Random__RandomRange.cpp
 )
 
 target_link_libraries(Tests Eule)

Test/Random__RandomInteger.cpp

@@ -1,20 +1,13 @@
-#include "CppUnitTest.h"
+#include "Catch2.h"
 #include "../_TestingUtilities/Testutil.h"
-#include "../Eule/Random.h"
+#include <Eule/Random.h>
 #include <array>
-#include <sstream>
 
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 using namespace Eule;
 
-namespace _Random
+// Checks that the produced unsigned-integer distribution shows a big standard deviation
+TEST_CASE(__FILE__"/Uint_Big_Standard_Deviation", "[Random][RandomInt]")
 {
-	TEST_CLASS(_RandomInteger)
-	{
-	public:
-		// Checks that the produced unsigned-integer distribution shows a big standard deviation
-		TEST_METHOD(Uint_Big_Standard_Deviation)
-		{
     // Setup
     std::vector<unsigned int> rands;
     rands.resize(1000);
@@ -25,14 +18,14 @@ namespace _Random
 
     // Verify
     const double stddev = Testutil::Stddev<unsigned int>(rands);
-			Assert::IsTrue(stddev >= 1000000, (std::wstringstream() << stddev).str().c_str());
+    REQUIRE(stddev >= 1000000);
 
     return;
-		}
+}
 
-		// Checks that the produced integer distribution shows a big standard deviation
+// Checks that the produced integer distribution shows a big standard deviation
-		TEST_METHOD(Int_Big_Standard_Deviation)
+TEST_CASE(__FILE__"/Int_Big_Standard_Deviation", "[Random][RandomInt]")
-		{
+{
     // Setup
     std::vector<int> rands;
     rands.resize(1000);
@@ -43,9 +36,7 @@ namespace _Random
 
     // Verify
     const double stddev = Testutil::Stddev<int>(rands);
-			Assert::IsTrue(stddev >= 1000000, (std::wstringstream() << stddev).str().c_str());
+    REQUIRE(stddev >= 1000000);
 
     return;
-		}
-	};
 }

Test/Random__RandomRange.cpp

@@ -1,66 +1,64 @@
-#include "CppUnitTest.h"
+#include "Catch2.h"
 #include "../_TestingUtilities/Testutil.h"
-#include "../Eule/Random.h"
+#include <Eule/Random.h>
 #include <array>
-#include <sstream>
 
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 using namespace Eule;
 
-namespace _Random
+// Checks that a random double is never outside the specification, two positive values
+TEST_CASE(__FILE__"/Random_Doublerange_Never_Outside_Specification__pos__pos", "[Random][RandomRange]")
 {
-	TEST_CLASS(_RandomRange)
-	{
-	public:
-		
-		// Checks that a random double is never outside the specification, two positive values
-		TEST_METHOD(Random_Doublerange_Never_Outside_Specification__pos__pos)
-		{
     // Test 1000 random integers
     for (std::size_t i = 0; i < 1000; i++)
     {
         double rnd = Random::RandomRange(49.0, 99.0);
 
-				Assert::IsTrue(rnd >= 49.0, L"rnd too small");
+        INFO("rnd too small");
-				Assert::IsTrue(rnd <= 99.0, L"rnd too big");
+        REQUIRE(rnd >= 49.0);
+        INFO("rnd too big");
+        REQUIRE(rnd <= 99.0);
     }
 
     return;
-		}
+}
 
-		// Checks that a random double is never outside the specification, negative minimum
+// Checks that a random double is never outside the specification, negative minimum
-		TEST_METHOD(Random_Doublerange_Never_Outside_Specification__neg__pos)
+TEST_CASE(__FILE__"/Random_Doublerange_Never_Outside_Specification__neg__pos", "[Random][RandomRange]")
-		{
+{
     // Test 1000 random integers
     for (std::size_t i = 0; i < 1000; i++)
     {
         double rnd = Random::RandomRange(-39.0, 99.0);
 
-				Assert::IsTrue(rnd >= -39.0, L"rnd too small");
+        INFO("rnd too small");
-				Assert::IsTrue(rnd <= 99.0, L"rnd too big");
+        REQUIRE(rnd >= -39.0);
+        INFO("rnd too big");
+        REQUIRE(rnd <= 99.0);
     }
 
     return;
-		}
+}
 
-		// Checks that a random double is never outside the specification, two negative values
+// Checks that a random double is never outside the specification, two negative values
-		TEST_METHOD(Random_Doublerange_Never_Outside_Specification__neg__neg)
+TEST_CASE(__FILE__"/Random_Doublerange_Never_Outside_Specification__neg__neg", "[Random][RandomRange]")
-		{
+{
     // Test 1000 random integers
     for (std::size_t i = 0; i < 1000; i++)
     {
         double rnd = Random::RandomRange(-39.0, -10.0);
 
-				Assert::IsTrue(rnd >= -39.0, L"rnd too small");
+        INFO("rnd too small");
-				Assert::IsTrue(rnd <= -10.0, L"rnd too big");
+        REQUIRE(rnd >= -39.0);
+        INFO("rnd too big");
+        REQUIRE(rnd <= -10.0);
     }
 
     return;
-		}
+}
 
-		// Checks that the produced double-precision floating point distribution shows a big standard deviation
+// Checks that the produced double-precision floating point distribution shows a big standard deviation
-		TEST_METHOD(Double_Big_Standard_Deviation)
+TEST_CASE(__FILE__"/Double_Big_Standard_Deviation", "[Random][RandomRange]")
-		{
+{
     // Setup
     std::vector<double> rands;
     rands.resize(100);
@@ -71,9 +69,7 @@ namespace _Random
 
     // Verify
     const double stddev = Testutil::Stddev(rands);
-			Assert::IsTrue(stddev >= 1000000, (std::wstringstream() << stddev).str().c_str());
+    REQUIRE(stddev >= 1000000);
 
     return;
-		}
-	};
 }