jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: handle boolean condition with bitwise OR and AND (#202) (PR #522)

Browse Source
This commit is contained in:
Ahmed Ashour
2019-03-27 09:41:56 +01:00
committed by skylot
parent eb141ad12b
commit b78349aef7
4 changed files with 232 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseAnd.java
+92
View File
@@ -0,0 +1,92 @@
package jadx.tests.integration.conditions;
import org.junit.jupiter.api.Test;
import jadx.core.dex.nodes.ClassNode;
import jadx.tests.api.IntegrationTest;
import static jadx.tests.api.utils.JadxMatchers.containsOne;
import static org.hamcrest.MatcherAssert.assertThat;
public class TestBitwiseAnd extends IntegrationTest {
public static class TestCls {
private boolean a;
private boolean b;
public void test() {
if ((a & b) != false) {
test();
}
}
}
@Test
public void test() {
noDebugInfo();
ClassNode cls = getClassNode(TestCls.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("if (this.a && this.b) {"));
}
public static class TestCls2 {
private boolean a;
private boolean b;
public void test() {
if ((a & b) != true) {
test();
}
}
}
@Test
public void test2() {
noDebugInfo();
ClassNode cls = getClassNode(TestCls2.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("if (!this.a || !this.b) {"));
}
public static class TestCls3 {
private boolean a;
private boolean b;
public void test() {
if ((a & b) == false) {
test();
}
}
}
@Test
public void test3() {
noDebugInfo();
ClassNode cls = getClassNode(TestCls3.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("if (!this.a || !this.b) {"));
}
public static class TestCls4 {
private boolean a;
private boolean b;
public void test() {
if ((a & b) == true) {
test();
}
}
}
@Test
public void test4() {
noDebugInfo();
ClassNode cls = getClassNode(TestCls4.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("if (this.a && this.b) {"));
}
}
jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseOr.java
+92
View File
@@ -0,0 +1,92 @@
package jadx.tests.integration.conditions;
import org.junit.jupiter.api.Test;
import jadx.core.dex.nodes.ClassNode;
import jadx.tests.api.IntegrationTest;
import static jadx.tests.api.utils.JadxMatchers.containsOne;
import static org.hamcrest.MatcherAssert.assertThat;
public class TestBitwiseOr extends IntegrationTest {
public static class TestCls {
private boolean a;
private boolean b;
public void test() {
if ((a | b) != false) {
test();
}
}
}
@Test
public void test() {
noDebugInfo();
ClassNode cls = getClassNode(TestCls.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("if (this.a || this.b) {"));
}
public static class TestCls2 {
private boolean a;
private boolean b;
public void test() {
if ((a | b) != true) {
test();
}
}
}
@Test
public void test2() {
noDebugInfo();
ClassNode cls = getClassNode(TestCls2.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("if (!this.a && !this.b) {"));
}
public static class TestCls3 {
private boolean a;
private boolean b;
public void test() {
if ((a | b) == false) {
test();
}
}
}
@Test
public void test3() {
noDebugInfo();
ClassNode cls = getClassNode(TestCls3.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("if (!this.a && !this.b) {"));
}
public static class TestCls4 {
private boolean a;
private boolean b;
public void test() {
if ((a | b) == true) {
test();
}
}
}
@Test
public void test4() {
noDebugInfo();
ClassNode cls = getClassNode(TestCls4.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("if (this.a || this.b) {"));
}
}
jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions17.java
-33
View File
@@ -1,33 +0,0 @@
package jadx.tests.integration.conditions;
import org.junit.jupiter.api.Test;
import jadx.NotYetImplemented;
import jadx.core.dex.nodes.ClassNode;
import jadx.tests.api.IntegrationTest;
import static jadx.tests.api.utils.JadxMatchers.containsOne;
import static org.hamcrest.MatcherAssert.assertThat;
public class TestConditions17 extends IntegrationTest {
public static class TestCls {
private boolean a;
private boolean b;
public void test() {
if ((a | b) != false) {
test();
}
}
}
@Test
@NotYetImplemented
public void test202() {
ClassNode cls = getClassNode(TestCls.class);
String code = cls.getCode().toString();
assertThat(code, containsOne("a || b"));
}
}