test: fix failing tests

Author: AayushSabharwal

test/basics.jl

@@ -937,7 +937,7 @@ end
     @test_reference "inspect_output/ex.txt" sprint(io->SymbolicUtils.inspect(io, ex))
     @test_reference "inspect_output/ex-md.txt" sprint(io->SymbolicUtils.inspect(io, ex, metadata=true))
     @test_reference "inspect_output/ex-nohint.txt" sprint(io->SymbolicUtils.inspect(io, ex, hint=false))
-    @test SymbolicUtils.pluck(ex, 12) == 2
+    @test unwrap_const(SymbolicUtils.pluck(ex, 12)) == 2
     @test_reference "inspect_output/sub10.txt" sprint(io->SymbolicUtils.inspect(io, SymbolicUtils.pluck(ex, 9)))
     @test_reference "inspect_output/sub14.txt" sprint(io->SymbolicUtils.inspect(io, SymbolicUtils.pluck(ex, 14)))
 end
@@ -1156,7 +1156,7 @@ end
 
 @testset "Negative coefficient to fractional power" begin
     @syms a
-    @test isequal((-5a)^0.5, sqrt(5) * Pow{Number}(-a, 0.5))
+    @test isequal((-5a)^0.5, sqrt(5) * Term{SymReal}(^, [-a, 0.5]; type = Number, shape = ShapeVecT()))
 end
 
 @testset "Equivalent expressions across tasks are equal" begin

test/code.jl

@@ -20,11 +20,11 @@ nanmath_st.rewrites[:nanmath] = true
     @test toexpr(a*b*c*d*e) == :($(*)($(*)($(*)($(*)(a, b), c), d), e))
     @test toexpr(a+b+c+d+e) == :($(+)($(+)($(+)($(+)(a, b), c), d), e))
     @test toexpr(a+b) == :($(+)(a, b))
-    @test toexpr(x(t)+y(t)) == :($(+)(x(t), y(t)))
-    @test toexpr(x(t)+y(t)+x(t+1)) == :($(+)($(+)(x(t), y(t)), x($(+)(1, t))))
+    @test toexpr(x(t)+y(t)) == :($(+)(y(t), x(t)))
+    @test toexpr(x(t)+y(t)+x(t+1)) == :($(+)($(+)(x($(+)(1, t)), y(t)), x(t)))
     s = LazyState()
     Code.union_rewrites!(s.rewrites, [x(t), y(t)])
-    @test toexpr(x(t)+y(t)+x(t+1), s) == :($(+)($(+)(var"x(t)", var"y(t)"), x($(+)(1, t))))
+    @test toexpr(x(t)+y(t)+x(t+1), s) == :($(+)($(+)(x($(+)(1, t)), var"y(t)"), var"x(t)"))
 
     ex = :(let a = 3, b = $(+)(1,a)
                $(+)(a, b)
@@ -38,7 +38,7 @@ nanmath_st.rewrites[:nanmath] = true
 
     test_repr(toexpr(Func([x(t), x],[b ← a+2, y(t) ← b], x(t)+x(t+1)+b+y(t))),
               :(function (var"x(t)", x; b = $(+)(2, a), var"y(t)" = b)
-                    $(+)($(+)($(+)(b, var"x(t)"), var"y(t)"), x($(+)(1, t)))
+                    $(+)($(+)($(+)(b, x($(+)(1, t))), var"y(t)"), var"x(t)")
                 end))
     test_repr(toexpr(Func([DestructuredArgs([x, x(t)], :state),
                            DestructuredArgs((a, b), :params)], [],
@@ -49,7 +49,7 @@ nanmath_st.rewrites[:nanmath] = true
                         var"x(t)" = state[2]
                         a = params[1]
                         b = params[2]
-                        $(+)($(+)($(+)(a, b), var"x(t)"), x($(+)(1, t)))
+                        $(+)($(+)($(+)(a, b), x($(+)(1, t))), var"x(t)")
                     end
                 end))
 
@@ -58,7 +58,7 @@ nanmath_st.rewrites[:nanmath] = true
                           x(t+1) + x(t) + a  + b)),
               :(function (state, params)
                     begin
-                        $(+)($(+)($(+)(params[1], params[2]), state[2]), state[1]($(+)(1, t)))
+                        $(+)($(+)($(+)(params[1], params[2]), state[1]($(+)(1, t))), state[2])
                     end
                 end))
 

test/polyform.jl

@@ -64,7 +64,7 @@ end
     @test isequal(simplify_fractions(a), 7/expand(-(x-2)^2))
 
     # https://github.com/JuliaSymbolics/Symbolics.jl/issues/968
-    @eqtest simplify_fractions((x * y + (1//2) * x) / (2 * x)) == 1//2 * (1//2 + y)
+    @eqtest simplify_fractions((x * y + (1//2) * x) / (2 * x)) == (1 + 2y) / 4
 end
 
 @testset "isone iszero" begin