[tests] update tests

Author: kLabz

tests/server/src/cases/issues/Issue12001.hx

@@ -10,9 +10,9 @@ class Issue12001 extends TestCase {
 		runHaxe(args);
 		assertSuccess();
 
+		// Nothing is loading Foo, so no redefinition issue
 		runHaxe(args);
-		Assert.isFalse(0 == errorMessages.length);
-		assertErrorMessage("Cannot redefine module Foo");
+		assertSuccess();
 	}
 
 	function testDefineType1(_) {
@@ -23,8 +23,9 @@ class Issue12001 extends TestCase {
 		assertSuccess();
 
 		runHaxe(args);
-		Assert.isFalse(hasErrorMessage('HxbData.HxbFailure("Could not read static field test on Foo while hxbing Main")'));
-		assertErrorMessage("Cannot redefine module Foo");
+		assertSuccess();
+		// TODO: change invalidation reason
+		assertSkipping("Main", DependencyDirty("Foo - Tainted server/invalidate"));
 	}
 
 	function testDefineModule(_) {
@@ -34,9 +35,9 @@ class Issue12001 extends TestCase {
 		runHaxe(args);
 		assertSuccess();
 
+		// Nothing is loading Bar, so no redefinition issue
 		runHaxe(args);
-		Assert.isFalse(0 == errorMessages.length);
-		assertErrorMessage("Cannot redefine module Bar");
+		assertSuccess();
 	}
 
 	function testDefineModule1(_) {
@@ -47,9 +48,9 @@ class Issue12001 extends TestCase {
 		assertSuccess();
 
 		runHaxe(args);
-		Assert.isFalse(0 == errorMessages.length);
-		Assert.isFalse(hasErrorMessage('HxbData.HxbFailure("Could not read static field test on Bar while hxbing Main")'));
-		assertErrorMessage("Cannot redefine module Bar");
+		assertSuccess();
+		// TODO: change invalidation reason
+		assertSkipping("Main", DependencyDirty("Bar - Tainted server/invalidate"));
 	}
 
 	@:async
@@ -77,9 +78,9 @@ class Issue12001 extends TestCase {
 		runHaxe(args);
 		assertSuccess();
 
+		// Nothing is loading Baz, so it can be defined again
 		runHaxe(args);
-		Assert.isFalse(0 == errorMessages.length);
-		assertErrorMessage("Cannot redefine module Baz");
+		assertSuccess();
 	}
 
 	@:async
@@ -92,6 +93,7 @@ class Issue12001 extends TestCase {
 		function test() {
 			runHaxe(args, () -> {
 				assertSuccess();
+				// Newest version is being included
 				assertHasPrint("Foobaz.test() = " + i);
 				if (++i >= 5) async.done();
 				else test();
@@ -101,15 +103,15 @@ class Issue12001 extends TestCase {
 	}
 
 	function testInvalidateError(_) {
-		vfs.putContent("Macro.hx", getTemplate("issues/Issue12001/Macro.hx"));
+		vfs.putContent("Macro.hx", getTemplate("issues/Issue12001/Macro1.hx"));
 		vfs.putContent("Empty.hx", getTemplate("Empty.hx"));
 		var args = ["-main", "Empty", "--interp", "--macro", "Macro.hookInvalidateError()"];
 		runHaxe(args);
 		assertErrorMessage("Cannot invalidate loaded module Empty");
 	}
 
 	function testInvalidateCaughtError(_) {
-		vfs.putContent("Macro.hx", getTemplate("issues/Issue12001/Macro.hx"));
+		vfs.putContent("Macro.hx", getTemplate("issues/Issue12001/Macro1.hx"));
 		vfs.putContent("Empty.hx", getTemplate("Empty.hx"));
 		var args = ["-main", "Empty", "--interp", "--macro", "Macro.hookInvalidateCatch()"];
 		runHaxe(args);

tests/server/test/templates/issues/Issue12001/Macro.hx

@@ -1,4 +1,3 @@
-import haxe.macro.CompilationServer;
 import haxe.macro.Context;
 
 function defineType() {
@@ -32,8 +31,6 @@ function defineModule() {
 @:persistent var i = 0;
 function redefineModule() {
 	Context.onAfterInitMacros(() -> {
-		CompilationServer.invalidateModule("Foobar");
-
 		Context.defineModule("Foobar", [{
 			pos: Context.currentPos(),
 			pack: [],
@@ -71,8 +68,6 @@ function hookRedefine() {
 		if (generated) return;
 		generated = true;
 
-		CompilationServer.invalidateModule("Foobaz");
-
 		Context.defineModule("Foobaz", [{
 			pos: Context.currentPos(),
 			pack: [],
@@ -84,19 +79,3 @@ function hookRedefine() {
 		}]);
 	});
 }
-
-function hookInvalidateError() {
-	Context.onAfterTyping((_) -> {
-		CompilationServer.invalidateModule("Empty");
-	});
-}
-
-function hookInvalidateCatch() {
-	Context.onAfterTyping((_) -> {
-		try {
-			CompilationServer.invalidateModule("Empty");
-		} catch (e:Dynamic) {
-			Sys.println(Std.string(e));
-		}
-	});
-}

tests/server/test/templates/issues/Issue12001/Macro1.hx

@@ -0,0 +1,18 @@
+import haxe.macro.CompilationServer;
+import haxe.macro.Context;
+
+function hookInvalidateError() {
+	Context.onAfterTyping((_) -> {
+		CompilationServer.invalidateModule("Empty");
+	});
+}
+
+function hookInvalidateCatch() {
+	Context.onAfterTyping((_) -> {
+		try {
+			CompilationServer.invalidateModule("Empty");
+		} catch (e:Dynamic) {
+			Sys.println(Std.string(e));
+		}
+	});
+}