소스 검색

update to utest 1.9.0

Alexander Kuzmenko 7 년 전
부모
커밋
64fc8f796c

+ 4 - 1
tests/sys/src/Main.hx

@@ -1,5 +1,6 @@
 import utest.Runner;
 import utest.Runner;
 import utest.ui.Report;
 import utest.ui.Report;
+import utest.ui.common.HeaderDisplayMode;
 
 
 class Main {
 class Main {
 	static public function main() {
 	static public function main() {
@@ -10,7 +11,9 @@ class Main {
 		runner.addCase(new io.TestFileInput());
 		runner.addCase(new io.TestFileInput());
 		runner.addCase(new io.TestProcess());
 		runner.addCase(new io.TestProcess());
 		runner.addCase(new net.TestSocket());
 		runner.addCase(new net.TestSocket());
-		Report.create(runner);
+		var report = Report.create(runner);
+		report.displayHeader = AlwaysShowHeader;
+		report.displaySuccessResults = NeverShowSuccessResults;
 		runner.run();
 		runner.run();
 	}
 	}
 }
 }

+ 4 - 4
tests/sys/src/TestArguments.hx

@@ -5,7 +5,7 @@ import utest.ui.Report;
 /**
 /**
 	This test is intented to be used by TestSys and io.TestProcess.
 	This test is intented to be used by TestSys and io.TestProcess.
 */
 */
-class TestArguments {
+class TestArguments extends utest.Test {
 	// We may compare and update the test cases of other popular langs/libs: https://gist.github.com/andyli/d55ae9ea1327bbbf749d
 	// We may compare and update the test cases of other popular langs/libs: https://gist.github.com/andyli/d55ae9ea1327bbbf749d
 	static public var expectedArgs(default, never):Array<String> = [
 	static public var expectedArgs(default, never):Array<String> = [
 		"foo",
 		"foo",
@@ -101,8 +101,6 @@ class TestArguments {
 		null;
 		null;
 	#end
 	#end
 
 
-	function new() { }
-
 	function testArgs() {
 	function testArgs() {
 		var args = Sys.args();
 		var args = Sys.args();
 		for (i in 0...expectedArgs.length) {
 		for (i in 0...expectedArgs.length) {
@@ -113,7 +111,9 @@ class TestArguments {
 
 
 	static function main():Void {
 	static function main():Void {
 		var runner = new Runner();
 		var runner = new Runner();
-		Report.create(runner);
+		var report = Report.create(runner);
+		report.displayHeader = AlwaysShowHeader;
+		report.displaySuccessResults = NeverShowSuccessResults;
 		runner.addCase(new TestArguments());
 		runner.addCase(new TestArguments());
 		runner.run();
 		runner.run();
 	}
 	}

+ 1 - 3
tests/sys/src/TestCommandBase.hx

@@ -2,11 +2,9 @@ import sys.*;
 import haxe.io.*;
 import haxe.io.*;
 import utest.Assert;
 import utest.Assert;
 
 
-class TestCommandBase {
+class TestCommandBase extends utest.Test {
 	var runInfo:{out:String, err:String} = null;
 	var runInfo:{out:String, err:String} = null;
 
 
-	public function new() { }
-
 	function run(cmd:String, ?args:Array<String>):Int {
 	function run(cmd:String, ?args:Array<String>):Int {
 		throw "should be overridden";
 		throw "should be overridden";
 	}
 	}

+ 2 - 4
tests/sys/src/TestFileSystem.hx

@@ -1,7 +1,7 @@
 import sys.FileSystem;
 import sys.FileSystem;
 import utest.Assert;
 import utest.Assert;
 
 
-class TestFileSystem {
+class TestFileSystem extends utest.Test {
 	/**
 	/**
 		Recursively remove a given directory.
 		Recursively remove a given directory.
 	*/
 	*/
@@ -25,14 +25,12 @@ class TestFileSystem {
 		case _: ["", "/"];
 		case _: ["", "/"];
 	}
 	}
 
 
-	public function new() { }
-
 	public function setup() {
 	public function setup() {
 		removeDir(dir);
 		removeDir(dir);
 		FileSystem.createDirectory(dir);
 		FileSystem.createDirectory(dir);
 	}
 	}
 
 
-	public function tearDown() {
+	public function teardown() {
 		removeDir(dir);
 		removeDir(dir);
 	}
 	}
 
 

+ 1 - 2
tests/sys/src/io/TestFile.hx

@@ -4,8 +4,7 @@ import utest.Assert;
 import sys.io.File;
 import sys.io.File;
 import sys.FileSystem;
 import sys.FileSystem;
 
 
-class TestFile {
-	public function new() { }
+class TestFile extends utest.Test {
 
 
 	public function testCopyOverwrite() {
 	public function testCopyOverwrite() {
 		var fileA = "temp/a.txt";
 		var fileA = "temp/a.txt";

+ 2 - 4
tests/sys/src/io/TestFileInput.hx

@@ -12,19 +12,17 @@ import sys.io.FileSeek;
  *
  *
  * @author        Maximilian Ruta <[email protected]>
  * @author        Maximilian Ruta <[email protected]>
  */
  */
-class TestFileInput {
+class TestFileInput extends utest.Test {
 	static var contentString = "test\n1234сюрприз!"; //that's total of 24 bytes
 	static var contentString = "test\n1234сюрприз!"; //that's total of 24 bytes
 	static var contentBytes = [116, 101, 115, 116, 10, 49, 50, 51, 52, 209, 129, 209, 142, 209, 128, 208, 191, 209, 128, 208, 184, 208, 183, 33];
 	static var contentBytes = [116, 101, 115, 116, 10, 49, 50, 51, 52, 209, 129, 209, 142, 209, 128, 208, 191, 209, 128, 208, 184, 208, 183, 33];
 
 
 	private var path = 'temp/testcase-test-file.txt';
 	private var path = 'temp/testcase-test-file.txt';
 
 
-	public function new() { }
-
 	public function setup() {
 	public function setup() {
 		File.saveContent(path, contentString);
 		File.saveContent(path, contentString);
 	}
 	}
 
 
-	public function tearDown() {
+	public function teardown() {
 		FileSystem.deleteFile(path);
 		FileSystem.deleteFile(path);
 	}
 	}
 
 

+ 2 - 4
tests/sys/src/net/TestSocket.hx

@@ -3,7 +3,7 @@ package net;
 import sys.net.*;
 import sys.net.*;
 import utest.Assert;
 import utest.Assert;
 
 
-class TestSocket {
+class TestSocket extends utest.Test {
 	var registeredSockets:Array<Socket> = [];
 	var registeredSockets:Array<Socket> = [];
 
 
 	public function register<T:Socket>(socket:T):T {
 	public function register<T:Socket>(socket:T):T {
@@ -11,7 +11,7 @@ class TestSocket {
 		return socket;
 		return socket;
 	}
 	}
 
 
-	public function tearDown() {
+	public function teardown() {
 		for(socket in registeredSockets) {
 		for(socket in registeredSockets) {
 			if(socket == null) continue;
 			if(socket == null) continue;
 			socket.close();
 			socket.close();
@@ -19,8 +19,6 @@ class TestSocket {
 		registeredSockets = [];
 		registeredSockets = [];
 	}
 	}
 
 
-	public function new() { }
-
 	public function testBind() {
 	public function testBind() {
 		var socket = register(new Socket());
 		var socket = register(new Socket());
 		socket.bind(new Host('localhost'), 34567);
 		socket.bind(new Host('localhost'), 34567);