[tests] add more tests

HaxeFoundation · Feb 11, 2025 · 177040f · 177040f
1 parent cf14ba3
commit 177040f
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 4 deletions.
diff --git a/tests/server/src/cases/issues/Issue12001.hx b/tests/server/src/cases/issues/Issue12001.hx
@@ -13,6 +13,18 @@ class Issue12001 extends TestCase {
 		assertErrorMessage("Cannot redefine module Foo");
 	}
 
+	function testDefineType1(_) {
+		vfs.putContent("Macro.hx", getTemplate("issues/Issue12001/Macro.hx"));
+		vfs.putContent("Main.hx", getTemplate("issues/Issue12001/Main.hx"));
+		var args = ["-main", "Main", "--macro", "Macro.defineType()"];
+		runHaxe(args);
+		assertSuccess();
+
+		runHaxe(args);
+		Assert.isFalse(hasErrorMessage('HxbData.HxbFailure("Could not read static field test on Foo while hxbing Main")'));
+		assertErrorMessage("Cannot redefine module Foo");
+	}
+
 	function testDefineModule(_) {
 		vfs.putContent("Macro.hx", getTemplate("issues/Issue12001/Macro.hx"));
 		vfs.putContent("Empty.hx", getTemplate("Empty.hx"));
@@ -24,4 +36,29 @@ class Issue12001 extends TestCase {
 		Assert.isFalse(0 == errorMessages.length);
 		assertErrorMessage("Cannot redefine module Bar");
 	}
+
+	function testDefineModule1(_) {
+		vfs.putContent("Macro.hx", getTemplate("issues/Issue12001/Macro.hx"));
+		vfs.putContent("Main.hx", getTemplate("issues/Issue12001/Main1.hx"));
+		var args = ["-main", "Main", "--macro", "Macro.defineModule()"];
+		runHaxe(args);
+		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");
+	}
+
+	function testAfterTyping(_) {
+		vfs.putContent("Macro.hx", getTemplate("issues/Issue12001/Macro.hx"));
+		vfs.putContent("Empty.hx", getTemplate("Empty.hx"));
+		var args = ["-main", "Empty", "--macro", "Macro.hook()"];
+		runHaxe(args);
+		assertSuccess();
+
+		runHaxe(args);
+		Assert.isFalse(0 == errorMessages.length);
+		assertErrorMessage("Cannot redefine module Baz");
+	}
 }
diff --git a/tests/server/test/templates/issues/Issue12001/Macro.hx b/tests/server/test/templates/issues/Issue12001/Macro.hx
@@ -6,8 +6,10 @@ function defineType() {
 			pos: Context.currentPos(),
 			pack: [],
 			name: "Foo",
-			kind: TDAbstract(macro :String, [], [], []),
-			fields: []
+			kind: TDClass(null, null, false, false, false),
+			fields: (macro class Foo {
+				public static function test() {}
+			}).fields
 		});
 	});
 }
@@ -18,8 +20,30 @@ function defineModule() {
 			pos: Context.currentPos(),
 			pack: [],
 			name: "Bar",
-			kind: TDAbstract(macro :String, [], [], []),
-			fields: []
+			kind: TDClass(null, null, false, false, false),
+			fields: (macro class Bar {
+				public static function test() {}
+			}).fields
 		}]);
 	});
 }
+
+function hook() {
+	var generated = false;
+	Context.onAfterTyping((_) -> {
+		if (generated) return;
+		generated = true;
+
+		Context.defineModule("Baz", [{
+			pos: Context.currentPos(),
+			pack: [],
+			name: "Baz",
+			kind: TDClass(null, null, false, false, false),
+			fields: (macro class Baz {
+				public static function test() {}
+			}).fields
+		}]);
+	});
+
+	return null;
+}
diff --git a/tests/server/test/templates/issues/Issue12001/Main.hx b/tests/server/test/templates/issues/Issue12001/Main.hx
@@ -0,0 +1,3 @@
+function main() {
+	Foo.test;
+}
diff --git a/tests/server/test/templates/issues/Issue12001/Main1.hx b/tests/server/test/templates/issues/Issue12001/Main1.hx
@@ -0,0 +1,3 @@
+function main() {
+	Bar.test;
+}