aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2025-02-14 13:53:06 +0100
committerPierre Ossman <ossman@cendio.se>2025-02-27 12:50:38 +0100
commitd79bf9fb23ed32bfc63e0ec622edf1ce384c05fc (patch)
tree245e3981c250b039632c57cd0ce04e7887cf34e4 /tests/unit
parent6823476b8bc4bd64ee4d440f244c5b563814bc00 (diff)
downloadtigervnc-d79bf9fb23ed32bfc63e0ec622edf1ce384c05fc.tar.gz
tigervnc-d79bf9fb23ed32bfc63e0ec622edf1ce384c05fc.zip
Convert convertLF() unit tests to Google Test
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/CMakeLists.txt3
-rw-r--r--tests/unit/convertlf.cxx135
2 files changed, 45 insertions, 93 deletions
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index d6431810..0e6b3fa3 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -15,7 +15,8 @@ add_executable(conv conv.cxx)
target_link_libraries(conv rfb)
add_executable(convertlf convertlf.cxx)
-target_link_libraries(convertlf core)
+target_link_libraries(convertlf core GTest::gtest_main)
+gtest_discover_tests(convertlf)
add_executable(gesturehandler gesturehandler.cxx ../../vncviewer/GestureHandler.cxx)
target_link_libraries(gesturehandler core)
diff --git a/tests/unit/convertlf.cxx b/tests/unit/convertlf.cxx
index 75179f03..3392725a 100644
--- a/tests/unit/convertlf.cxx
+++ b/tests/unit/convertlf.cxx
@@ -1,4 +1,4 @@
-/* Copyright 2019 Pierre Ossman <ossman@cendio.se> for Cendio AB
+/* Copyright 2019-2025 Pierre Ossman <ossman@cendio.se> for Cendio AB
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,105 +20,56 @@
#include <config.h>
#endif
-#include <stdio.h>
+#include <gtest/gtest.h>
#include <core/string.h>
-static const char* escape(const char* input)
+TEST(ConvertLF, convertLF)
{
- static char output[4096];
-
- const char* in;
- char* out;
-
- in = input;
- out = output;
- do {
- if (*in == '\r') {
- *out++ = '\\';
- *out++ = 'r';
- } else if (*in == '\n') {
- *out++ = '\\';
- *out++ = 'n';
- } else {
- *out++ = *in;
- }
- } while (*in++ != '\0');
-
- return output;
-}
-
-static void testLF(const char* input, const char* expected)
-{
- std::string output;
-
- printf("convertLF(\"%s\"): ", escape(input));
-
- output = core::convertLF(input);
-
- if (output != expected)
- printf("FAILED: got \"%s\"", escape(output.c_str()));
- else
- printf("OK");
- printf("\n");
- fflush(stdout);
+ EXPECT_EQ(core::convertLF(""), "");
+ EXPECT_EQ(core::convertLF("no EOL"), "no EOL");
+
+ EXPECT_EQ(core::convertLF("\n"), "\n");
+ EXPECT_EQ(core::convertLF("already correct\n"), "already correct\n");
+ EXPECT_EQ(core::convertLF("multiple\nlines\n"), "multiple\nlines\n");
+ EXPECT_EQ(core::convertLF("empty lines\n\n"), "empty lines\n\n");
+ EXPECT_EQ(core::convertLF("\ninitial line"), "\ninitial line");
+
+ EXPECT_EQ(core::convertLF("\r\n"), "\n");
+ EXPECT_EQ(core::convertLF("one line\r\n"), "one line\n");
+ EXPECT_EQ(core::convertLF("multiple\r\nlines\r\n"), "multiple\nlines\n");
+ EXPECT_EQ(core::convertLF("empty lines\r\n\r\n"), "empty lines\n\n");
+ EXPECT_EQ(core::convertLF("\r\ninitial line"), "\ninitial line");
+ EXPECT_EQ(core::convertLF("mixed\r\nlines\n"), "mixed\nlines\n");
+
+ EXPECT_EQ(core::convertLF("cropped\r"), "cropped\n");
+ EXPECT_EQ(core::convertLF("old\rmac\rformat"), "old\nmac\nformat");
}
-static void testCRLF(const char* input, const char* expected)
+TEST(ConvertLF, convertCRLF)
{
- std::string output;
-
- printf("convertCRLF(\"%s\"): ", escape(input));
-
- output = core::convertCRLF(input);
-
- if (output != expected)
- printf("FAILED: got \"%s\"", escape(output.c_str()));
- else
- printf("OK");
- printf("\n");
- fflush(stdout);
+ EXPECT_EQ(core::convertCRLF(""), "");
+ EXPECT_EQ(core::convertCRLF("no EOL"), "no EOL");
+
+ EXPECT_EQ(core::convertCRLF("\r\n"), "\r\n");
+ EXPECT_EQ(core::convertCRLF("already correct\r\n"), "already correct\r\n");
+ EXPECT_EQ(core::convertCRLF("multiple\r\nlines\r\n"), "multiple\r\nlines\r\n");
+ EXPECT_EQ(core::convertCRLF("empty lines\r\n\r\n"), "empty lines\r\n\r\n");
+ EXPECT_EQ(core::convertCRLF("\r\ninitial line"), "\r\ninitial line");
+
+ EXPECT_EQ(core::convertCRLF("\n"), "\r\n");
+ EXPECT_EQ(core::convertCRLF("one line\n"), "one line\r\n");
+ EXPECT_EQ(core::convertCRLF("multiple\nlines\n"), "multiple\r\nlines\r\n");
+ EXPECT_EQ(core::convertCRLF("empty lines\n\n"), "empty lines\r\n\r\n");
+ EXPECT_EQ(core::convertCRLF("\ninitial line"), "\r\ninitial line");
+ EXPECT_EQ(core::convertCRLF("mixed\r\nlines\n"), "mixed\r\nlines\r\n");
+
+ EXPECT_EQ(core::convertCRLF("cropped\r"), "cropped\r\n");
+ EXPECT_EQ(core::convertCRLF("old\rmac\rformat"), "old\r\nmac\r\nformat");
}
-int main(int /*argc*/, char** /*argv*/)
+int main(int argc, char** argv)
{
- testLF("", "");
- testLF("no EOL", "no EOL");
-
- testLF("\n", "\n");
- testLF("already correct\n", "already correct\n");
- testLF("multiple\nlines\n", "multiple\nlines\n");
- testLF("empty lines\n\n", "empty lines\n\n");
- testLF("\ninitial line", "\ninitial line");
-
- testLF("\r\n", "\n");
- testLF("one line\r\n", "one line\n");
- testLF("multiple\r\nlines\r\n", "multiple\nlines\n");
- testLF("empty lines\r\n\r\n", "empty lines\n\n");
- testLF("\r\ninitial line", "\ninitial line");
- testLF("mixed\r\nlines\n", "mixed\nlines\n");
-
- testLF("cropped\r", "cropped\n");
- testLF("old\rmac\rformat", "old\nmac\nformat");
-
- testCRLF("", "");
- testCRLF("no EOL", "no EOL");
-
- testCRLF("\r\n", "\r\n");
- testCRLF("already correct\r\n", "already correct\r\n");
- testCRLF("multiple\r\nlines\r\n", "multiple\r\nlines\r\n");
- testCRLF("empty lines\r\n\r\n", "empty lines\r\n\r\n");
- testCRLF("\r\ninitial line", "\r\ninitial line");
-
- testCRLF("\n", "\r\n");
- testCRLF("one line\n", "one line\r\n");
- testCRLF("multiple\nlines\n", "multiple\r\nlines\r\n");
- testCRLF("empty lines\n\n", "empty lines\r\n\r\n");
- testCRLF("\ninitial line", "\r\ninitial line");
- testCRLF("mixed\r\nlines\n", "mixed\r\nlines\r\n");
-
- testCRLF("cropped\r", "cropped\r\n");
- testCRLF("old\rmac\rformat", "old\r\nmac\r\nformat");
-
- return 0;
+ testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-30 11:10:47 +0000