Add tests to cover 95.3% of constrainteq.cpp branches.

src/constrainteq.cpp

@@ -53,7 +53,7 @@ Expr *ConstraintBase::VectorsParallel(int eq, ExprVector a, ExprVector b) {
     }
 
     if(eq == 0) return e0;
-    if(eq == 1) return e1;
+    if(eq == 1) return e1; // BRANCH_ALWAYS_TAKEN
     ssassert(false, "Unexpected index of equation");
 }
 
@@ -729,7 +729,7 @@ void ConstraintBase::GenerateReal(IdList<Equation,hEquation> *l) const {
                     // an endpoint; so that's normal to the tangent, not
                     // parallel.
                     parallel = !parallel;
-                } else if(e->type == Entity::Type::CUBIC) {
+                } else if(e->type == Entity::Type::CUBIC) { // BRANCH_ALWAYS_TAKEN
                     if(oth) {
                         dir[i] = e->CubicGetFinishTangentExprs();
                     } else {

src/drawconstraint.cpp

@@ -227,8 +227,8 @@ void Constraint::DoLineWithArrows(Canvas *canvas, Canvas::hStroke hcs,
     if(!onlyOneExt) {
         DoLine(canvas, hcs, b, be.Plus(out.WithMagnitude(10*pixels)));
     } else {
-        Vector prj = be;
-        DoProjectedPoint(canvas, hcs, &prj);
+        // Vector prj = be;
+        // DoProjectedPoint(canvas, hcs, &prj);
     }
 
     int within = DoLineTrimmedAgainstBox(canvas, hcs, ref, ae, be);

test/CMakeLists.txt

@@ -65,8 +65,10 @@ add_custom_target(solvespace-test ALL
 # coverage reports
 
 if(ENABLE_COVERAGE)
-    set(LCOV_FLAGS   -q --rc lcov_branch_coverage=1 --rc lcov_excl_line=ssassert)
-    set(LCOV_FLAGS   ${LCOV_FLAGS} --gcov-tool ${GCOV})
+    set(LCOV_FLAGS   -q --gcov-tool ${GCOV})
+    set(LCOV_FLAGS   ${LCOV_FLAGS} --rc lcov_branch_coverage=1)
+    set(LCOV_FLAGS   ${LCOV_FLAGS} --rc "lcov_excl_line=(ssassert|switch)")
+    set(LCOV_FLAGS   ${LCOV_FLAGS} --rc "lcov_excl_br_line=BRANCH_ALWAYS_TAKEN")
     set(LCOV_COLLECT -c -b ${CMAKE_SOURCE_DIR}/src -d ${CMAKE_BINARY_DIR}/src --no-external)
 
     add_custom_command(

test/constraint/angle/test.cpp

@@ -1,13 +1,49 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(free_in_3d_roundtrip) {
+    CHECK_LOAD("free_in_3d.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}
+
+TEST_CASE(free_in_3d_migrate_from_v20) {
+    CHECK_LOAD("free_in_3d_v20.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}
+
+TEST_CASE(reference_roundtrip) {
+    CHECK_LOAD("reference.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}
+
+TEST_CASE(reference_migrate_from_v20) {
+    CHECK_LOAD("reference_v20.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}
+
+TEST_CASE(reference_free_in_3d_roundtrip) {
+    CHECK_LOAD("reference_free_in_3d.slvs");
+    CHECK_RENDER("reference_free_in_3d.png");
+    CHECK_SAVE("reference_free_in_3d.slvs");
+}
+
+TEST_CASE(reference_free_in_3d_migrate_from_v20) {
+    CHECK_LOAD("reference_free_in_3d_v20.slvs");
+    CHECK_RENDER("reference_free_in_3d.png");
+    CHECK_SAVE("reference_free_in_3d.slvs");
+}

test/constraint/arc_line_tangent/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");

test/constraint/at_midpoint/test.cpp

@@ -1,13 +1,49 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
-    CHECK_LOAD("normal.slvs");
-    CHECK_RENDER("normal.png");
-    CHECK_SAVE("normal.slvs");
+TEST_CASE(line_pt_normal_roundtrip) {
+    CHECK_LOAD("line_pt_normal.slvs");
+    CHECK_RENDER("line_pt_normal.png");
+    CHECK_SAVE("line_pt_normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
-    CHECK_LOAD("normal_v20.slvs");
-    CHECK_RENDER("normal.png");
-    CHECK_SAVE("normal.slvs");
+TEST_CASE(line_pt_normal_migrate_from_v20) {
+    CHECK_LOAD("line_pt_normal_v20.slvs");
+    CHECK_RENDER("line_pt_normal.png");
+    CHECK_SAVE("line_pt_normal.slvs");
+}
+
+TEST_CASE(line_pt_free_in_3d_roundtrip) {
+    CHECK_LOAD("line_pt_free_in_3d.slvs");
+    CHECK_RENDER("line_pt_free_in_3d.png");
+    CHECK_SAVE("line_pt_free_in_3d.slvs");
+}
+
+TEST_CASE(line_pt_free_in_3d_migrate_from_v20) {
+    CHECK_LOAD("line_pt_free_in_3d_v20.slvs");
+    CHECK_RENDER("line_pt_free_in_3d.png");
+    CHECK_SAVE("line_pt_free_in_3d.slvs");
+}
+
+TEST_CASE(line_plane_normal_roundtrip) {
+    CHECK_LOAD("line_plane_normal.slvs");
+    CHECK_RENDER("line_plane_normal.png");
+    CHECK_SAVE("line_plane_normal.slvs");
+}
+
+TEST_CASE(line_plane_normal_migrate_from_v20) {
+    CHECK_LOAD("line_plane_normal_v20.slvs");
+    CHECK_RENDER("line_plane_normal.png");
+    CHECK_SAVE("line_plane_normal.slvs");
+}
+
+TEST_CASE(line_plane_free_in_3d_roundtrip) {
+    CHECK_LOAD("line_plane_free_in_3d.slvs");
+    CHECK_RENDER("line_plane_free_in_3d.png");
+    CHECK_SAVE("line_plane_free_in_3d.slvs");
+}
+
+TEST_CASE(line_plane_free_in_3d_migrate_from_v20) {
+    CHECK_LOAD("line_plane_free_in_3d_v20.slvs");
+    CHECK_RENDER("line_plane_free_in_3d.png");
+    CHECK_SAVE("line_plane_free_in_3d.slvs");
 }

test/constraint/comment/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");

test/constraint/cubic_line_tangent/test.cpp

@@ -1,13 +1,25 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(free_in_3d_roundtrip) {
+    CHECK_LOAD("free_in_3d.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}
+
+TEST_CASE(free_in_3d_migrate_from_v20) {
+    CHECK_LOAD("free_in_3d_v20.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}

test/constraint/curve_curve_tangent/test.cpp

@@ -1,13 +1,25 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
-    CHECK_LOAD("normal.slvs");
-    CHECK_RENDER("normal.png");
-    CHECK_SAVE("normal.slvs");
+TEST_CASE(arc_arc_roundtrip) {
+    CHECK_LOAD("arc_arc.slvs");
+    CHECK_RENDER("arc_arc.png");
+    CHECK_SAVE("arc_arc.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
-    CHECK_LOAD("normal_v20.slvs");
-    CHECK_RENDER("normal.png");
-    CHECK_SAVE("normal.slvs");
+TEST_CASE(arc_arc_migrate_from_v20) {
+    CHECK_LOAD("arc_arc_v20.slvs");
+    CHECK_RENDER("arc_arc.png");
+    CHECK_SAVE("arc_arc.slvs");
+}
+
+TEST_CASE(arc_cubic_roundtrip) {
+    CHECK_LOAD("arc_cubic.slvs");
+    CHECK_RENDER("arc_cubic.png");
+    CHECK_SAVE("arc_cubic.slvs");
+}
+
+TEST_CASE(arc_cubic_migrate_from_v20) {
+    CHECK_LOAD("arc_cubic_v20.slvs");
+    CHECK_RENDER("arc_cubic.png");
+    CHECK_SAVE("arc_cubic.slvs");
 }

test/constraint/diameter/test.cpp

@@ -1,13 +1,25 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(reference_roundtrip) {
+    CHECK_LOAD("reference.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}
+
+TEST_CASE(reference_migrate_from_v20) {
+    CHECK_LOAD("reference_v20.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}

test/constraint/eq_len_pt_line_d/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");

test/constraint/eq_pt_ln_distances/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");

test/constraint/equal_angle/test.cpp

@@ -1,13 +1,25 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(other_roundtrip) {
+    CHECK_LOAD("other.slvs");
+    CHECK_RENDER("other.png");
+    CHECK_SAVE("other.slvs");
+}
+
+TEST_CASE(other_migrate_from_v20) {
+    CHECK_LOAD("other_v20.slvs");
+    CHECK_RENDER("other.png");
+    CHECK_SAVE("other.slvs");
+}

test/constraint/equal_length_lines/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");

test/constraint/equal_line_arc_len/test.cpp

@@ -1,13 +1,23 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(pi) {
+    CHECK_LOAD("pi.slvs");
+    CHECK_RENDER("pi.png");
+}
+
+TEST_CASE(tau) {
+    CHECK_LOAD("tau.slvs");
+    CHECK_RENDER("tau.png");
+}

test/constraint/equal_radius/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");

test/constraint/length_difference/test.cpp

@@ -1,7 +1,13 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(reference_roundtrip) {
+    CHECK_LOAD("reference.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}

test/constraint/length_ratio/test.cpp

@@ -1,13 +1,25 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(reference_roundtrip) {
+    CHECK_LOAD("reference.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}
+
+TEST_CASE(reference_migrate_from_v20) {
+    CHECK_LOAD("reference_v20.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}

test/constraint/parallel/test.cpp

@@ -1,13 +1,25 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(free_in_3d_roundtrip) {
+    CHECK_LOAD("free_in_3d.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}
+
+TEST_CASE(free_in_3d_migrate_from_v20) {
+    CHECK_LOAD("free_in_3d_v20.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}

test/constraint/perpendicular/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");

test/constraint/points_coincident/test.cpp

@@ -1,13 +1,25 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(free_in_3d_roundtrip) {
+    CHECK_LOAD("free_in_3d.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}
+
+TEST_CASE(free_in_3d_migrate_from_v20) {
+    CHECK_LOAD("free_in_3d_v20.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}

test/constraint/proj_pt_distance/test.cpp

@@ -1,13 +1,25 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
+
+TEST_CASE(reference_roundtrip) {
+    CHECK_LOAD("reference.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}
+
+TEST_CASE(reference_migrate_from_v20) {
+    CHECK_LOAD("reference_v20.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}

test/constraint/pt_face_distance/test.cpp

@@ -1,12 +1,24 @@
 #include "harness.h"
 
-// TEST_CASE(roundtrip) {
-//     CHECK_LOAD("normal.slvs");
-//     CHECK_RENDER("normal.png");
-//     CHECK_SAVE("normal.slvs");
-// }
+TEST_CASE(normal_roundtrip) {
+    CHECK_LOAD("normal.slvs");
+    CHECK_RENDER("normal.png");
+    CHECK_SAVE("normal.slvs");
+}
 
-// TEST_CASE(migrate_from_v20) {
-//     CHECK_LOAD("normal_v20.slvs");
-//     CHECK_SAVE("normal.slvs");
-// }
+TEST_CASE(normal_migrate_from_v20) {
+    CHECK_LOAD("normal_v20.slvs");
+    CHECK_SAVE("normal.slvs");
+}
+
+TEST_CASE(reference_roundtrip) {
+    CHECK_LOAD("reference.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}
+
+TEST_CASE(reference_migrate_from_v20) {
+    CHECK_LOAD("reference_v20.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}

test/constraint/pt_in_plane/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");

test/constraint/pt_line_distance/test.cpp

@@ -1,18 +1,42 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(render_extended) {
+TEST_CASE(free_in_3d_roundtrip) {
+    CHECK_LOAD("free_in_3d.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}
+
+TEST_CASE(free_in_3d_migrate_from_v20) {
+    CHECK_LOAD("free_in_3d_v20.slvs");
+    CHECK_RENDER("free_in_3d.png");
+    CHECK_SAVE("free_in_3d.slvs");
+}
+
+TEST_CASE(reference_roundtrip) {
+    CHECK_LOAD("reference.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}
+
+TEST_CASE(reference_migrate_from_v20) {
+    CHECK_LOAD("reference_v20.slvs");
+    CHECK_RENDER("reference.png");
+    CHECK_SAVE("reference.slvs");
+}
+
+TEST_CASE(extended_render) {
     CHECK_LOAD("extended.slvs");
     CHECK_RENDER("extended.png");
 }

test/constraint/pt_on_circle/test.cpp

@@ -1,12 +1,12 @@
 #include "harness.h"
 
-TEST_CASE(roundtrip) {
+TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
-TEST_CASE(migrate_from_v20) {
+TEST_CASE(normal_migrate_from_v20) {
     CHECK_LOAD("normal_v20.slvs");
     CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");