Quellcode durchsuchen

[unit] emit an error if a spec test file does not end with `.unit.hx` (#7808)

Aleksandr Kuzmenko vor 5 Jahren
Ursprung
Commit
0602f4e419

+ 4 - 2
tests/unit/src/unit/UnitBuilder.hx

@@ -29,7 +29,7 @@ using StringTools;
 
 
 class UnitBuilder {
 class UnitBuilder {
 
 
-	static public macro function generateSpec(basePath:String, filter:String = ".unit.hx") {
+	static public macro function generateSpec(basePath:String) {
 		var ret = [];
 		var ret = [];
 		var numFiles = 0;
 		var numFiles = 0;
 
 
@@ -38,7 +38,7 @@ class UnitBuilder {
 			path = path.endsWith("\\") || path.endsWith("/") ? path : path + "/";
 			path = path.endsWith("\\") || path.endsWith("/") ? path : path + "/";
 			for (file in dir) {
 			for (file in dir) {
 				var filePath = path + file;
 				var filePath = path + file;
-				if (file.endsWith(filter)) {
+				if (file.endsWith('.unit.hx')) {
 					numFiles++;
 					numFiles++;
 					var func = {
 					var func = {
 						args: [],
 						args: [],
@@ -81,6 +81,8 @@ class UnitBuilder {
 					ret.push(macro new $tp());
 					ret.push(macro new $tp());
 				} else if (sys.FileSystem.isDirectory(filePath)) {
 				} else if (sys.FileSystem.isDirectory(filePath)) {
 					readDir(filePath, pack.concat([file]));
 					readDir(filePath, pack.concat([file]));
+				} else if(filePath.endsWith('.hx')) {
+					Context.error('$filePath: specification tests filenames should end with ".unit.hx"', Context.currentPos());
 				}
 				}
 			}
 			}
 		}
 		}

+ 1 - 1
tests/unit/src/unitstd/Issue3067.hx → tests/unit/src/unit/issues/Issue3067.hx

@@ -1,4 +1,4 @@
-package unit.unitstd;
+package unit.issues;
 
 
 private abstract TestAbstract(Int) from Int to Int
 private abstract TestAbstract(Int) from Int to Int
 {
 {

+ 2 - 2
tests/unit/src/unitstd/IntIterator.hx → tests/unit/src/unitstd/IntIterator.unit.hx

@@ -8,7 +8,7 @@ var ii = new IntIterator(0, 2);
 var r = [];
 var r = [];
 for (i in ii)
 for (i in ii)
 	r.push(i);
 	r.push(i);
-r == [1, 2];
+r == [0, 1];
 for (i in ii)
 for (i in ii)
 	r.push(i);
 	r.push(i);
-r == [1, 2];
+r == [0, 1];

+ 0 - 0
tests/unit/src/unitstd/haxe/Http.unit2.hx → tests/unit/src/unitstd/haxe/Http.unit.hx.disabled


+ 0 - 0
tests/unit/src/unitstd/haxe/io/ArrayBufferView.hx → tests/unit/src/unitstd/haxe/io/ArrayBufferView.unit.hx