added unittests for EmptyBlockCheck

removed tokens from EmptyBlockCheck because object decls get detected as empty blocks

Author: AlexHaxe

README.md

@@ -83,9 +83,9 @@ More information in [wiki page](https://github.com/adireddy/haxe-checkstyle/wiki
 			"type": "EmptyBlock",
 			"props": {
 				"severity": "ERROR",
-				"option": "empty",
-				"tokens": []
+				"option": "empty"
 			}
+		},
 		{
 			"type": "EmptyLines",
 			"props": {

checkstyle/checks/EmptyBlockCheck.hx

@@ -7,39 +7,24 @@ import haxe.macro.Expr;
 @desc("Checks empty blocks / object declarations")
 class EmptyBlockCheck extends Check {
 
-	public static inline var BLOCK:String = "BLOCK";
-	public static inline var OBJECT_DECL:String = "OBJECT_DECL";
-
 	// require comment in empty block / object decl
 	public static inline var TEXT:String = "text";
 	// empty block / object decl can be empty or have comments
 	// if block has no comments, enforces {} notation
 	public static inline var EMPTY:String = "empty";
 
-	public var tokens:Array<String>;
 	public var option:String;
 
 	public function new() {
 		super();
-		tokens = [];
 		option = EMPTY;
 	}
 
-	function hasToken(token:String):Bool {
-		if (tokens.length == 0) return true;
-		if (tokens.indexOf(token) > -1) return true;
-		return false;
-	}
-
 	override function actualRun() {
 		ExprUtils.walkFile(checker.ast, function(e) {
 			if (isPosSuppressed(e.pos)) return;
 			switch(e.expr){
-				case EBlock([]):
-					if (!hasToken(BLOCK)) return;
-					checkEmptyBlock(e);
-				case EObjectDecl([]):
-					if (!hasToken(OBJECT_DECL)) return;
+				case EBlock([]) | EObjectDecl([]):
 					checkEmptyBlock(e);
 				default:
 			}

resources/config.json

@@ -60,8 +60,7 @@
 			"type": "EmptyBlock",
 			"props": {
 				"severity": "ERROR",
-				"option": "empty",
-				"tokens": []
+				"option": "empty"
 			}
 		},
 		{

test/EmptyBlockCheckTest.hx

@@ -0,0 +1,84 @@
+package ;
+
+import checkstyle.checks.EmptyBlockCheck;
+
+class EmptyBlockCheckTest extends CheckTestCase {
+
+	public function testCorrectEmptyBlock() {
+		var check = new EmptyBlockCheck ();
+		assertMsg(check, EmptyBlockTests.TEST, '');
+		assertMsg(check, EmptyBlockTests.TEST2, '');
+		assertMsg(check, EmptyBlockTests.TEST3, '');
+		assertMsg(check, EmptyBlockTests.TEST5, '');
+	}
+
+	public function testWrongEmptyBlock() {
+		var check = new EmptyBlockCheck ();
+		assertMsg(check, EmptyBlockTests.TEST1, 'Empty block should be written as {}');
+		assertMsg(check, EmptyBlockTests.TEST4, 'Empty block should be written as {}');
+		assertMsg(check, EmptyBlockTests.TEST6, 'Empty block should be written as {}');
+	}
+
+	public function testOptionText () {
+		var check = new EmptyBlockCheck ();
+		check.option = EmptyBlockCheck.TEXT;
+
+		assertMsg(check, EmptyBlockTests.TEST, 'Empty block should contain a comment');
+		assertMsg(check, EmptyBlockTests.TEST1, 'Empty block should contain a comment');
+		assertMsg(check, EmptyBlockTests.TEST2, '');
+		assertMsg(check, EmptyBlockTests.TEST3, 'Empty block should contain a comment');
+		assertMsg(check, EmptyBlockTests.TEST4, 'Empty block should contain a comment');
+		assertMsg(check, EmptyBlockTests.TEST5, '');
+	}
+}
+
+class EmptyBlockTests {
+	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() {
+			// comment
+		}
+	}";
+
+	public static inline var TEST3:String =
+	"class Test {
+		public function new() {
+			var a = {};
+		}
+	}";
+
+	public static inline var TEST4:String = "
+	class Test {
+		public function new() {
+			var a = {
+			};
+		}
+	}";
+
+	public static inline var TEST5:String = "
+	class Test {
+		public function new() {
+			var a = {
+				// comment
+			};
+		}
+	}";
+
+	public static inline var TEST6:String = "
+	class Test {
+		public function new() {
+		}
+	}";
+}

test/TestMain.hx

@@ -9,6 +9,7 @@ class TestMain {
 		runner.add(new BlockFormatCheckTest());
 		runner.add(new ConstantNameCheckTest());
 		runner.add(new DynamicCheckTest());
+		runner.add(new EmptyBlockCheckTest());
 		runner.add(new EmptyLinesCheckTest());
 		runner.add(new ERegInstantiationCheckTest());
 		runner.add(new FileLengthCheckTest());