From 1a960286a4a549a6454155481ce51cad88a51745 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 2 Sep 2023 12:47:07 -0500 Subject: [PATCH] Tests: Reformat to current clang-format standard --- tests/src/App/Application.cpp | 30 +++++++++------- tests/src/App/ElementMap.cpp | 39 ++++++++++++++------- tests/src/Base/Bitmask.cpp | 3 +- tests/src/Base/Writer.cpp | 14 ++++---- tests/src/Mod/Sketcher/App/SketchObject.cpp | 12 +++++-- tests/src/Mod/Sketcher/App/planegcs/GCS.cpp | 8 +++-- 6 files changed, 67 insertions(+), 39 deletions(-) diff --git a/tests/src/App/Application.cpp b/tests/src/App/Application.cpp index d89fd08e8a..41a05b3878 100644 --- a/tests/src/App/Application.cpp +++ b/tests/src/App/Application.cpp @@ -6,33 +6,39 @@ using namespace App::Util; using Spr = std::pair; -TEST(ApplicationTest, fCustomSyntaxLookup){ +TEST(ApplicationTest, fCustomSyntaxLookup) +{ Spr res {customSyntax("-display")}; Spr exp {"display", "null"}; - EXPECT_EQ(res,exp); + EXPECT_EQ(res, exp); }; -TEST(ApplicationTest, fCustomSyntaxMac){ +TEST(ApplicationTest, fCustomSyntaxMac) +{ Spr res {customSyntax("-psn_stuff")}; Spr exp {"psn", "stuff"}; - EXPECT_EQ(res,exp); + EXPECT_EQ(res, exp); }; -TEST(ApplicationTest, fCustomSyntaxWidgetCount){ +TEST(ApplicationTest, fCustomSyntaxWidgetCount) +{ Spr res {customSyntax("-widgetcount")}; Spr exp {"widgetcount", ""}; - EXPECT_EQ(res,exp); + EXPECT_EQ(res, exp); } -TEST(ApplicationTest, fCustomSyntaxNotFound){ +TEST(ApplicationTest, fCustomSyntaxNotFound) +{ Spr res {customSyntax("-displayx")}; Spr exp {"", ""}; - EXPECT_EQ(res,exp); + EXPECT_EQ(res, exp); }; -TEST(ApplicationTest, fCustomSyntaxAmpersand){ +TEST(ApplicationTest, fCustomSyntaxAmpersand) +{ Spr res {customSyntax("@freddie")}; Spr exp {"response-file", "freddie"}; - EXPECT_EQ(res,exp); + EXPECT_EQ(res, exp); }; -TEST(ApplicationTest, fCustomSyntaxEmptyIn){ +TEST(ApplicationTest, fCustomSyntaxEmptyIn) +{ Spr res {customSyntax("")}; Spr exp {"", ""}; - EXPECT_EQ(res,exp); + EXPECT_EQ(res, exp); }; diff --git a/tests/src/App/ElementMap.cpp b/tests/src/App/ElementMap.cpp index 3e103be85a..31eefd78f4 100644 --- a/tests/src/App/ElementMap.cpp +++ b/tests/src/App/ElementMap.cpp @@ -153,8 +153,8 @@ TEST_F(ElementMapTest, setElementNameWithHashing) const Data::MappedName expectedName(element); // Act - elementMap.encodeElementName( - element.getType()[0], elementNameHolder, ss, nullptr, 0, nullptr, 0); + elementMap + .encodeElementName(element.getType()[0], elementNameHolder, ss, nullptr, 0, nullptr, 0); auto resultName = elementMap.setElementName(element, elementNameHolder, 0, _sids); auto mappedToElement = elementMap.find(element); @@ -382,15 +382,25 @@ TEST_F(ElementMapTest, mimicSimpleUnion) // act: simulate a union/fuse operation auto parent = cube.elementMapPtr->getAll()[5]; Data::MappedName postfixHolder(std::string(Data::POSTFIX_MOD) + "2"); - unionPart.elementMapPtr->encodeElementName( - postfixHolder[0], postfixHolder, ss, nullptr, unionPart.Tag, nullptr, unionPart.Tag); + unionPart.elementMapPtr->encodeElementName(postfixHolder[0], + postfixHolder, + ss, + nullptr, + unionPart.Tag, + nullptr, + unionPart.Tag); auto postfixStr = postfixHolder.toString() + Data::ELEMENT_MAP_PREFIX + PartOp; // act: with the fuse op, name against the cube's Face6 Data::MappedName uface3Holder(parent.index); // we will invoke the encoder for face 3 - unionPart.elementMapPtr->encodeElementName( - uface3Holder[0], uface3Holder, ss, nullptr, unionPart.Tag, postfixStr.c_str(), cube.Tag); + unionPart.elementMapPtr->encodeElementName(uface3Holder[0], + uface3Holder, + ss, + nullptr, + unionPart.Tag, + postfixStr.c_str(), + cube.Tag); unionPart.elementMapPtr->setElementName(uface3, uface3Holder, unionPart.Tag, nullptr, true); // act: generate a full toponame string for testing purposes @@ -437,8 +447,13 @@ TEST_F(ElementMapTest, mimicOperationAgainstSelf) // Act // act: with the mystery op, name against its own Face6 for some reason Data::MappedName postfixHolder(workbenchId); - finalPart.elementMapPtr->encodeElementName( - postfixHolder[0], postfixHolder, ss, nullptr, finalPart.Tag, nullptr, finalPart.Tag); + finalPart.elementMapPtr->encodeElementName(postfixHolder[0], + postfixHolder, + ss, + nullptr, + finalPart.Tag, + nullptr, + finalPart.Tag); auto postfixStr = postfixHolder.toString() + Data::ELEMENT_MAP_PREFIX + PartOp; // we will invoke the encoder for face 3 finalPart.elementMapPtr->encodeElementName(uface3Holder[0], @@ -468,8 +483,8 @@ TEST_F(ElementMapTest, mimicOperationAgainstSelf) TEST_F(ElementMapTest, hasChildElementMapTest) { // Arrange - Data::ElementMap::MappedChildElements child = { - Data::IndexedName("face", 1), 2, 7, 4L, Data::ElementMapPtr(), QByteArray(""), _sid}; + Data::ElementMap::MappedChildElements child = + {Data::IndexedName("face", 1), 2, 7, 4L, Data::ElementMapPtr(), QByteArray(""), _sid}; std::vector children = {child}; LessComplexPart cubeFull(3L, "FullBox", _hasher); cubeFull.elementMapPtr->addChildElements(cubeFull.Tag, children); @@ -523,8 +538,8 @@ TEST_F(ElementMapTest, addAndGetChildElementsTest) Data::ElementMapPtr(), QByteArray("abcdefghij"),// postfix must be 10 or more bytes to invoke hasher _sid}; - Data::ElementMap::MappedChildElements childTwo = { - Data::IndexedName("Pong", 2), 2, 7, 4L, Data::ElementMapPtr(), QByteArray("abc"), _sid}; + Data::ElementMap::MappedChildElements childTwo = + {Data::IndexedName("Pong", 2), 2, 7, 4L, Data::ElementMapPtr(), QByteArray("abc"), _sid}; std::vector children = {childOne, childTwo}; // Act diff --git a/tests/src/Base/Bitmask.cpp b/tests/src/Base/Bitmask.cpp index 1c64180efb..97909d3809 100644 --- a/tests/src/Base/Bitmask.cpp +++ b/tests/src/Base/Bitmask.cpp @@ -4,7 +4,8 @@ #include -enum class TestFlagEnum { +enum class TestFlagEnum +{ Flag1, Flag2, Flag3 diff --git a/tests/src/Base/Writer.cpp b/tests/src/Base/Writer.cpp index e4fcd3deed..84bc9cfc00 100644 --- a/tests/src/Base/Writer.cpp +++ b/tests/src/Base/Writer.cpp @@ -8,9 +8,10 @@ // Writer is designed to be a base class, so for testing we actually instantiate a StringWriter, // which is derived from it -class WriterTest : public ::testing::Test { +class WriterTest: public ::testing::Test +{ protected: - //void SetUp() override {} + // void SetUp() override {} // void TearDown() override {} protected: @@ -62,7 +63,7 @@ TEST_F(WriterTest, insertNonAsciiData) TEST_F(WriterTest, beginCharStream) { // Arrange & Act - auto & checkStream {_writer.beginCharStream()}; + auto& checkStream {_writer.beginCharStream()}; // Assert EXPECT_TRUE(checkStream.good()); @@ -74,10 +75,7 @@ TEST_F(WriterTest, beginCharStreamTwice) _writer.beginCharStream(); // Act & Assert - EXPECT_THROW( - _writer.beginCharStream(), - Base::RuntimeError - ); + EXPECT_THROW(_writer.beginCharStream(), Base::RuntimeError); } TEST_F(WriterTest, endCharStream) @@ -99,7 +97,7 @@ TEST_F(WriterTest, endCharStreamTwice) _writer.endCharStream(); // Act - _writer.endCharStream(); // Doesn't throw, or do anything at all + _writer.endCharStream();// Doesn't throw, or do anything at all // Assert EXPECT_EQ("", _writer.getString()); diff --git a/tests/src/Mod/Sketcher/App/SketchObject.cpp b/tests/src/Mod/Sketcher/App/SketchObject.cpp index 56e6144382..0b8c131901 100644 --- a/tests/src/Mod/Sketcher/App/SketchObject.cpp +++ b/tests/src/Mod/Sketcher/App/SketchObject.cpp @@ -27,7 +27,8 @@ protected: _docName = App::GetApplication().getUniqueDocumentName("test"); auto _doc = App::GetApplication().newDocument(_docName.c_str(), "testUser"); // TODO: Do we add a body first, or is just adding sketch sufficient for this test? - _sketchobj = static_cast(_doc->addObject("Sketcher::SketchObject")); + _sketchobj = + static_cast(_doc->addObject("Sketcher::SketchObject")); } void TearDown() override @@ -44,10 +45,15 @@ private: // TODO: use shared_ptr or something else here? Sketcher::SketchObject* _sketchobj; std::string _docName; - std::vector allowedTypes {"Vertex", "Edge", "ExternalEdge", "H_Axis", "V_Axis", "RootPoint"}; + std::vector allowedTypes {"Vertex", + "Edge", + "ExternalEdge", + "H_Axis", + "V_Axis", + "RootPoint"}; }; -TEST_F(SketchObjectTest, createSketchObject) // NOLINT +TEST_F(SketchObjectTest, createSketchObject)// NOLINT { // Arrange diff --git a/tests/src/Mod/Sketcher/App/planegcs/GCS.cpp b/tests/src/Mod/Sketcher/App/planegcs/GCS.cpp index fcbc16280c..1e846b5ae3 100644 --- a/tests/src/Mod/Sketcher/App/planegcs/GCS.cpp +++ b/tests/src/Mod/Sketcher/App/planegcs/GCS.cpp @@ -4,9 +4,11 @@ #include "Mod/Sketcher/App/planegcs/GCS.h" -class SystemTest : public GCS::System{ +class SystemTest: public GCS::System +{ public: - size_t getNumberOfConstraints(int tagID = -1) { + size_t getNumberOfConstraints(int tagID = -1) + { return _getNumberOfConstraints(tagID); } }; @@ -33,7 +35,7 @@ private: std::unique_ptr _system; }; -TEST_F(GCSTest, clearConstraints) // NOLINT +TEST_F(GCSTest, clearConstraints)// NOLINT { // Arrange const size_t numConstraints {100};