Fix quality flaw: improve coverage and testcases

Author: benzonico

java-squid/src/main/java/org/sonar/java/cfg/LiveVariables.java

@@ -32,7 +32,6 @@
 import org.sonar.plugins.java.api.tree.VariableTree;
 
 import javax.annotation.Nullable;
-import java.io.PrintStream;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
@@ -166,14 +165,4 @@ private static List<Symbol> getUsedVariables(@Nullable Tree syntaxNode, Symbol.M
     return extractorFromClass.usedVariables();
   }
 
-  public void debugTo(PrintStream outStream) {
-    for (CFG.Block block : cfg.reversedBlocks()) {
-      outStream.println("B" + block.id + " Live:");
-      for (Symbol live : out.get(block)) {
-        outStream.print(" " + live.name() + "@" + Integer.toHexString(live.hashCode()));
-      }
-      outStream.println();
-    }
-  }
-
 }

java-squid/src/test/java/org/sonar/java/cfg/LiveVariablesTest.java

@@ -54,14 +54,14 @@ public void test_simple_live() {
   }
 
   @Test
-  public void test_simple_death() throws Exception {
+  public void test_simple_death()  {
     CFG cfg = buildCFG("void foo(int a) {  int i; /* should not be live here */ if (false) ; i = 0; }");
     LiveVariables liveVariables = LiveVariables.analyze(cfg);
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(3))).isEmpty();
   }
 
   @Test
-  public void test_field_not_tracked() throws Exception {
+  public void test_field_not_tracked()  {
     CFG cfg = buildCFG("void foo(int a) { field = 0; /* fields should not be tracked */ if (false) ; foo(field); }");
     LiveVariables liveVariables = LiveVariables.analyze(cfg);
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(3))).isEmpty();
@@ -72,15 +72,15 @@ public void test_field_not_tracked() throws Exception {
   }
 
   @Test
-  public void test_while_loop() throws Exception {
+  public void test_while_loop()  {
     CFG cfg = buildCFG("void foo(boolean condition) { while (condition) { int x = 0; use(x); x = 1; /* x should not be live here*/}}");
     LiveVariables liveVariables = LiveVariables.analyze(cfg);
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(3))).hasSize(1);
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(4))).hasSize(1);
   }
 
   @Test
-  public void in_of_first_block_should_be_empty() throws Exception {
+  public void in_of_first_block_should_be_empty()  {
     CFG cfg = buildCFG("boolean foo(int a) { foo(a);}");
     LiveVariables liveVariables = LiveVariables.analyze(cfg);
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(0))).isEmpty();
@@ -103,23 +103,21 @@ public void lambdas_read_liveness() {
   }
 
   @Test
-  public void anonymous_class_liveness() throws Exception {
+  public void anonymous_class_liveness()  {
     CFG cfg = buildCFG("boolean foo(int a) { if(true) { System.out.println(''); } new Object() { String toString(){return a;} }; }");
     LiveVariables liveVariables = LiveVariables.analyze(cfg);
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(0))).isEmpty();
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(2))).hasSize(1);
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(3))).hasSize(1);
 
-    cfg = buildCFG("boolean foo(int a) { if(true) { System.out.println(''); } new Object() { String toString(){return a = 2;} }; }");
+    cfg = buildCFG("boolean foo(int a) { if(true) { new A().field = 2;System.out.println(''); } new Object() { String toString(){return a = 2;} }; }");
     liveVariables = LiveVariables.analyze(cfg);
+    cfg.debugTo(System.out);
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(0))).isEmpty();
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(2))).isEmpty();
     assertThat(liveVariables.getOut(cfg.reversedBlocks().get(3))).isEmpty();
   }
+  
+  
 
-  @Test
-  public void assignement_with_parenthesis() throws Exception {
-
-
-  }
 }

java-squid/src/test/java/org/sonar/java/cfg/LocalVariableReadExtractorTest.java

@@ -57,7 +57,7 @@ public void should_extract_local_vars_read() {
 
   @Test
   public void should_not_extract_local_vars_written() throws Exception {
-    MethodTree methodTree = buildMethodTree("void foo(boolean a) { new Object() { void foo() { a = false;} };  }");
+    MethodTree methodTree = buildMethodTree("void foo(boolean a) { new Object() { void foo() { new A().field = 0; a = false;} };  }");
     StatementTree statementTree = methodTree.block().body().get(0);
     LocalVariableReadExtractor extractor = new LocalVariableReadExtractor(methodTree.symbol());
     statementTree.accept(extractor);