From f5a7e85aaed6a8e88991d599448530b8a9562896 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 May 2023 18:59:32 +0300 Subject: [PATCH] Fix broken tests. --- src/libs/vpatterndb/vpassmark.cpp | 11 +++++++---- src/test/ValentinaTest/qttestmainlambda.cpp | 2 +- .../share/Issue_924_Test_1/passmarkData.json | 4 ++++ .../share/Issue_924_Test_1/passmarkShape.json | 17 +++++++++++++++-- .../share/Issue_924_Test_2/passmarkData.json | 4 ++++ .../share/Issue_924_Test_2/passmarkShape.json | 17 +++++++++++++++-- 6 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/libs/vpatterndb/vpassmark.cpp b/src/libs/vpatterndb/vpassmark.cpp index 9d9d6d775..0f8e7c1fb 100644 --- a/src/libs/vpatterndb/vpassmark.cpp +++ b/src/libs/vpatterndb/vpassmark.cpp @@ -32,7 +32,9 @@ #include "../vgeometry/vabstractcurve.h" #include "../vgeometry/varc.h" #include "../vlayout/vrawsapoint.h" +#include "../vmisc/testpath.h" // do not remove #include "../vmisc/vabstractvalapplication.h" +#include "../vpatterndb/testpassmark.h" // do not remove #include "vgeometrydef.h" #include "vpassmark.h" @@ -674,9 +676,10 @@ auto VPassmark::SAPassmark(const QVector &seamAllowance, const QVector< return {}; } -// DumpVector(seamAllowance, QStringLiteral("seamAllowance.json.XXXXXX")); // Uncomment for dumping test data -// DumpVector(seamAllowance, QStringLiteral("rotatedSeamAllowance.json.XXXXXX")); // Uncomment for dumping test data -// DumpPassmarkData(m_data, QStringLiteral("passmarkData.json.XXXXXX")); // Uncomment for dumping test data + // DumpVector(seamAllowance, QStringLiteral("seamAllowance.json.XXXXXX")); // Uncomment for dumping test data + // DumpVector(rotatedSeamAllowance, + // QStringLiteral("rotatedSeamAllowance.json.XXXXXX")); // Uncomment for dumping test data + // DumpPassmarkData(m_data, QStringLiteral("passmarkData.json.XXXXXX")); // Uncomment for dumping test data QVector lines = SAPassmarkBaseLine(seamAllowance, rotatedSeamAllowance, side); if (lines.isEmpty()) @@ -685,7 +688,7 @@ auto VPassmark::SAPassmark(const QVector &seamAllowance, const QVector< } lines = CreatePassmarkLines(lines, seamAllowance, side); - // DumpPassmarkShape(lines, QStringLiteral("passmarkShape.json.XXXXXX")); // Uncomment for dumping test data + // DumpPassmarkShape(lines, QStringLiteral("passmarkShape.json.XXXXXX")); // Uncomment for dumping test data return lines; } diff --git a/src/test/ValentinaTest/qttestmainlambda.cpp b/src/test/ValentinaTest/qttestmainlambda.cpp index 04a52541e..3475f26bf 100644 --- a/src/test/ValentinaTest/qttestmainlambda.cpp +++ b/src/test/ValentinaTest/qttestmainlambda.cpp @@ -78,7 +78,7 @@ auto main(int argc, char **argv) -> int QResource::registerResource(QCoreApplication::applicationDirPath() + QStringLiteral("/test_data.rcc")); int status = 0; - auto ASSERT_TEST = [&status, argc, argv](QObject* obj) + auto ASSERT_TEST = [&status, argc, argv](QObject *obj) { status |= QTest::qExec(obj, argc, argv); delete obj; diff --git a/src/test/ValentinaTest/share/Issue_924_Test_1/passmarkData.json b/src/test/ValentinaTest/share/Issue_924_Test_1/passmarkData.json index 546cd48c3..294094a2a 100644 --- a/src/test/ValentinaTest/share/Issue_924_Test_1/passmarkData.json +++ b/src/test/ValentinaTest/share/Issue_924_Test_1/passmarkData.json @@ -1,10 +1,12 @@ { "data": { "globalPassmarkLength": 0, + "globalPassmarkWidth": 0, "id": 373, "isMainPathNode": true, "isShowSecondPassmark": true, "nextSAPoint": { + "passmarkClockwiseOpening": false, "saAfter": 37.795275590551185, "saBefore": 0, "turnPoint": true, @@ -17,6 +19,7 @@ "passmarkIndex": 0, "passmarkLineType": 3, "passmarkSAPoint": { + "passmarkClockwiseOpening": false, "saAfter": 0, "saBefore": 37.795275590551185, "turnPoint": true, @@ -28,6 +31,7 @@ "previousSAPoint": { "angle": 6, "curvePoint": true, + "passmarkClockwiseOpening": false, "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", diff --git a/src/test/ValentinaTest/share/Issue_924_Test_1/passmarkShape.json b/src/test/ValentinaTest/share/Issue_924_Test_1/passmarkShape.json index 109fa5159..27049c0b7 100644 --- a/src/test/ValentinaTest/share/Issue_924_Test_1/passmarkShape.json +++ b/src/test/ValentinaTest/share/Issue_924_Test_1/passmarkShape.json @@ -16,8 +16,8 @@ { "p1": { "type": "QPointF", - "x": -824.2011460276914, - "y": 346.4832618163752 + "x": -821.3739639415661, + "y": 352.98150326249686 }, "p2": { "type": "QPointF", @@ -25,6 +25,19 @@ "y": 359.4797447086185 }, "type": "QLineF" + }, + { + "p1": { + "type": "QPointF", + "x": -818.5467818554408, + "y": 359.4797447086185 + }, + "p2": { + "type": "QPointF", + "x": -824.2011460276914, + "y": 346.4832618163752 + }, + "type": "QLineF" } ] } diff --git a/src/test/ValentinaTest/share/Issue_924_Test_2/passmarkData.json b/src/test/ValentinaTest/share/Issue_924_Test_2/passmarkData.json index a22523624..d468f7c09 100644 --- a/src/test/ValentinaTest/share/Issue_924_Test_2/passmarkData.json +++ b/src/test/ValentinaTest/share/Issue_924_Test_2/passmarkData.json @@ -1,10 +1,12 @@ { "data": { "globalPassmarkLength": 0, + "globalPassmarkWidth": 0, "id": 435, "isMainPathNode": true, "isShowSecondPassmark": true, "nextSAPoint": { + "passmarkClockwiseOpening": false, "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "turnPoint": true, @@ -17,6 +19,7 @@ "passmarkIndex": 0, "passmarkLineType": 3, "passmarkSAPoint": { + "passmarkClockwiseOpening": false, "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "turnPoint": true, @@ -28,6 +31,7 @@ "previousSAPoint": { "angle": 6, "curvePoint": true, + "passmarkClockwiseOpening": false, "saAfter": 37.795275590551185, "saBefore": 37.795275590551185, "type": "VSAPoint", diff --git a/src/test/ValentinaTest/share/Issue_924_Test_2/passmarkShape.json b/src/test/ValentinaTest/share/Issue_924_Test_2/passmarkShape.json index e03335cbc..08ddd4805 100644 --- a/src/test/ValentinaTest/share/Issue_924_Test_2/passmarkShape.json +++ b/src/test/ValentinaTest/share/Issue_924_Test_2/passmarkShape.json @@ -16,8 +16,8 @@ { "p1": { "type": "QPointF", - "x": -838.454269371801, - "y": 334.6971977222692 + "x": -835.4255113454269, + "y": 341.1039695504113 }, "p2": { "type": "QPointF", @@ -25,6 +25,19 @@ "y": 347.5107413785534 }, "type": "QLineF" + }, + { + "p1": { + "type": "QPointF", + "x": -832.3967533190528, + "y": 347.5107413785534 + }, + "p2": { + "type": "QPointF", + "x": -838.454269371801, + "y": 334.6971977222692 + }, + "type": "QLineF" } ] }