From a67b5de934f3cd61b1070f881d2c5f61d4441a8d Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Tue, 6 Sep 2022 16:31:25 -0700 Subject: [PATCH] Fix test The size() test was testing a special case of a round rect being exactly an oval. The test was technically correct and passing but somehwat misleading. --- .../dev/romainguy/graphics/path/PathIteratorTest.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pathway/src/androidTest/java/dev/romainguy/graphics/path/PathIteratorTest.kt b/pathway/src/androidTest/java/dev/romainguy/graphics/path/PathIteratorTest.kt index a4642eb..e5e05fa 100644 --- a/pathway/src/androidTest/java/dev/romainguy/graphics/path/PathIteratorTest.kt +++ b/pathway/src/androidTest/java/dev/romainguy/graphics/path/PathIteratorTest.kt @@ -380,12 +380,11 @@ class PathIteratorTest { @Test fun convertedConics() { val path1 = Path().apply { - addRoundRect(12.0f, 12.0f, 64.0f, 64.0f, 12.0f, 12.0f, Path.Direction.CW) + addRoundRect(RectF(12.0f, 12.0f, 64.0f, 64.0f), 12.0f, 12.0f, Path.Direction.CW) } val path2 = Path() for (segment in path1) { - android.util.Log.d("Test", "$segment") when (segment.type) { PathSegment.Type.Move -> path2.moveTo(segment.points[0].x, segment.points[0].y) PathSegment.Type.Line -> path2.lineTo(segment.points[1].x, segment.points[1].y) @@ -430,18 +429,18 @@ class PathIteratorTest { @Test fun sizes() { val path = Path().apply { - addRoundRect(12.0f, 12.0f, 24.0f, 24.0f, 8.0f, 8.0f, Path.Direction.CW) + addRoundRect(RectF(12.0f, 12.0f, 64.0f, 64.0f), 8.0f, 8.0f, Path.Direction.CW) } // Preserve conics and count var iterator = path.iterator(PathIterator.ConicEvaluation.AsConic) - assertEquals(6, iterator.rawSize()) + assertEquals(10, iterator.rawSize()) assertEquals(iterator.rawSize(), iterator.size()) // Convert conics and count iterator = path.iterator(PathIterator.ConicEvaluation.AsQuadratics) - assertEquals(6, iterator.rawSize()) - assertEquals(10, iterator.size()) + assertEquals(10, iterator.rawSize()) + assertEquals(14, iterator.size()) } }