#635: rebase onto #628: the filter tests add their paint fields themselves

The test schema extended the image scale-mode field that only #634 adds; it now adds the
filter containers to the paint message itself, so it works with and without #634.

crates/format/src/fig/image_filter_tests.rs

@@ -12,7 +12,7 @@ fn image_filter_schema() -> Schema {
              message PaintFilterMessage float tint, float shadows, float highlights, float detail, float exposure, float vignette, float temperature, float vibrance, float contrast, float brightness, float mystery\n\
              message Paint ",
         )
-        .replace("ImageScaleMode imageScaleMode\n", "ImageScaleMode imageScaleMode, PaintFilterMessage paintFilter, FilterColorAdjust filterColorAdjust\n");
+        .replace("message Paint PaintType type,", "message Paint PaintFilterMessage paintFilter, FilterColorAdjust filterColorAdjust, PaintType type,");
     Schema::parse(&text).unwrap()
 }