kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Tests: Reformat to current clang-format standard

Browse Source
This commit is contained in:
Chris Hennes
2023-09-02 12:47:07 -05:00
committed by Chris Hennes
parent c1825036a6
commit 1a960286a4
6 changed files with 67 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/src/App/Application.cpp
View File

@@ -6,33 +6,39 @@ using namespace App::Util;
using Spr = std::pair<std::string, std::string>;
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);
};

39
tests/src/App/ElementMap.cpp
View File

@@ -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<Data::ElementMap::MappedChildElements> 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<Data::ElementMap::MappedChildElements> children = {childOne, childTwo};
// Act

3
tests/src/Base/Bitmask.cpp
View File

@@ -4,7 +4,8 @@
#include <Base/Bitmask.h>
enum class TestFlagEnum {
enum class TestFlagEnum
{
Flag1,
Flag2,
Flag3

14
tests/src/Base/Writer.cpp
View File

@@ -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("<![CDATA[]]>", _writer.getString());

12
tests/src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -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<Sketcher::SketchObject*>(_doc->addObject("Sketcher::SketchObject"));
_sketchobj =
static_cast<Sketcher::SketchObject*>(_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<const char*> allowedTypes {"Vertex", "Edge", "ExternalEdge", "H_Axis", "V_Axis", "RootPoint"};
std::vector<const char*> allowedTypes {"Vertex",
"Edge",
"ExternalEdge",
"H_Axis",
"V_Axis",
"RootPoint"};
};
TEST_F(SketchObjectTest, createSketchObject) // NOLINT
TEST_F(SketchObjectTest, createSketchObject)// NOLINT
{
// Arrange

8
tests/src/Mod/Sketcher/App/planegcs/GCS.cpp
View File

@@ -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<SystemTest> _system;
};
TEST_F(GCSTest, clearConstraints) // NOLINT
TEST_F(GCSTest, clearConstraints)// NOLINT
{
// Arrange
const size_t numConstraints {100};