test: make tests robust to reordering of equations/unknowns

Author: AayushSabharwal

test/clock.jl

@@ -72,8 +72,9 @@ sss, = ModelingToolkit._structural_simplify!(deepcopy(tss[1]), (inputs[1], ()))
 @test isempty(equations(sss))
 d = Clock(dt)
 k = ShiftIndex(d)
-@test observed(sss) == [yd(k + 1) ~ Sample(dt)(y); r(k + 1) ~ 1.0;
-       ud(k + 1) ~ kp * (r(k + 1) - yd(k + 1))]
+@test issetequal(observed(sss),
+    [yd(k + 1) ~ Sample(dt)(y); r(k + 1) ~ 1.0;
+     ud(k + 1) ~ kp * (r(k + 1) - yd(k + 1))])
 
 d = Clock(dt)
 # Note that TearingState reorders the equations

test/input_output_handling.jl

@@ -414,6 +414,8 @@ matrices, ssys = linearize(augmented_sys,
         augmented_sys.d
     ], outs;
     op = [augmented_sys.u => 0.0, augmented_sys.input.u[2] => 0.0, augmented_sys.d => 0.0])
+matrices = ModelingToolkit.reorder_unknowns(
+    matrices, unknowns(ssys), [ssys.x[2], ssys.integrator.x[1], ssys.x[1]])
 @test matrices.A ≈ [A [1; 0]; zeros(1, 2) -0.001]
 @test matrices.B == I
 @test matrices.C == [C zeros(2)]

test/odesystem.jl

@@ -927,7 +927,7 @@ let
     sys_simp = structural_simplify(sys_con)
     true_eqs = [D(sys.x) ~ sys.v
                 D(sys.v) ~ ctrl.kv * sys.v + ctrl.kx * sys.x]
-    @test isequal(full_equations(sys_simp), true_eqs)
+    @test issetequal(full_equations(sys_simp), true_eqs)
 end
 
 let