aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring.

Browse Source 
Lambda to define test data.
Better test data structure.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-08-29 15:09:45 +03:00
parent 12234d2f10
commit 205e870669
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/test/ValentinaTest/share/input_loop_by_intersection.json → src/test/ValentinaTest/share/loop_by_intersection/input.json
View File

0
src/test/ValentinaTest/share/output_loop_by_intersection.json → src/test/ValentinaTest/share/loop_by_intersection/output.json
View File

4
src/test/ValentinaTest/share/test_data.qrc
View File

@ -1,8 +1,8 @@
<RCC>
<qresource prefix="/">
<file>input_loop_by_intersection.json</file>
<file>output_loop_by_intersection.json</file>
<file>Issue_620/input.json</file>
<file>Issue_620/output.json</file>
<file>loop_by_intersection/input.json</file>
<file>loop_by_intersection/output.json</file>
</qresource>
</RCC>

24
src/test/ValentinaTest/tst_vabstractpiece.cpp
View File

@ -46,6 +46,17 @@ void TST_VAbstractPiece::EquidistantRemoveLoop_data()
QTest::addColumn<qreal>("width");
QTest::addColumn<QVector<QPointF>>("ekvOrig");
auto ASSERT_TEST_CASE = [this](const char *title, const QString &input, const QString &output, qreal width)
{
QVector<VSAPoint> inputPoints;
AbstractTest::VectorFromJson(input, inputPoints);
QVector<QPointF> outputPoints;
AbstractTest::VectorFromJson(output, outputPoints);
QTest::newRow(title) << inputPoints << width << outputPoints;
};
// See file src/app/share/collection/test/seamtest1.val
QTest::newRow("Seam test 1. Piece. By angle.") << InputPointsSeamTest1PieceByAngle()
<< 37.795275590551185 // seam allowance width
@ -187,15 +198,10 @@ void TST_VAbstractPiece::EquidistantRemoveLoop_data()
<< OutputPointsIssue923Test6_6();
// See file src/app/share/collection/bugs/loop_by_intersection.val
QVector<VSAPoint> input;
AbstractTest::VectorFromJson(QStringLiteral("://input_loop_by_intersection.json"), input);
QVector<QPointF> output;
AbstractTest::VectorFromJson(QStringLiteral("://output_loop_by_intersection.json"), output);
QTest::newRow("Loop for angle by intersection") << input
<< 39.685039370078741 // seam allowance width (1.05 cm)
<< output;
ASSERT_TEST_CASE("Loop for angle by intersection",
QStringLiteral("://loop_by_intersection/input.json"),
QStringLiteral("://loop_by_intersection/output.json"),
39.685039370078741 /*seam allowance width (1.05 cm)*/);
}
//---------------------------------------------------------------------------------------------------------------------