test: update some tests

Author: AayushSabharwal

test/basics.jl

@@ -1,4 +1,4 @@
-using SymbolicUtils: Symbolic, Sym, FnType, Term, Add, Mul, Pow, symtype, operation, arguments, issym, isterm, BasicSymbolic, term, isequal_with_metadata
+using SymbolicUtils: Symbolic, Sym, FnType, Term, Add, Mul, Pow, symtype, operation, arguments, issym, isterm, BasicSymbolic, term, isequal_core
 using SymbolicUtils
 using ConstructionBase: setproperties
 using Setfield
@@ -298,7 +298,7 @@ toterm(t) = Term{symtype(t)}(operation(t), arguments(t))
     @syms a b c
     @test isequal(toterm(-1c), Term{Number}(*, [-1, c]))
     @test isequal(toterm(-1(a+b)), Term{Number}(+, [-1a, -b]))
-    @test isequal(toterm((a + b) - (b + c)), Term{Number}(+, [a, -1c]))
+    @test isequal(toterm((a + b) - (b + c)), Term{Number}(+, [-1c, a]))
 end
 
 @testset "hash" begin
@@ -340,9 +340,9 @@ end
     a1 = setmetadata(a, Ctx1, "meta_1")
     a2 = setmetadata(a, Ctx1, "meta_1")
     a3 = setmetadata(a, Ctx2, "meta_2")
-    @test !isequal_with_metadata(a, a1)
-    @test isequal_with_metadata(a1, a2)
-    @test !isequal_with_metadata(a1, a3)
+    @test !isequal_core(a, a1; full=true)
+    @test isequal_core(a1, a2; full=true)
+    @test !isequal_core(a1, a3; full=true)
 end
 
 @testset "subtyping" begin
@@ -424,8 +424,8 @@ end
     x = setmetadata(x(t), Int, 3)
     ex = x * y
     res = substitute(ex, Dict(y => 1))
-    @test SymbolicUtils.isequal_with_metadata(res, x)
+    @test SymbolicUtils.isequal_core(res, x; full=true)
     ex = x + y
     res = substitute(ex, Dict(y => 0))
-    @test SymbolicUtils.isequal_with_metadata(res, x)
+    @test SymbolicUtils.isequal_core(res, x; full=true)
 end

test/order.jl

@@ -60,12 +60,12 @@ end
     @test istotal(ρ(), -1z())
 
     @syms a(t) b(t) t
-    @test a(t) <ₑ b(t)
-    @test !(b(t) <ₑ a(t))
+    @test b(t) <ₑ a(t)
+    @test !(a(t) <ₑ b(t))
 
     @syms y() x()
-    @test x() <ₑ y()
-    @test !(y() <ₑ x())
+    @test y() <ₑ x()
+    @test !(x() <ₑ y())
 end
 
 @testset "Sym vs Term" begin

test/rewrite.jl

@@ -38,7 +38,7 @@ end
     @test @rule((~x)^(~x) => ~x)(b^a) === nothing
     @test @rule((~x)^(~x) => ~x)(a+a) === nothing
     @eqtest @rule((~x)^(~x) => ~x)(sin(a)^sin(a)) == sin(a)
-    @eqtest @rule((~x*~y + ~x*~z)  => ~x * (~y+~z))(a*b + a*c) == a*(b+c)
+    @eqtest @rule((~x*~y + ~z*~x)  => ~x * (~y+~z))(a*b + a*c) == a*(b+c)
 
     @eqtest @rule(+(~~x) => ~~x)(a + b) == [a,b]
     @eqtest @rule(+(~~x) => ~~x)(term(+, a, b, c)) == [a,b,c]
@@ -108,4 +108,4 @@ end
     ex1 = ex * b
 
     @test getmetadata(arguments(ex1)[1], MetaData) == :metadata
-end
+end