From b7109b1b2bf45506560922240f8a6707251c9908 Mon Sep 17 00:00:00 2001 From: Ahmed Ashour Date: Tue, 26 Mar 2019 19:04:22 +0100 Subject: [PATCH] test: remove commented code and style fixes (PR #520) --- .../jadx/tests/integration/conditions/TestConditions.java | 2 +- .../tests/integration/conditions/TestConditions15.java | 2 +- .../jadx/tests/integration/conditions/TestConditions2.java | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java index 79717b765..55e298f83 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java @@ -12,7 +12,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestConditions extends IntegrationTest { public static class TestCls { - private boolean test(boolean a, boolean b, boolean c) { + public boolean test(boolean a, boolean b, boolean c) { return (a && b) || c; } } diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java index 030c79e3e..0a5e9eac4 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java @@ -12,7 +12,7 @@ public class TestConditions15 extends IntegrationTest { public static class TestCls { - private static boolean test(final String name) { + public static boolean test(final String name) { if (isEmpty(name)) { return false; } diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java index 34da34677..d16d77a08 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java @@ -2,7 +2,6 @@ package jadx.tests.integration.conditions; import org.junit.jupiter.api.Test; -import jadx.core.dex.nodes.ClassNode; import jadx.tests.api.IntegrationTest; public class TestConditions2 extends IntegrationTest { @@ -25,10 +24,6 @@ public class TestConditions2 extends IntegrationTest { @Test public void test() { - ClassNode cls = getClassNode(TestCls.class); - String code = cls.getCode().toString(); - -// assertThat(code, containsString("return;")); -// assertThat(code, not(containsString("else"))); + getClassNode(TestCls.class); } }