core: add ternary conditions processing

This commit is contained in:
Skylot
2014-08-19 22:27:51 +04:00
parent ee56610f06
commit e2018535ef
7 changed files with 133 additions and 18 deletions
@@ -20,15 +20,6 @@ public class TestConditions14 extends InternalJadxTest {
System.out.println("1");
return true;
}
// public static boolean test2(Object a, Object b) {
// if (a == null ? b != null : !a.equals(b)) {
// return false;
// }
// System.out.println("2");
// return true;
// }
}
@Test
@@ -0,0 +1,36 @@
package jadx.tests.internal.conditions;
import jadx.api.InternalJadxTest;
import jadx.core.dex.nodes.ClassNode;
import org.junit.Test;
import static jadx.tests.utils.JadxMatchers.containsOne;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
public class TestTernaryInIf extends InternalJadxTest {
public static class TestCls {
public boolean test1(boolean a, boolean b, boolean c) {
return a ? b : c;
}
public int test2(boolean a, boolean b, boolean c) {
return (a ? b : c) ? 1 : 2;
}
}
@Test
public void test() {
ClassNode cls = getClassNode(TestCls.class);
String code = cls.getCode().toString();
System.out.println(code);
assertThat(code, containsOne("return a ? b : c;"));
assertThat(code, containsOne("return (a ? b : c) ? 1 : 2;"));
assertThat(code, not(containsString("if")));
assertThat(code, not(containsString("else")));
}
}