lots of improvements in the WMC metric. Related to #31

fixtures/wmc/CC10.java

@@ -0,0 +1,50 @@
+package wmc;
+
+public class CC10 {
+
+	public void m1() {
+		int a = 10;
+		int b = 10;
+		boolean x = true;
+
+		if(a>10) {
+			if(b > 10) {
+				if(x) {
+					if(!x) {
+						for(;;) {
+							while(true) {
+								for(int i = 0; i < 10 && j < 10; i++) {
+									boolean y = x ? false : true;
+									boolean yy = a > 10 && !y ? false : true;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		else a--;
+	}
+
+	public void m2() {
+		int a = 10;
+		int b = 10;
+		boolean x = true;
+
+		if(a>10) {
+			if(b > 10) {
+				if(x) {
+					if(!x) {
+						for(;;) {
+							while(true) {
+								for(int i = 0; i < 10 && j < 10; i++) {
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		else a--;
+	}
+}

fixtures/wmc/CC2.java

@@ -17,10 +17,13 @@ public void m1() {
 	}
 
 	public void m2() {
-		int i=0;
-		while(i < 10) {
-			a++;
-			i++;
+		int b = 10;
+		switch(a) {
+			case 1:
+				a++;
+				break;
+			case b:
+				a+=2;
 		}
 	}
 }

fixtures/wmc/CC6.java

@@ -0,0 +1,19 @@
+package wmc;
+
+public class CC6 {
+	public boolean m1(int a) {
+		if (0 <= a && a <= 10) {
+			return true;
+		}
+		return false;
+	}
+
+	public boolean m2(int a) {
+		boolean cond = (0 <= a && a <= 10);
+		if (cond) {
+			return true;
+		}
+		return false;
+	}
+
+}

fixtures/wmc/CC7.java

@@ -0,0 +1,19 @@
+package wmc;
+
+public class CC7 {
+
+	public void m1(boolean x) {
+		int a = 0;
+
+		if(x) a++;
+		else a--;
+	}
+
+	public void m2(boolean x) {
+		int a = 0;
+
+		if(x == true) a++;
+		else a--;
+	}
+
+}

fixtures/wmc/CC8.java

@@ -0,0 +1,110 @@
+package wmc;
+
+import java.util.*;
+
+public class CC8 {
+
+	public void m0() {
+
+		for(int i = 0, j = 20; i < 10 && j < 20; i++, j++ ) {
+			// do something else
+		}
+	}
+
+	public void m1() {
+
+		for(int i = 0; i < 10; i++) {
+			// do something
+		}
+
+		for(int i = 0, j = 20; i < 10 && j < 20; i++, j++ ) {
+			// do something else
+		}
+
+		for(;;) {
+
+		}
+
+		boolean x = true;
+		for(int i = 0; x; i++) {
+
+		}
+	}
+
+	public void m2() {
+		int i = 0;
+		int j = 0;
+
+		while(i < 10) {
+			// do something
+		}
+
+		while(i < 10 && j < 20) {
+			// do something else
+		}
+
+		while(true) {
+
+		}
+
+		boolean x = true;
+		while(x) {
+
+		}
+	}
+
+	public void m3() {
+		int i = 0;
+		int j = 0;
+
+		do {
+
+		} while(i < 10);
+
+		do {
+			// do something else
+		} while ((i < 10 && j < 20));
+
+		do {
+
+		} while(true);
+
+		boolean x = true;
+		do {
+
+		} while(x);
+	}
+
+	public void m4() {
+		List<String> xs = new ArrayList<String>();
+		for(String x : xs) {
+
+		}
+	}
+
+	public void m5() {
+		int a = 10;
+		while(a > 10 ? true : false) {
+
+		}
+
+		do {
+
+		} while(a > 10 ? true : false);
+
+
+	}
+
+	public void m6() {
+		int i = 0;
+		int j = 0;
+		boolean y = false;
+
+		while(true && y && !y && y == false || i > 0) {
+
+		}
+
+	}
+
+
+}

fixtures/wmc/CC9.java

@@ -0,0 +1,148 @@
+package wmc;
+
+public class CC9 {
+
+	public void m0() {
+		int a = 10;
+	}
+
+	public void m1() {
+		int a = 0;
+		int b = 0;
+		int c = 0;
+
+		if(a > 0) {
+
+		}
+
+	}
+
+	public void m2() {
+		int a = 0;
+		int b = 0;
+		int c = 0;
+
+		if(a > 0) {
+
+		} else if(b > 0) {
+
+		}
+
+	}
+
+	public void m3() {
+		int a = 0;
+		int b = 0;
+		int c = 0;
+
+		if(a > 0) {
+
+		} else {
+
+		}
+
+	}
+
+	public void m4() {
+		int a = 0;
+		int b = 0;
+		int c = 0;
+
+		if(a > 0) {
+
+		} else if(b > 0) {
+
+		} else if(c > 0) {
+
+		} else {
+
+		}
+	}
+
+	public void m5() {
+		int a = 0;
+		int b = 0;
+		int c = 0;
+
+		if(a > 0 && b < 0) {
+
+		} else if(b > 0 || c > 0) {
+
+		} else if((c == 0 || b < 0) & (a != 0)) {
+
+		} else {
+
+		}
+	}
+
+	public void m6() {
+		boolean a = true;
+		boolean b = false;
+		boolean c = true;
+
+		if(a) {
+
+		} else if (a == true && b) {
+
+		} else if (!b) {
+
+		} else if(!b && c == false) {
+
+		} else if(!c && b) {
+
+		}
+	}
+
+	public void m7() {
+		boolean x = returnTrue();
+
+		if(x) {
+
+		} else if (returnTrue()) {
+
+		} else if (returnTrue() == false) {
+
+		} else if (!returnTrue()) {
+
+		}
+	}
+
+	public void m8() {
+		int x = returnInt();
+
+		if(x > 10) {
+
+		} else if (returnInt() > 20) {
+
+		} else if (returnInt() + 10 < 20) {
+
+		}
+	}
+
+	public void m9() {
+		int a = 0;
+		int b = 0;
+
+		boolean result = a > 10 ? true : false;
+		boolean result2 = (a > 10 ? (b > 20 ? true : false) : false);
+
+		if(result) {
+
+		} else if ((a > 10 ? true : false)) {
+
+		} else if ((a > 10 ? true : false) && b > 0) {
+
+		}
+
+	}
+
+	public int returnInt() {
+		return 10;
+	}
+
+	public boolean returnTrue() {
+		return true;
+	}
+
+
+}