From 16f3355bbbd2170dd8f836885f5c887ff65c5f7d Mon Sep 17 00:00:00 2001 From: Debucquoy Anthony tonitch Date: Tue, 25 Oct 2022 13:42:04 +0200 Subject: rework of the color code with & and standard codes (#5416) * adding build* to gitignore and tags for ctags * Notation Changes * Adding & Parser * Avoid crash when & as first character * Looking for @ in the rest of the project * Formating style * Modifying test to reflect new behaviours * Adding a check for the first part * fixup! Adding & Parser style changes * Update APIDesk.lua * Update src/CompositeChat.cpp Co-authored-by: x12xx12x <44411062+12xx12@users.noreply.github.com> * explaination on the antishlash with ampersand * adding old deprecated formating * Update src/CompositeChat.cpp Co-authored-by: x12xx12x <44411062+12xx12@users.noreply.github.com> * Update src/CompositeChat.cpp * Update src/CompositeChat.cpp Co-authored-by: Debucquoy Co-authored-by: x12xx12x <44411062+12xx12@users.noreply.github.com> --- tests/CompositeChat/CompositeChatTest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/CompositeChat/CompositeChatTest.cpp b/tests/CompositeChat/CompositeChatTest.cpp index 636a5c95a..ca05e79a2 100644 --- a/tests/CompositeChat/CompositeChatTest.cpp +++ b/tests/CompositeChat/CompositeChatTest.cpp @@ -14,7 +14,7 @@ static void TestParser1(void) { cCompositeChat Msg; - Msg.ParseText("Testing @2color codes and http://links parser"); + Msg.ParseText("Testing &2color codes and http://links parser"); const auto & Parts = Msg.GetParts(); TEST_EQUAL(Parts.size(), 4); @@ -22,13 +22,13 @@ static void TestParser1(void) TEST_EQUAL(std::get(Parts[0]).Style, ""); TEST_TRUE(std::holds_alternative(Parts[1])); - TEST_EQUAL(std::get(Parts[1]).Style, "@2"); + TEST_EQUAL(std::get(Parts[1]).Style, "2"); TEST_TRUE(std::holds_alternative(Parts[2])); - TEST_EQUAL(std::get(Parts[2]).Style, "@2"); + TEST_EQUAL(std::get(Parts[2]).Style, "2"); TEST_TRUE(std::holds_alternative(Parts[3])); - TEST_EQUAL(std::get(Parts[3]).Style, "@2"); + TEST_EQUAL(std::get(Parts[3]).Style, "2"); } @@ -38,21 +38,21 @@ static void TestParser1(void) static void TestParser2(void) { cCompositeChat Msg; - Msg.ParseText("@3Advanced stuff: @5overriding color codes and http://links.with/@4color-in-them handling"); + Msg.ParseText("&3Advanced stuff: &5overriding color codes and http://links.with/&4color-in-them handling"); const auto & Parts = Msg.GetParts(); TEST_EQUAL(Parts.size(), 4); TEST_TRUE(std::holds_alternative(Parts[0])); - TEST_EQUAL(std::get(Parts[0]).Style, "@3"); + TEST_EQUAL(std::get(Parts[0]).Style, "3"); TEST_TRUE(std::holds_alternative(Parts[1])); - TEST_EQUAL(std::get(Parts[1]).Style, "@5"); + TEST_EQUAL(std::get(Parts[1]).Style, "35"); TEST_TRUE(std::holds_alternative(Parts[2])); - TEST_EQUAL(std::get(Parts[2]).Style, "@5"); + TEST_EQUAL(std::get(Parts[2]).Style, "35"); TEST_TRUE(std::holds_alternative(Parts[3])); - TEST_EQUAL(std::get(Parts[3]).Style, "@5"); + TEST_EQUAL(std::get(Parts[3]).Style, "35"); } -- cgit v1.2.3