Start adding unit tests for cmdlib

Author: electricbrass

common/cmdlib.cpp

@@ -560,14 +560,14 @@ static int _isspace(int c)
 // Trim whitespace from the start of a string
 std::string &TrimStringStart(std::string &s)
 {
-	s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not_fn([](int c){ return _isspace(c); })));
+	s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not_fn( _isspace )));
 	return s;
 }
 
 // Trim whitespace from the end of a string
 std::string &TrimStringEnd(std::string &s)
 {
-	s.erase(std::find_if(s.rbegin(), s.rend(), std::not_fn([](int c){ return _isspace(c); })).base(), s.end());
+	s.erase(std::find_if(s.rbegin(), s.rend(), std::not_fn( _isspace )).base(), s.end());
 	return s;
 }
 
@@ -751,39 +751,4 @@ uint32_t Log2(uint32_t n)
 		return (t = (n >> 8)) ? 8 + LogTable256[t] : LogTable256[n];
 }
 
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-/**
- * @brief Returns the next representable value of from in the direction of to.
- */
-float NextAfter(const float from, const float to)
-{
-	const float x = from;
-	const float y = to;
-	union {
-		float f;
-		unsigned int i;
-	} u;
-	if (isnan(y) || isnan(x))
-		return x + y;
-	if (x == y)
-		/* nextafter (0.0, -O.0) should return -0.0.  */
-		return y;
-	u.f = x;
-	if (x == 0.0F)
-	{
-		u.i = 1;
-		return y > 0.0F ? u.f : -u.f;
-	}
-	if (((x > 0.0F) ^ (y > x)) == 0)
-		u.i++;
-	else
-		u.i--;
-	return u.f;
-}
-
 VERSION_CONTROL (cmdlib_cpp, "$Id$")

common/cmdlib.h

@@ -106,7 +106,6 @@ void StripColorCodes(std::string& str);
 double Remap(const double value, const double low1, const double high1, const double low2,
              const double high2);
 uint32_t Log2(uint32_t n);
-float NextAfter(const float from, const float to);
 
 /**
  * @brief Initialize an array with a specific value.

common/p_hordedefine.cpp

@@ -193,7 +193,7 @@ size_t P_HordePickDefine(const int current, const int total)
 		const float section_size = static_cast<float>(::WAVE_DEFINES.size()) / total;
 		const float section_offset = (current - 1) * section_size;
 		const float section_choice = M_RandomFloat() * section_size;
-		const float section_limit = NextAfter(section_offset + section_size, 0.0f);
+		const float section_limit = nextafter(section_offset + section_size, 0.0f);
 		return MIN<size_t>(section_offset + section_choice, section_limit);
 	}
 	else if (current <= 1)
@@ -372,9 +372,9 @@ BEGIN_COMMAND(hordedefine)
 						const float section_size =
 						    static_cast<float>(::WAVE_DEFINES.size()) / total;
 						const float section_offset = (current - 1) * section_size;
-						const float section_choice = NextAfter(1.0f, 0.0f) * section_size;
+						const float section_choice = nextafter(1.0f, 0.0f) * section_size;
 						const float section_limit =
-						    NextAfter(section_offset + section_size, 0.0f);
+						    nextafter(section_offset + section_size, 0.0f);
 						const size_t start = static_cast<size_t>(section_offset);
 						const size_t end =
 						    MIN<size_t>(section_offset + section_choice, section_limit);

tests/unit-tests/test/t_cmdlib.cpp

@@ -0,0 +1,70 @@
+#include "gtest/gtest.h"
+#include "odamex.h"
+#include "cmdlib.h"
+
+TEST(CmdLib, CopyString) {
+    const char* str1 = "test";
+    const char* str2 = copystring(str1);
+    EXPECT_STREQ(str2, "test");
+    EXPECT_STREQ(str2, str1);
+}
+
+TEST(CmdLib, CopyNullString) {
+    const char* str1 = nullptr;
+    const char* str2 = copystring(str1);
+    EXPECT_STREQ(str2, "");
+    EXPECT_EQ(str2[0], '\0');
+}
+
+TEST(CmdLib, CopyEmptyString) {
+    const char* str1 = "";
+    const char* str2 = copystring(str1);
+    EXPECT_STREQ(str2, "");
+    EXPECT_EQ(str2[0], '\0');
+}
+
+TEST(CmdLib, CheckWildcardsNullArgs) {
+    const char* str1 = nullptr;
+    const char* str2 = "test";
+    EXPECT_TRUE(CheckWildcards(str1, str2));
+    str1 = "test";
+    str2 = nullptr;
+    EXPECT_TRUE(CheckWildcards(str1, str2));
+    str1 = nullptr;
+    str2 = nullptr;
+    EXPECT_TRUE(CheckWildcards(str1, str2));
+}
+
+TEST(CmdLib, TrimString) {
+    // spaces
+    std::string test = "hello ";
+    EXPECT_EQ(TrimString(test), "hello");
+    test = " hello";
+    EXPECT_EQ(TrimString(test), "hello");
+    test = " hello ";
+    EXPECT_EQ(TrimString(test), "hello");
+    // tabs
+    test = "	hello	";
+    EXPECT_EQ(TrimString(test), "hello");
+    // newlines
+    test = "\nhello\n";
+    EXPECT_EQ(TrimString(test), "hello");
+    // carriage return
+    test = "\rhello\r";
+    EXPECT_EQ(TrimString(test), "hello");
+    test = "\r\nhello\r\n";
+    EXPECT_EQ(TrimString(test), "hello");
+    // the other things
+    test = "\vhello\v";
+    EXPECT_EQ(TrimString(test), "hello");
+    test = "\fhello\f";
+    EXPECT_EQ(TrimString(test), "hello");
+    test = "\rhello\r";
+    EXPECT_EQ(TrimString(test), "hello");
+    // everything
+    test = "\r\v\f \n\thello\n \r\f \v";
+    EXPECT_EQ(TrimString(test), "hello");
+    // in the middle
+    test = "he   llo";
+    EXPECT_EQ(TrimString(test), "he   llo");
+}