added unittests for parser and checker threads (#393)

* added unittest for threads
* update CHANGES.md
* revert coverage line calculation change

Author: AlexHaxe

CHANGES.md

@@ -1,6 +1,7 @@
 ## next version (2.x.x)
 
 - Fixed handling of default setters/getters in indentation check [#391](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/391)
+- Added unittests for ParserQueue and CheckerPool [#393](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/393)
 - Improved wrapped code detection [#392](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/392)
 
 ## version 2.2.1

src/checkstyle/ParserQueue.hx

@@ -25,6 +25,7 @@ class ParserQueue {
 	}
 
 	public function start(max:Int) {
+		if (max <= 0) max = 1;
 		maxPreparse = max;
 		checkers = [];
 		Thread.create(runParser);

test/TestMain.hx

@@ -51,7 +51,7 @@ class TestMain {
 
 			var missingStatements:Array<Statement> = cls.getMissingStatements();
 			for (stmt in missingStatements) {
-				for (line in stmt.lines) coverageData[line + 1] = 0;
+				for (line in stmt.lines) coverageData[line] = 0;
 			}
 			var missingBranches:Array<Branch> = cls.getMissingBranches();
 			for (branch in missingBranches) {

test/TestSuite.hx

@@ -1,4 +1,5 @@
 import checks.CheckTestCase;
+import misc.ThreadTest;
 import token.TokenTreeBuilderTest;
 import token.TokenTreeBuilderParsingTest;
 
@@ -11,6 +12,7 @@ class TestSuite extends massive.munit.TestSuite {
 
 		add(TokenTreeBuilderTest);
 		add(TokenTreeBuilderParsingTest);
+		add(ThreadTest);
 
 		var tests = CompileTime.getAllClasses(CheckTestCase);
 		for (testClass in tests) add(testClass);

test/misc/ThreadTest.hx

@@ -0,0 +1,107 @@
+package misc;
+
+import checkstyle.CheckFile;
+import checkstyle.reporter.ReporterManager;
+import checkstyle.Checker;
+import checkstyle.ParserQueue;
+import checkstyle.CheckerPool;
+import checkstyle.checks.whitespace.IndentationCheck;
+import checks.whitespace.IndentationCheckTest.IndentationCheckTests;
+
+import checks.CheckTestCase.TestReporter;
+
+import massive.munit.Assert;
+
+class ThreadTest {
+
+	static inline var FILE_NAME:String = "Test.hx";
+
+	var checker:Checker;
+	var reporter:TestReporter;
+
+	@Before
+	public function setup() {
+		checker = setupChecker();
+		reporter = new TestReporter();
+		ReporterManager.INSTANCE.clear();
+		ReporterManager.INSTANCE.addReporter(reporter);
+	}
+
+	@Test
+	public function testParserQueue() {
+		var files:Array<CheckFile> = setupFiles(13);
+
+		var parseQueue = new ParserQueue(files, checker);
+		parseQueue.start (1);
+		Assert.isFalse(parseQueue.isFinished());
+
+		Sys.sleep(1);
+		var failCount:Int = 0;
+		var count:Int = 0;
+		Assert.isFalse(parseQueue.isFinished());
+		while (true) {
+			if (failCount > 8) Assert.fail("parsing failed");
+			var newChecker = parseQueue.nextFile();
+			if (newChecker == null) {
+				failCount++;
+				Sys.sleep(1);
+				continue;
+			}
+			count++;
+			if (count == 13) break;
+		}
+		Assert.isTrue(parseQueue.isFinished());
+		Assert.areEqual(13, count);
+		Assert.isNull(parseQueue.nextFile());
+	}
+
+	@Test
+	public function testCheckerPool() {
+		var files:Array<CheckFile> = setupFiles(13);
+
+		var parseQueue = new ParserQueue(files, checker);
+		parseQueue.start (1);
+
+		var checkerPool = new CheckerPool(parseQueue, checker, null);
+		checkerPool.start (5);
+		Assert.isFalse(parseQueue.isFinished());
+		Assert.isFalse(checkerPool.isFinished());
+
+		Sys.sleep(1);
+		var failCount:Int = 0;
+		while (true) {
+			if (failCount > 5) Assert.fail("parsing failed");
+			if (parseQueue.isFinished() && checkerPool.isFinished()) break;
+			failCount++;
+			Sys.sleep(1);
+		}
+		Assert.isTrue(parseQueue.isFinished());
+		Assert.isTrue(checkerPool.isFinished());
+		Assert.isNull(parseQueue.nextFile());
+	}
+
+	function setupFiles(count:Int):Array<CheckFile> {
+		var files:Array<CheckFile> = [];
+		for (i in 0...count) {
+			files.push({
+				name: 'test_$i.hx',
+				content: IndentationCheckTests.CORRECT_TAB_INDENT,
+				index: i
+			});
+		}
+		return files;
+	}
+
+	function setupChecker():Checker {
+		var newChecker:Checker = new Checker();
+		newChecker.addCheck(new IndentationCheck());
+
+		return newChecker;
+	}
+
+	@After
+	public function tearDown() {
+		checker = null;
+		reporter = null;
+	}
+}