From 7c08de8d9a93a85f800038730eb54d5e3d5d8865 Mon Sep 17 00:00:00 2001 From: Melroy van den Berg Date: Thu, 26 May 2022 00:14:18 +0200 Subject: [PATCH] Fix unit-tests --- tst/draw_test.cc | 160 +++++++++++++++++++++--------------------- tst/file_test.cc | 6 +- tst/mock-middleware.h | 32 ++++----- tst/parser_test.cc | 20 +++--- 4 files changed, 109 insertions(+), 109 deletions(-) diff --git a/tst/draw_test.cc b/tst/draw_test.cc index 4a8c00f..72e271b 100644 --- a/tst/draw_test.cc +++ b/tst/draw_test.cc @@ -24,95 +24,95 @@ namespace Draw draw(middleware); // When - draw.setText(text); + draw.set_text(text); // Then - ASSERT_EQ(draw.getText(), text); + ASSERT_EQ(draw.get_text(), text); } TEST_F(DrawFixture, TestDrawDocument) { // Given std::string markdown = "**Hello** *world*"; - cmark_node* doc = Parser::parseContent(markdown); + cmark_node* doc = Parser::parse_content(markdown); MockMiddleware middleware; Draw draw(middleware); // When - draw.setDocument(doc); + draw.set_document(doc); // Then - std::string result = draw.getText(); + std::string result = draw.get_text(); ASSERT_EQ(result, "Hello world\n\n"); } TEST_F(DrawFixture, TestDrawTextTags) { // Given - std::string italicTagName = "italic"; - std::string boldTagName = "bold"; - std::string heading1TagName = "heading1"; - std::string heading2TagName = "heading2"; - std::string heading3TagName = "heading3"; - std::string heading4TagName = "heading4"; - std::string heading5TagName = "heading5"; - std::string heading6TagName = "heading6"; - std::string strikethroughTagName = "strikethrough"; - std::string superscriptTagName = "superscript"; - std::string subscriptTagName = "subscript"; - std::string codeTagName = "code"; - std::string quoteTagName = "quote"; - std::string highlightTagName = "highlight"; + std::string italic_tag_name = "italic"; + std::string bold_tag_name = "bold"; + std::string heading1_tag_name = "heading1"; + std::string heading2_tag_name = "heading2"; + std::string heading3_tag_name = "heading3"; + std::string heading4_tag_name = "heading4"; + std::string heading5_tag_name = "heading5"; + std::string heading6_tag_name = "heading6"; + std::string strikethrough_tag_name = "strikethrough"; + std::string superscript_tag_name = "superscript"; + std::string subscript_tag_name = "subscript"; + std::string code_tag_name = "code"; + std::string quote_tag_name = "quote"; + std::string highlight_tag_name = "highlight"; MockMiddleware middleware; Draw draw(middleware); // When auto tagTable = draw.get_buffer()->get_tag_table(); - auto properyItalic = tagTable->lookup(italicTagName); - auto properyBold = tagTable->lookup(boldTagName); - auto properyHeading1 = tagTable->lookup(heading1TagName); - auto properyHeading2 = tagTable->lookup(heading2TagName); - auto properyHeading3 = tagTable->lookup(heading3TagName); - auto properyHeading4 = tagTable->lookup(heading4TagName); - auto properyHeading5 = tagTable->lookup(heading5TagName); - auto properyHeading6 = tagTable->lookup(heading6TagName); - auto properyStrikethrough = tagTable->lookup(strikethroughTagName); - auto properySuperscript = tagTable->lookup(superscriptTagName); - auto properySubscript = tagTable->lookup(subscriptTagName); - auto properyCode = tagTable->lookup(codeTagName); - auto properyQuote = tagTable->lookup(quoteTagName); - auto properyHighlight = tagTable->lookup(highlightTagName); + auto propery_italic = tagTable->lookup(italic_tag_name); + auto propery_bold = tagTable->lookup(bold_tag_name); + auto propery_heading1 = tagTable->lookup(heading1_tag_name); + auto propery_heading2 = tagTable->lookup(heading2_tag_name); + auto propery_heading3 = tagTable->lookup(heading3_tag_name); + auto propery_heading4 = tagTable->lookup(heading4_tag_name); + auto propery_heading5 = tagTable->lookup(heading5_tag_name); + auto propery_heading6 = tagTable->lookup(heading6_tag_name); + auto propery_strikethrough = tagTable->lookup(strikethrough_tag_name); + auto propery_superscript = tagTable->lookup(superscript_tag_name); + auto propery_subscript = tagTable->lookup(subscript_tag_name); + auto propery_code = tagTable->lookup(code_tag_name); + auto propery_quote = tagTable->lookup(quote_tag_name); + auto propery_highlight = tagTable->lookup(highlight_tag_name); // Then - ASSERT_NE(properyItalic.get(), nullptr); - ASSERT_EQ(properyItalic->property_name().get_value(), italicTagName); - ASSERT_NE(properyBold.get(), nullptr); - ASSERT_EQ(properyBold->property_name().get_value(), boldTagName); - ASSERT_NE(properyHeading1.get(), nullptr); - ASSERT_EQ(properyHeading1->property_name().get_value(), heading1TagName); - ASSERT_NE(properyHeading2.get(), nullptr); - ASSERT_EQ(properyHeading2->property_name().get_value(), heading2TagName); - ASSERT_NE(properyHeading3.get(), nullptr); - ASSERT_EQ(properyHeading3->property_name().get_value(), heading3TagName); - ASSERT_NE(properyHeading4.get(), nullptr); - ASSERT_EQ(properyHeading4->property_name().get_value(), heading4TagName); - ASSERT_NE(properyHeading5.get(), nullptr); - ASSERT_EQ(properyHeading5->property_name().get_value(), heading5TagName); - ASSERT_NE(properyHeading6.get(), nullptr); - ASSERT_EQ(properyHeading6->property_name().get_value(), heading6TagName); - ASSERT_NE(properyStrikethrough.get(), nullptr); - ASSERT_EQ(properyStrikethrough->property_name().get_value(), strikethroughTagName); - ASSERT_NE(properySuperscript.get(), nullptr); - ASSERT_EQ(properySuperscript->property_name().get_value(), superscriptTagName); - ASSERT_NE(properySubscript.get(), nullptr); - ASSERT_EQ(properySubscript->property_name().get_value(), subscriptTagName); - ASSERT_NE(properyCode.get(), nullptr); - ASSERT_EQ(properyCode->property_name().get_value(), codeTagName); - ASSERT_NE(properyQuote.get(), nullptr); - ASSERT_EQ(properyQuote->property_name().get_value(), quoteTagName); - ASSERT_NE(properyHighlight.get(), nullptr); - ASSERT_EQ(properyHighlight->property_name().get_value(), highlightTagName); + ASSERT_NE(propery_italic.get(), nullptr); + ASSERT_EQ(propery_italic->property_name().get_value(), italic_tag_name); + ASSERT_NE(propery_bold.get(), nullptr); + ASSERT_EQ(propery_bold->property_name().get_value(), bold_tag_name); + ASSERT_NE(propery_heading1.get(), nullptr); + ASSERT_EQ(propery_heading1->property_name().get_value(), heading1_tag_name); + ASSERT_NE(propery_heading2.get(), nullptr); + ASSERT_EQ(propery_heading2->property_name().get_value(), heading2_tag_name); + ASSERT_NE(propery_heading3.get(), nullptr); + ASSERT_EQ(propery_heading3->property_name().get_value(), heading3_tag_name); + ASSERT_NE(propery_heading4.get(), nullptr); + ASSERT_EQ(propery_heading4->property_name().get_value(), heading4_tag_name); + ASSERT_NE(propery_heading5.get(), nullptr); + ASSERT_EQ(propery_heading5->property_name().get_value(), heading5_tag_name); + ASSERT_NE(propery_heading6.get(), nullptr); + ASSERT_EQ(propery_heading6->property_name().get_value(), heading6_tag_name); + ASSERT_NE(propery_strikethrough.get(), nullptr); + ASSERT_EQ(propery_strikethrough->property_name().get_value(), strikethrough_tag_name); + ASSERT_NE(propery_superscript.get(), nullptr); + ASSERT_EQ(propery_superscript->property_name().get_value(), superscript_tag_name); + ASSERT_NE(propery_subscript.get(), nullptr); + ASSERT_EQ(propery_subscript->property_name().get_value(), subscript_tag_name); + ASSERT_NE(propery_code.get(), nullptr); + ASSERT_EQ(propery_code->property_name().get_value(), code_tag_name); + ASSERT_NE(propery_quote.get(), nullptr); + ASSERT_EQ(propery_quote->property_name().get_value(), quote_tag_name); + ASSERT_NE(propery_highlight.get(), nullptr); + ASSERT_EQ(propery_highlight->property_name().get_value(), highlight_tag_name); } TEST_F(DrawFixture, TestDrawTextAttributes) @@ -120,41 +120,41 @@ namespace // Given std::string markdown = "**bold**~~strikethrough~~^up^%down%`code`"; gsize length = 0; - cmark_node* doc = Parser::parseContent(markdown); + cmark_node* doc = Parser::parse_content(markdown); MockMiddleware middleware; Draw draw(middleware); // When - draw.setDocument(doc); + draw.set_document(doc); auto buffer = draw.get_buffer(); // Using the built-in formatter guint8* data = buffer->serialize(buffer, "application/x-gtk-text-buffer-rich-text", buffer->begin(), buffer->end(), length); // Convert data to string - std::string stringData(data, data + length); + std::string string_data(data, data + length); // Then // Bold attribute - std::string expectAttr1 = ""; + std::string expect_attr1 = ""; // Strikethrough attribute - std::string expectAttr2 = ""; + std::string expect_attr2 = ""; // Super-/subcript attribute - std::string expectAttr3 = + std::string expect_attr3 = ""; + std::string expect_attr4 = ""; // Subscript attributes - std::string expectAttr5 = ""; + std::string expect_attr5 = ""; // Code attributes - std::string expectAttr6 = ""; - std::string expectAttr7 = ""; - std::string expectAttr8 = ""; - EXPECT_THAT(stringData, testing::HasSubstr(expectAttr1)); - EXPECT_THAT(stringData, testing::HasSubstr(expectAttr2)); - EXPECT_THAT(stringData, testing::HasSubstr(expectAttr3)); - EXPECT_THAT(stringData, testing::HasSubstr(expectAttr4)); - EXPECT_THAT(stringData, testing::HasSubstr(expectAttr5)); - EXPECT_THAT(stringData, testing::HasSubstr(expectAttr6)); - EXPECT_THAT(stringData, testing::HasSubstr(expectAttr7)); - EXPECT_THAT(stringData, testing::HasSubstr(expectAttr8)); + std::string expect_attr6 = ""; + std::string expect_attr7 = ""; + std::string expect_attr8 = ""; + EXPECT_THAT(string_data, testing::HasSubstr(expect_attr1)); + EXPECT_THAT(string_data, testing::HasSubstr(expect_attr2)); + EXPECT_THAT(string_data, testing::HasSubstr(expect_attr3)); + EXPECT_THAT(string_data, testing::HasSubstr(expect_attr4)); + EXPECT_THAT(string_data, testing::HasSubstr(expect_attr5)); + EXPECT_THAT(string_data, testing::HasSubstr(expect_attr6)); + EXPECT_THAT(string_data, testing::HasSubstr(expect_attr7)); + EXPECT_THAT(string_data, testing::HasSubstr(expect_attr8)); } } // namespace diff --git a/tst/file_test.cc b/tst/file_test.cc index 1cb98d5..b28029f 100644 --- a/tst/file_test.cc +++ b/tst/file_test.cc @@ -7,10 +7,10 @@ namespace { // Given std::string path = "/path/to/a/filename.sh"; - std::string expectedFilename = "filename.sh"; + std::string expected_filename = "filename.sh"; // When - std::string filename = File::getFilename(path); + std::string filename = File::get_filename(path); // Then - ASSERT_EQ(filename, expectedFilename); + ASSERT_EQ(filename, expected_filename); } } // namespace \ No newline at end of file diff --git a/tst/mock-middleware.h b/tst/mock-middleware.h index a96393d..49ecaac 100644 --- a/tst/mock-middleware.h +++ b/tst/mock-middleware.h @@ -8,21 +8,21 @@ class MockMiddleware : public MiddlewareInterface { public: MOCK_METHOD(void, - doRequest, - (const std::string& path, bool isSetAddressBar, bool isHistoryRequest, bool isDisableEditor, bool isParseContent), + do_request, + (const std::string& path, bool is_set_address_bar, bool is_history_request, bool is_disable_editor, bool is_parse_content), (override)); - MOCK_METHOD(std::string, doAdd, (const std::string& path), (override)); - MOCK_METHOD(void, doWrite, (const std::string& path, bool isSetAddressAndTitle), (override)); - MOCK_METHOD(void, setContent, (const Glib::ustring& content), (override)); - MOCK_METHOD(Glib::ustring, getContent, (), (const, override)); - MOCK_METHOD(cmark_node*, parseContent, (), (const, override)); - MOCK_METHOD(void, resetContentAndPath, (), (override)); - MOCK_METHOD(std::size_t, getIPFSNumberOfPeers, (), (const, override)); - MOCK_METHOD(int, getIPFSRepoSize, (), (const, override)); - MOCK_METHOD(std::string, getIPFSRepoPath, (), (const, override)); - MOCK_METHOD(std::string, getIPFSIncomingRate, (), (const, override)); - MOCK_METHOD(std::string, getIPFSOutcomingRate, (), (const, override)); - MOCK_METHOD(std::string, getIPFSVersion, (), (const, override)); - MOCK_METHOD(std::string, getIPFSClientId, (), (const, override)); - MOCK_METHOD(std::string, getIPFSClientPublicKey, (), (const, override)); + MOCK_METHOD(std::string, do_add, (const std::string& path), (override)); + MOCK_METHOD(void, do_write, (const std::string& path, bool is_set_address_and_title), (override)); + MOCK_METHOD(void, set_content, (const Glib::ustring& content), (override)); + MOCK_METHOD(Glib::ustring, get_content, (), (const, override)); + MOCK_METHOD(cmark_node*, parse_content, (), (const, override)); + MOCK_METHOD(void, reset_content_and_path, (), (override)); + MOCK_METHOD(std::size_t, get_ipfs_number_of_peers, (), (const, override)); + MOCK_METHOD(int, get_ipfs_repo_size, (), (const, override)); + MOCK_METHOD(std::string, get_ipfs_repo_path, (), (const, override)); + MOCK_METHOD(std::string, get_ipfs_incoming_rate, (), (const, override)); + MOCK_METHOD(std::string, get_ipfs_outgoing_rate, (), (const, override)); + MOCK_METHOD(std::string, get_ipfs_version, (), (const, override)); + MOCK_METHOD(std::string, get_ipfs_client_id, (), (const, override)); + MOCK_METHOD(std::string, get_ipfs_client_public_key, (), (const, override)); }; diff --git a/tst/parser_test.cc b/tst/parser_test.cc index 530936b..3a0ec08 100644 --- a/tst/parser_test.cc +++ b/tst/parser_test.cc @@ -9,13 +9,13 @@ namespace { // Given std::string markdown = "Jaja"; - uint16_t expectedDocument = CMARK_NODE_DOCUMENT; + uint16_t expected_document = CMARK_NODE_DOCUMENT; // When - cmark_node* doc = Parser::parseContent(markdown); + cmark_node* doc = Parser::parse_content(markdown); // Then - ASSERT_EQ(doc->type, expectedDocument); + ASSERT_EQ(doc->type, expected_document); cmark_node_free(doc); } @@ -23,15 +23,15 @@ namespace { // Given std::string markdown = "_Italic_ **BOLD** ~~strike~~"; - std::string expectedHtml = "

Italic BOLD strike

\n"; + std::string expected_html = "

Italic BOLD strike

\n"; // When - cmark_node* doc = Parser::parseContent(markdown); - std::string html = Parser::renderHTML(doc); + cmark_node* doc = Parser::parse_content(markdown); + std::string html = Parser::render_html(doc); cmark_node_free(doc); // Then - ASSERT_EQ(html, expectedHtml); + ASSERT_EQ(html, expected_html); } TEST(LibreWebTest, TestMarkdownRender) @@ -40,11 +40,11 @@ namespace std::string markdown = "**HOLA**"; // When - cmark_node* doc = Parser::parseContent(markdown); - std::string markdownAgain = Parser::renderMarkdown(doc); + cmark_node* doc = Parser::parse_content(markdown); + std::string markdown_again = Parser::render_markdown(doc); cmark_node_free(doc); // Then - ASSERT_EQ(markdownAgain, markdown + "\n"); + ASSERT_EQ(markdown_again, markdown + "\n"); } } // namespace \ No newline at end of file