more unit tests

Author: adireddy

checkstyle/checks/BlockFormatCheck.hx

@@ -12,24 +12,24 @@ class BlockFormatCheck extends Check {
 	var lastLineRE = ~/^\s*\}[,;\/*]?/;
 
 	override function actualRun() {
-		ExprUtils.walkFile(_checker.ast, function(e){
+		ExprUtils.walkFile(_checker.ast, function(e) {
 			switch(e.expr){
-			case EBlock([]) | EObjectDecl([]):
-				if (e.pos.max - e.pos.min > "{}".length)
-					logPos("Empty block should be written as {}", e.pos, Reflect.field(SeverityLevel, severity));
-			case EBlock(_) | EObjectDecl(_):
-				var lmin =_checker.getLinePos(e.pos.min).line;
-				var lmax =_checker.getLinePos(e.pos.max).line;
+				case EBlock([]) | EObjectDecl([]):
+					if (e.pos.max - e.pos.min > "{}".length)
+						logPos("Empty block should be written as {}", e.pos, Reflect.field(SeverityLevel, severity));
+				case EBlock(_) | EObjectDecl(_):
+					var lmin = _checker.getLinePos(e.pos.min).line;
+					var lmax = _checker.getLinePos(e.pos.max).line;
 
-				if (lmin != lmax) {
-					if (!firstLineRE.match(_checker.lines[lmin])) {
-						logPos("First line of multiline block should contain only '{'", e.pos, Reflect.field(SeverityLevel, severity));
+					if (lmin != lmax) {
+						if (!firstLineRE.match(_checker.lines[lmin])) {
+							logPos("First line of multiline block should contain only {", e.pos, Reflect.field(SeverityLevel, severity));
+						}
+						if (!lastLineRE.match(_checker.lines[lmax])) {
+							logPos("Last line of multiline block should contain only } and maybe , or ;", e.pos, Reflect.field(SeverityLevel, severity));
+						}
 					}
-					if (!lastLineRE.match(_checker.lines[lmax])) {
-						logPos("Last line of multiline block should contain only '}' and maybe ',' or ';'", e.pos, Reflect.field(SeverityLevel, severity));
-					}
-				}
-			default:
+				default:
 			}
 		});
 	}

run.n

@@ -0,0 +1,53 @@
+package ;
+
+import checkstyle.checks.BlockFormatCheck;
+
+class BlockFormatCheckTest extends CheckTestCase {
+
+	public function testCorrectBlockFormat(){
+		var msg = checkMessage(BlockFormatTests.TEST, new BlockFormatCheck());
+		assertEquals(msg, '');
+	}
+
+	public function testWrongBlockFormat(){
+		var msg = checkMessage(BlockFormatTests.TEST1, new BlockFormatCheck());
+		assertEquals(msg, 'Empty block should be written as {}');
+	}
+
+	public function testBlockFormatFirstLine(){
+		var msg = checkMessage(BlockFormatTests.TEST2, new BlockFormatCheck());
+		assertEquals(msg, 'First line of multiline block should contain only {');
+	}
+
+	public function testBlockFormatLastLine(){
+		var msg = checkMessage(BlockFormatTests.TEST3, new BlockFormatCheck());
+		assertEquals(msg, 'Last line of multiline block should contain only } and maybe , or ;');
+	}
+}
+
+class BlockFormatTests {
+	public static inline var TEST:String = "
+	class Test {
+		public function new() {}
+	}";
+
+	public static inline var TEST1:String = "
+	class Test {
+		public function new(){
+
+		}
+	}";
+
+	public static inline var TEST2:String =
+	"class Test {
+		public function new() { var a:Int;
+
+		}
+	}";
+
+	public static inline var TEST3:String =
+	"class Test {
+		public function new() {
+			var a:Int; }
+	}";
+}

test/BlockFormatCheckTest.hx

@@ -0,0 +1,50 @@
+package ;
+
+import checkstyle.checks.EmptyLinesCheck;
+
+class EmptyLinesCheckTest extends CheckTestCase {
+
+	public function testDefaultEmptyLines(){
+		var msg = checkMessage(EmptyLinesTests.TEST1, new EmptyLinesCheck());
+		assertEquals(msg, 'Too many consecutive empty lines (> 1)');
+	}
+
+	public function testCorrectEmptyLines(){
+		var msg = checkMessage(EmptyLinesTests.TEST2, new EmptyLinesCheck());
+		assertEquals(msg, '');
+	}
+
+	public function testConfigurableEmptyLines(){
+		var check = new EmptyLinesCheck();
+		check.maxConsecutiveEmptyLines = 2;
+
+		var msg = checkMessage(EmptyLinesTests.TEST3, check);
+		assertEquals(msg, '');
+	}
+}
+
+class EmptyLinesTests {
+	public static inline var TEST1:String = "
+	class Test {
+		var _a:Int;
+
+
+	}";
+
+	public static inline var TEST2:String =
+	"class Test {
+		public function new() {
+			var b:Int;
+
+		}
+	}";
+
+	public static inline var TEST3:String =
+	"class Test {
+		public function new() {
+			var b:Int;
+
+
+		}
+	}";
+}

test/EmptyLinesCheckTest.hx

@@ -23,16 +23,6 @@ class ListenerNameCheckTest extends CheckTestCase {
 		var msg = checkMessage(ListernerTests.TEST3, new ListenerNameCheck());
 		assertEquals(msg, 'Wrong listener name, prefix with "on": _testUpdate');
 	}
-
-	public function testListenerName4(){
-		var msg = checkMessage(ListernerTests.TEST4, new ListenerNameCheck());
-		assertEquals(msg, 'Wrong listener name, prefix with "on": _testUpdate');
-	}
-
-	public function testListenerName5(){
-		var msg = checkMessage(ListernerTests.TEST5, new ListenerNameCheck());
-		assertEquals(msg, 'Wrong listener name, prefix with "on": _testUpdate');
-	}
 }
 
 class ListernerTests {
@@ -75,24 +65,4 @@ class ListernerTests {
 
 		function _testUpdate() {}
 	}";
-
-	public static inline var TEST4:String = "
-	class Test {
-		var a:Stage;
-		public function new() {
-			a.add('update', _testUpdate);
-		}
-
-		function _testUpdate() {}
-	}";
-
-	public static inline var TEST5:String = "
-	class Test {
-		var a:Stage;
-		public function new() {
-			a.addOnce('update', _testUpdate);
-		}
-
-		function _testUpdate() {}
-	}";
 }

test/ListenerNameCheckTest.hx

@@ -5,8 +5,11 @@ class TestMain {
 	public function new() {
 		var runner = new haxe.unit.TestRunner();
 		runner.add(new AnonymousCheckTest());
-		runner.add(new ListenerNameCheckTest());
 		runner.add(new ArrayInstantiationCheckTest());
+		runner.add(new BlockFormatCheckTest());
+		runner.add(new EmptyLinesCheckTest());
+
+		runner.add(new ListenerNameCheckTest());
 
 		var success = runner.run();
 		Sys.exit(success ? 0 : 1);