added support for upcoming utest 2.x

.github/workflows/RunCI.hx

@@ -1,5 +1,4 @@
 import sys.io.File;
-
 using StringTools;
 
 class RunCI {
@@ -25,9 +24,12 @@ class RunCI {
 			Sys.setCwd(oldCwd);
 		}
 
-		buildSample("samples/munit");
+		#if (haxe > version ("4.0.5"))
 		buildSample("samples/utest");
 		buildSample("samples/buddy");
+		#end
+
+		buildSample("samples/munit");
 		buildSample("samples/hexunit");
 		buildSample("samples/tink_unittest");
 		buildSample("samples/haxeunit");

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, nightly]
+        haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.3, nightly]
       fail-fast: false
     runs-on: ubuntu-latest
     steps:

.haxerc

@@ -1,4 +1,4 @@
 {
-  "version": "4.3.1",
+  "version": "4.3.3",
   "resolveLibs": "scoped"
 }

makeReleaseZip.sh

@@ -2,7 +2,7 @@
 
 npm install
 npx lix download
-npx lix use haxe 4.3.1
+npx lix use haxe 4.3.3
 
 npx haxe build.hxml
 

package.json

@@ -5,7 +5,7 @@
 	"icon": "images/icon.png",
 	"author": "Alexander Blum <[email protected]>",
 	"publisher": "vshaxe",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"license": "MIT",
 	"homepage": "https://github.com/vshaxe/haxe-test-adapter",
 	"repository": {

samples/buddy/.haxerc

@@ -1,4 +1,4 @@
 {
-  "version": "4.3.1",
+  "version": "4.3.3",
   "resolveLibs": "scoped"
 }

samples/buddy/haxe_libraries/json2object.hxml

@@ -1,4 +1,4 @@
-# @install: lix --silent download "haxelib:/json2object#3.11.0" into json2object/3.11.0/haxelib
+# @install: lix --silent download "gh://github.com/elnabo/json2object#a75859de1e966c09e73591b6c9186086c143fe60" into json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60
 -lib hxjsonast
--cp ${HAXE_LIBCACHE}/json2object/3.11.0/haxelib/src
+-cp ${HAXE_LIBCACHE}/json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60/src
 -D json2object=3.11.0

samples/utest/.haxerc

@@ -1,4 +1,4 @@
 {
-  "version": "4.2.5",
+  "version": "4.3.3",
   "resolveLibs": "scoped"
 }

samples/utest/haxe_libraries/hxjsonast.hxml

@@ -1,3 +1,3 @@
-# @install: lix --silent download "haxelib:/hxjsonast#1.0.1" into hxjsonast/1.0.1/haxelib
--cp ${HAXE_LIBCACHE}/hxjsonast/1.0.1/haxelib/src
--D hxjsonast=1.0.1
+# @install: lix --silent download "haxelib:/hxjsonast#1.1.0" into hxjsonast/1.1.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxjsonast/1.1.0/haxelib/src
+-D hxjsonast=1.1.0

samples/utest/haxe_libraries/json2object.hxml

@@ -1,4 +1,4 @@
-# @install: lix --silent download "haxelib:/json2object#3.10.0" into json2object/3.10.0/haxelib
+# @install: lix --silent download "gh://github.com/elnabo/json2object#a75859de1e966c09e73591b6c9186086c143fe60" into json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60
 -lib hxjsonast
--cp ${HAXE_LIBCACHE}/json2object/3.10.0/haxelib/src
--D json2object=3.10.0
+-cp ${HAXE_LIBCACHE}/json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60/src
+-D json2object=3.11.0

samples/utest/haxe_libraries/utest.hxml

@@ -1,5 +1,4 @@
-# @install: lix --silent download "gh://github.com/haxe-utest/utest#afb943e2732177824a92feb5e15e541117fbba19" into utest/1.13.2/github/afb943e2732177824a92feb5e15e541117fbba19
--cp ${HAXE_LIBCACHE}/utest/1.13.2/github/afb943e2732177824a92feb5e15e541117fbba19/src
--D utest=1.13.2
---macro utest.utils.Macro.checkHaxe()
+# @install: lix --silent download "gh://github.com/haxe-utest/utest#88bc3001470eefb45d8547a0897dc4f718dadc89" into utest/2.0.0-alpha/github/88bc3001470eefb45d8547a0897dc4f718dadc89
+-cp ${HAXE_LIBCACHE}/utest/2.0.0-alpha/github/88bc3001470eefb45d8547a0897dc4f718dadc89/src
+-D utest=2.0.0-alpha
 --macro utest.utils.Macro.importEnvSettings()

src/HaxeTestController.hx

@@ -2,6 +2,7 @@ import haxe.Json;
 import haxe.ds.ArraySort;
 import haxe.io.Path;
 import js.lib.Promise;
+import vscode.OutputChannel;
 import _testadapter.data.Data;
 import _testadapter.data.TestFilter;
 import _testadapter.data.TestResults;
@@ -10,7 +11,6 @@ import vscode.DebugSession;
 import vscode.ExtensionContext;
 import vscode.FileSystemWatcher;
 import vscode.Location;
-import vscode.OutputChannel;
 import vscode.ProcessExecution;
 import vscode.Range;
 import vscode.RelativePattern;

test-adapter/_testadapter/utest/Reporter.hx

@@ -76,7 +76,7 @@ class Reporter implements IReport<Reporter> {
 		testResults.save();
 	}
 
-	function dumpStack(stack:Array<StackItem>):String {
+	function dumpStack(stack:Stack):String {
 		if (stack.length == 0) {
 			return "";
 		}
@@ -93,3 +93,9 @@ class Reporter implements IReport<Reporter> {
 
 	public function setHandler(handler:Reporter->Void) {}
 }
+
+#if (utest >= version("2.0.0-alpha"))
+typedef Stack = CallStack;
+#else
+typedef Stack = Array<StackItem>;
+#end

test-adapter/haxelib.json

@@ -8,8 +8,8 @@
 		"vscode"
 	],
 	"description": "A Test Adapter for Visual Studio Code",
-	"version": "2.0.5",
-	"releasenote": "added support for pending tests in buddy",
+	"version": "2.0.6",
+	"releasenote": "updated utest Reporter",
 	"contributors": [
 		"AlexHaxe",
 		"Gama11",