summaryrefslogtreecommitdiffstats
path: root/tests/CompositeChat
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2019-08-26 21:38:34 +0200
committerGitHub <noreply@github.com>2019-08-26 21:38:34 +0200
commit74579fbadf0f89154cba5d9157a57f59fcda8f70 (patch)
tree2aca1ce5d8e41e91adcfe25dfb4bb51369fb865e /tests/CompositeChat
parentAdded BlockState implementation for 1.13 support. (diff)
downloadcuberite-74579fbadf0f89154cba5d9157a57f59fcda8f70.tar
cuberite-74579fbadf0f89154cba5d9157a57f59fcda8f70.tar.gz
cuberite-74579fbadf0f89154cba5d9157a57f59fcda8f70.tar.bz2
cuberite-74579fbadf0f89154cba5d9157a57f59fcda8f70.tar.lz
cuberite-74579fbadf0f89154cba5d9157a57f59fcda8f70.tar.xz
cuberite-74579fbadf0f89154cba5d9157a57f59fcda8f70.tar.zst
cuberite-74579fbadf0f89154cba5d9157a57f59fcda8f70.zip
Diffstat (limited to '')
-rw-r--r--tests/CompositeChat/CMakeLists.txt7
-rw-r--r--tests/CompositeChat/CompositeChatTest.cpp86
2 files changed, 37 insertions, 56 deletions
diff --git a/tests/CompositeChat/CMakeLists.txt b/tests/CompositeChat/CMakeLists.txt
index 52eeedbe9..03a100d91 100644
--- a/tests/CompositeChat/CMakeLists.txt
+++ b/tests/CompositeChat/CMakeLists.txt
@@ -10,14 +10,13 @@ add_definitions(-DTEST_GLOBALS=1)
set (SHARED_SRCS
${CMAKE_SOURCE_DIR}/src/CompositeChat.cpp
- ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp
- ${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
+ ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp
)
set (SHARED_HDRS
+ ../TestHelpers.h
${CMAKE_SOURCE_DIR}/src/CompositeChat.h
- ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h
- ${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
+ ${CMAKE_SOURCE_DIR}/src/StringUtils.h
)
set (SRCS
diff --git a/tests/CompositeChat/CompositeChatTest.cpp b/tests/CompositeChat/CompositeChatTest.cpp
index 65d05b6f1..a6ac86921 100644
--- a/tests/CompositeChat/CompositeChatTest.cpp
+++ b/tests/CompositeChat/CompositeChatTest.cpp
@@ -4,6 +4,7 @@
// Implements the main app entrypoint for the cCompositeChat class test
#include "Globals.h"
+#include "../TestHelpers.h"
#include "CompositeChat.h"
@@ -15,15 +16,15 @@ static void TestParser1(void)
cCompositeChat Msg;
Msg.ParseText("Testing @2color codes and http://links parser");
const cCompositeChat::cParts & Parts = Msg.GetParts();
- assert_test(Parts.size() == 4);
- assert_test(Parts[0]->m_PartType == cCompositeChat::ptText);
- assert_test(Parts[1]->m_PartType == cCompositeChat::ptText);
- assert_test(Parts[2]->m_PartType == cCompositeChat::ptUrl);
- assert_test(Parts[3]->m_PartType == cCompositeChat::ptText);
- assert_test(Parts[0]->m_Style == "");
- assert_test(Parts[1]->m_Style == "@2");
- assert_test(Parts[2]->m_Style == "@2");
- assert_test(Parts[3]->m_Style == "@2");
+ TEST_EQUAL(Parts.size(), 4);
+ TEST_EQUAL(Parts[0]->m_PartType, cCompositeChat::ptText);
+ TEST_EQUAL(Parts[1]->m_PartType, cCompositeChat::ptText);
+ TEST_EQUAL(Parts[2]->m_PartType, cCompositeChat::ptUrl);
+ TEST_EQUAL(Parts[3]->m_PartType, cCompositeChat::ptText);
+ TEST_EQUAL(Parts[0]->m_Style, "");
+ TEST_EQUAL(Parts[1]->m_Style, "@2");
+ TEST_EQUAL(Parts[2]->m_Style, "@2");
+ TEST_EQUAL(Parts[3]->m_Style, "@2");
}
@@ -35,15 +36,15 @@ static void TestParser2(void)
cCompositeChat Msg;
Msg.ParseText("@3Advanced stuff: @5overriding color codes and http://links.with/@4color-in-them handling");
const cCompositeChat::cParts & Parts = Msg.GetParts();
- assert_test(Parts.size() == 4);
- assert_test(Parts[0]->m_PartType == cCompositeChat::ptText);
- assert_test(Parts[1]->m_PartType == cCompositeChat::ptText);
- assert_test(Parts[2]->m_PartType == cCompositeChat::ptUrl);
- assert_test(Parts[3]->m_PartType == cCompositeChat::ptText);
- assert_test(Parts[0]->m_Style == "@3");
- assert_test(Parts[1]->m_Style == "@5");
- assert_test(Parts[2]->m_Style == "@5");
- assert_test(Parts[3]->m_Style == "@5");
+ TEST_EQUAL(Parts.size(), 4);
+ TEST_EQUAL(Parts[0]->m_PartType, cCompositeChat::ptText);
+ TEST_EQUAL(Parts[1]->m_PartType, cCompositeChat::ptText);
+ TEST_EQUAL(Parts[2]->m_PartType, cCompositeChat::ptUrl);
+ TEST_EQUAL(Parts[3]->m_PartType, cCompositeChat::ptText);
+ TEST_EQUAL(Parts[0]->m_Style, "@3");
+ TEST_EQUAL(Parts[1]->m_Style, "@5");
+ TEST_EQUAL(Parts[2]->m_Style, "@5");
+ TEST_EQUAL(Parts[3]->m_Style, "@5");
}
@@ -55,11 +56,11 @@ static void TestParser3(void)
cCompositeChat Msg;
Msg.ParseText("http://links.starting the text");
const cCompositeChat::cParts & Parts = Msg.GetParts();
- assert_test(Parts.size() == 2);
- assert_test(Parts[0]->m_PartType == cCompositeChat::ptUrl);
- assert_test(Parts[1]->m_PartType == cCompositeChat::ptText);
- assert_test(Parts[0]->m_Style == "");
- assert_test(Parts[1]->m_Style == "");
+ TEST_EQUAL(Parts.size(), 2);
+ TEST_EQUAL(Parts[0]->m_PartType, cCompositeChat::ptUrl);
+ TEST_EQUAL(Parts[1]->m_PartType, cCompositeChat::ptText);
+ TEST_EQUAL(Parts[0]->m_Style, "");
+ TEST_EQUAL(Parts[1]->m_Style, "");
}
@@ -71,11 +72,11 @@ static void TestParser4(void)
cCompositeChat Msg;
Msg.ParseText("links finishing the text: http://some.server");
const cCompositeChat::cParts & Parts = Msg.GetParts();
- assert_test(Parts.size() == 2);
- assert_test(Parts[0]->m_PartType == cCompositeChat::ptText);
- assert_test(Parts[1]->m_PartType == cCompositeChat::ptUrl);
- assert_test(Parts[0]->m_Style == "");
- assert_test(Parts[1]->m_Style == "");
+ TEST_EQUAL(Parts.size(), 2);
+ TEST_EQUAL(Parts[0]->m_PartType, cCompositeChat::ptText);
+ TEST_EQUAL(Parts[1]->m_PartType, cCompositeChat::ptUrl);
+ TEST_EQUAL(Parts[0]->m_Style, "");
+ TEST_EQUAL(Parts[1]->m_Style, "");
}
@@ -87,38 +88,19 @@ static void TestParser5(void)
cCompositeChat Msg;
Msg.ParseText("http://only.links");
const cCompositeChat::cParts & Parts = Msg.GetParts();
- assert_test(Parts.size() == 1);
- assert_test(Parts[0]->m_PartType == cCompositeChat::ptUrl);
- assert_test(Parts[0]->m_Style == "");
+ TEST_EQUAL(Parts.size(), 1);
+ TEST_EQUAL(Parts[0]->m_PartType, cCompositeChat::ptUrl);
+ TEST_EQUAL(Parts[0]->m_Style, "");
}
-int main(int argc, char * argv[])
-{
- LOGD("Test started.");
-
- LOGD("Running tests: 1");
+IMPLEMENT_TEST_MAIN("CompositeChat",
TestParser1();
-
- LOGD("Running tests: 2");
TestParser2();
-
- LOGD("Running tests: 3");
TestParser3();
-
- LOGD("Running tests: 4");
TestParser4();
-
- LOGD("Running tests: 5");
TestParser5();
-
- LOG("CompositeChat test finished.");
-}
-
-
-
-
-
+)