Implement Ternary

Author: sghill

src/main/java/org/powerassert/PowerAssertProcessor.java

@@ -1,13 +1,5 @@
 package org.powerassert;
 
-import java.io.IOException;
-import java.util.Set;
-
-import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-
 import com.sun.source.tree.AssertTree;
 import com.sun.source.util.TreePath;
 import com.sun.source.util.TreePathScanner;
@@ -22,6 +14,13 @@
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.Name;
 
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import java.io.IOException;
+import java.util.Set;
+
 @SupportedAnnotationTypes("*")
 public class PowerAssertProcessor extends AbstractProcessor {
 	private Trees trees;
@@ -235,6 +234,17 @@ else if(expr instanceof JCTree.JCNewArray) {
 					recordArgs(newArray.getInitializers(), expr)
 			).setPos(newArray.pos);
 		}
+		else if(expr instanceof JCTree.JCConditional) {
+			JCTree.JCConditional conditional = (JCTree.JCConditional) expr;
+			return recordValue(
+					treeMaker.Conditional(
+							recordAllValues(conditional.getCondition(), expr),
+							recordAllValues(conditional.getTrueExpression(), expr),
+							recordAllValues(conditional.getFalseExpression(), expr)
+					).setPos(conditional.pos),
+					expr.pos
+			);
+		}
 		return expr;
 	}
 

src/test/java/org/powerassert/PowerAssertProcessorTest.java

@@ -1,12 +1,11 @@
 package org.powerassert;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
 public class PowerAssertProcessorTest {
 	JavaCompilerHelper java;
 
@@ -187,10 +186,21 @@ public void newArray() {
 				"            1  1    false");
 	}
 
-	@Ignore
 	@Test
 	public void ternary() {
-		// TODO
+		java.compile(
+				"public class A {" +
+						"	@org.junit.Test public void test() {" +
+						"      boolean b = false;" +
+						"      boolean a = true;" +
+						"      assert \"a\".contains(\"b\") ? a : b;" + // extraordinarily contrived, I know...
+						"	}" +
+						"}");
+
+		testFailsWithMessage("A", "test",
+				"\"a\".contains(\"b\") ? a : b",
+				"    |             |     |",
+				"    false         false false");
 	}
 
 	@Test