shiny/iconvg: rearrange some encode_test.go functions.
They now match the alphabetical order in testdata/README.
Change-Id: I03688c5a29c42e2a4683331fe97f72ed9828af0f
Reviewed-on: https://go-review.googlesource.com/32135
Reviewed-by: David Crawshaw <crawshaw@golang.org>
diff --git a/shiny/iconvg/encode_test.go b/shiny/iconvg/encode_test.go
index 71489b3..8091447 100644
--- a/shiny/iconvg/encode_test.go
+++ b/shiny/iconvg/encode_test.go
@@ -49,11 +49,6 @@
}
}
-func TestEncodeBlank(t *testing.T) {
- var e Encoder
- testEncode(t, &e, "testdata/blank.ivg")
-}
-
func TestEncodeActionInfo(t *testing.T) {
for _, res := range []string{"lores", "hires"} {
var e Encoder
@@ -130,6 +125,11 @@
testEncode(t, &e, "testdata/arcs.ivg")
}
+func TestEncodeBlank(t *testing.T) {
+ var e Encoder
+ testEncode(t, &e, "testdata/blank.ivg")
+}
+
var cowbellGradients = []struct {
radial bool
@@ -585,6 +585,42 @@
testEncode(t, &e, "testdata/gradient.ivg")
}
+func TestEncodeLODPolygon(t *testing.T) {
+ var e Encoder
+
+ poly := func(n int) {
+ const r = 28
+ angle := 2 * math.Pi / float64(n)
+ e.StartPath(0, r, 0)
+ for i := 1; i < n; i++ {
+ e.AbsLineTo(
+ float32(r*math.Cos(angle*float64(i))),
+ float32(r*math.Sin(angle*float64(i))),
+ )
+ }
+ e.ClosePathEndPath()
+ }
+
+ e.StartPath(0, -28, -20)
+ e.AbsVLineTo(-28)
+ e.AbsHLineTo(-20)
+ e.ClosePathEndPath()
+
+ e.SetLOD(0, 80)
+ poly(3)
+
+ e.SetLOD(80, positiveInfinity)
+ poly(5)
+
+ e.SetLOD(0, positiveInfinity)
+ e.StartPath(0, +28, +20)
+ e.AbsVLineTo(+28)
+ e.AbsHLineTo(+20)
+ e.ClosePathEndPath()
+
+ testEncode(t, &e, "testdata/lod-polygon.ivg")
+}
+
var video005PrimitiveSVGData = []struct {
r, g, b uint32
x0, y0 int
@@ -663,39 +699,3 @@
testEncode(t, &e, "testdata/video-005.primitive.ivg")
}
-
-func TestEncodeLODPolygon(t *testing.T) {
- var e Encoder
-
- poly := func(n int) {
- const r = 28
- angle := 2 * math.Pi / float64(n)
- e.StartPath(0, r, 0)
- for i := 1; i < n; i++ {
- e.AbsLineTo(
- float32(r*math.Cos(angle*float64(i))),
- float32(r*math.Sin(angle*float64(i))),
- )
- }
- e.ClosePathEndPath()
- }
-
- e.StartPath(0, -28, -20)
- e.AbsVLineTo(-28)
- e.AbsHLineTo(-20)
- e.ClosePathEndPath()
-
- e.SetLOD(0, 80)
- poly(3)
-
- e.SetLOD(80, positiveInfinity)
- poly(5)
-
- e.SetLOD(0, positiveInfinity)
- e.StartPath(0, +28, +20)
- e.AbsVLineTo(+28)
- e.AbsHLineTo(+20)
- e.ClosePathEndPath()
-
- testEncode(t, &e, "testdata/lod-polygon.ivg")
-}
