summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
authorJasper van de Gronde <jasper.vandegronde@gmail.com>2008-08-08 14:18:02 +0000
committerjaspervdg <jaspervdg@users.sourceforge.net>2008-08-08 14:18:02 +0000
commit479ccbb1de1f971d66a3772f315729e81c95d3bd (patch)
treed0abb6931089f70367a1034fc451a5da2fd3a493 /src/display
parentmore messages marked for translation (diff)
downloadinkscape-479ccbb1de1f971d66a3772f315729e81c95d3bd.tar.gz
inkscape-479ccbb1de1f971d66a3772f315729e81c95d3bd.zip
Fixed svg-path (and display/curve) tests to properly handle closepath and made a check target.
(bzr r6592)
Diffstat (limited to 'src/display')
-rw-r--r--src/display/curve-test.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/display/curve-test.h b/src/display/curve-test.h
index cca77e063..a45f01afd 100644
--- a/src/display/curve-test.h
+++ b/src/display/curve-test.h
@@ -15,11 +15,11 @@ private:
public:
CurveTest() : path4(Geom::Point(3,5)) // Just a moveto
{
- // Closed path which needs a closing segment
+ // Closed path
path1.append(Geom::HLineSegment(Geom::Point(0,0),1));
path1.append(Geom::VLineSegment(Geom::Point(1,0),1));
path1.close();
- // Closed path that doesn't need a closing segment
+ // Closed path (ClosingSegment is zero length)
path2.append(Geom::LineSegment(Geom::Point(2,0),Geom::Point(3,0)));
path2.append(Geom::BezierCurve<3>(Geom::Point(3,0),Geom::Point(2,1),Geom::Point(1,1),Geom::Point(2,0)));
path2.close();
@@ -53,11 +53,13 @@ public:
pv[0] = path1;
TS_ASSERT_EQUALS(SPCurve(pv).get_segment_count() , 3u);
pv[0] = path2;
- TS_ASSERT_EQUALS(SPCurve(pv).get_segment_count() , 2u);
+ TS_ASSERT_EQUALS(SPCurve(pv).get_segment_count() , 3u);
pv[0] = path3;
TS_ASSERT_EQUALS(SPCurve(pv).get_segment_count() , 4u);
pv[0] = path4;
TS_ASSERT_EQUALS(SPCurve(pv).get_segment_count() , 0u);
+ pv[0].close();
+ TS_ASSERT_EQUALS(SPCurve(pv).get_segment_count() , 1u);
}
{ // Combination
Geom::PathVector pv;
@@ -66,7 +68,7 @@ public:
pv.push_back(path3);
pv.push_back(path4);
SPCurve curve(pv);
- TS_ASSERT_EQUALS(curve.get_segment_count() , 9u);
+ TS_ASSERT_EQUALS(curve.get_segment_count() , 10u);
}
}
@@ -88,11 +90,13 @@ public:
pv[0] = path1;
TS_ASSERT_EQUALS(SPCurve(pv).nodes_in_path() , 3u);
pv[0] = path2;
- TS_ASSERT_EQUALS(SPCurve(pv).nodes_in_path() , 2u);
+ TS_ASSERT_EQUALS(SPCurve(pv).nodes_in_path() , 3u);
pv[0] = path3;
TS_ASSERT_EQUALS(SPCurve(pv).nodes_in_path() , 5u);
pv[0] = path4;
TS_ASSERT_EQUALS(SPCurve(pv).nodes_in_path() , 1u);
+ pv[0].close();
+ TS_ASSERT_EQUALS(SPCurve(pv).nodes_in_path() , 1u);
}
{ // Combination
Geom::PathVector pv;
@@ -101,7 +105,7 @@ public:
pv.push_back(path3);
pv.push_back(path4);
SPCurve curve(pv);
- TS_ASSERT_EQUALS(curve.nodes_in_path() , 11u);
+ TS_ASSERT_EQUALS(curve.nodes_in_path() , 12u);
}
}