Make ExprExcept tests more reliable, fixes simplification bug (#8026)

* Make ExprExcept tests more reliable, fixes simplification bug

* Update src/test/skript/tests/syntaxes/expressions/ExprExcept.sk

Co-authored-by: Efnilite <[email protected]>

Author: sovdeeth

src/main/java/ch/njol/skript/expressions/ExprExcept.java

@@ -6,11 +6,9 @@
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.WrapperExpression;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.ExpressionList;
-import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.SyntaxStringBuilder;
+import ch.njol.skript.lang.simplification.SimplifiedLiteral;
 import ch.njol.skript.util.LiteralUtils;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
@@ -70,6 +68,14 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 			.toArray(o -> (Object[]) Array.newInstance(getReturnType(), o));
 	}
 
+	@Override
+	public Expression<?> simplify() {
+		setExpr(getExpr().simplify());
+		if (getExpr() instanceof Literal<?> && exclude instanceof Literal<?>)
+			return SimplifiedLiteral.fromExpression(this);
+		return this;
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return (new SyntaxStringBuilder(event, debug))

src/main/java/ch/njol/skript/expressions/base/WrapperExpression.java

@@ -5,14 +5,11 @@
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.SyntaxElement;
-import ch.njol.skript.lang.util.ConvertedExpression;
+import ch.njol.skript.lang.simplification.SimplifiedLiteral;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.converter.ConverterInfo;
-import org.skriptlang.skript.lang.converter.Converters;
-import ch.njol.skript.lang.simplification.SimplifiedLiteral;
 
 import java.util.Iterator;
 
@@ -99,6 +96,14 @@ public boolean isDefault() {
 		return expr.isDefault();
 	}
 
+	/**
+	 * This method must be overridden if the subclass uses more than one expression.
+	 * i.e. if only {@link #setExpr(Expression)} is used, this method does not need to be overridden.
+	 * But if a second expression is stored, this method must be overridden to account for that.
+	 * <br>
+	 * <br>
+	 * {@inheritDoc}
+	 */
 	@Override
 	public Expression<? extends T> simplify() {
 		setExpr(expr.simplify());

src/test/skript/tests/syntaxes/expressions/ExprExcept.sk

@@ -13,31 +13,42 @@ test "except items":
 	assert {_except::*} is not set with "Failed to exclude all"
 
 test "except entities":
-	spawn 5 zombies at test-location
-	set {_zombie} to last spawned zombie
-	add {_zombie} to {_exclude::*}
+	set {_nums::*} to 1, 2, 3, 4, and 5
 
-	assert size of all zombies except {_zombie} is 4 with "Failed to exclude zombie"
-	assert size of all entities except {_exclude::*} is 4 with "Failed to exclude list (zombie)"
+	assert size of {_nums::*} except 5 is 4 with "Failed to exclude 5"
+	assert size of {_nums::*} except 1 and 5 is 3 with "Failed to exclude 1 and 5"
+	assert size of {_nums::*} excluding -1 is 5 with "Excluding -1 should not change the list"
 
-	spawn 5 skeletons at test-location
-	set {_skeleton} to last spawned skeleton
-	add {_skeleton} to {_exclude::*}
+	set {_exclude::*} to 3, 7, and 1.1
+	assert size of {_nums::*} excluding {_exclude::*} is 4 with "Failed to exclude multiple numbers"
 
-	assert size of all skeletons excluding {_skeleton} is 4 with "Failed to exclude skeleton"
-	assert size of all entities excluding {_exclude::*} is 8 with "Failed to exclude list (zombie, skeleton)"
 
+	set {_types::*} to a zombie, a skeleton, and a villager
+	assert size of {_types::*} excluding a zombie is 2 with "Failed to exclude zombie"
+	assert size of {_types::*} excluding a zombie and a skeleton is 1 with "Failed to exclude zombie and skeleton"
+
+	delete all villagers
 	spawn 5 villagers at test-location
 	set {_villager} to last spawned villager
 	add {_villager} to {_exclude::*}
 
 	assert size of all villagers not including {_villager} is 4 with "Failed to exclude villager"
-	assert size of all entities not including {_exclude::*} is 12 with "Failed to exclude list (zombie, skeleton, villager)"
 
 	clear all entities
 
+	set {exprexcept::count} to 0
+
+	assert ("a", "z", and 3) excluding excludes() is "z" and 3 with "Failed to exclude the result of a function call"
+
+	assert {exprexcept::count} is 1 with "Function call was not executed exactly once"
+
+
 test "except 'or' objects":
 	assert (1 or 2) except 2 is 1 with "Failed to exclude '2' from an 'or' list"
 
 	set {_item} to (a diamond or an iron ingot or an emerald) excluding a diamond
 	assert {_item} is (an iron ingot or an emerald) with "Failed to exclude 'diamond' from an 'or' item list"
+
+local function excludes() returns strings:
+	add 1 to {exprexcept::count}
+	return "a", "b", "c", "d", and "e"