From 5640f3b93152ae0bb3f268606e408f91ae98d0af Mon Sep 17 00:00:00 2001 From: Skylot <118523+skylot@users.noreply.github.com> Date: Sun, 2 Jun 2024 18:21:21 +0100 Subject: [PATCH] fix test --- .../deobf/a/TestNegativeRenameCondition.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java b/jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java index 50a7377af..ef80e4d38 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java +++ b/jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java @@ -1,9 +1,14 @@ package jadx.tests.integration.deobf.a; import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Test; +import jadx.api.deobf.IDeobfCondition; +import jadx.api.deobf.impl.CombineDeobfConditions; +import jadx.core.deobf.conditions.AvoidClsAndPkgNamesCollision; +import jadx.core.deobf.conditions.JadxRenameConditions; import jadx.tests.api.IntegrationTest; import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat; @@ -34,6 +39,11 @@ public class TestNegativeRenameCondition extends IntegrationTest { // disable all renaming options args.setRenameFlags(Collections.emptySet()); + // disable rename by collision between class and package names + List list = JadxRenameConditions.buildDefaultDeobfConditions(); + list.removeIf(c -> c.getClass().equals(AvoidClsAndPkgNamesCollision.class)); + args.setRenameCondition(CombineDeobfConditions.combine(list)); + assertThat(getClassNode(TestCls.class)) .code() .doesNotContain("renamed from")