Skip to content

Commit 0e5a89f

Browse files
committed
update unit tests
1 parent db9bfd9 commit 0e5a89f

5 files changed

Lines changed: 26 additions & 31 deletions

File tree

test/TestArrayBufferTools.hx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import om.ArrayBufferTools;
22
import utest.Assert.*;
33
#if js
4-
#if (haxe_ver >= 4)
54
import js.lib.Uint8Array;
6-
#else
7-
import js.html.Uint8Array;
8-
#end
95
#end
6+
107
class TestArrayBufferTools extends utest.Test {
118
#if js
129
function test_ab2str() {

test/TestArrayTools.hx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import utest.Assert;
21
import utest.Assert.*;
32
import om.ArrayTools;
43

test/TestSemVer.hx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ class TestSemVer extends utest.Test {
4040
equals("100.200.300-rc.400", make(100, 200, 300, RC, 400));
4141
}
4242

43-
function test_ofString() {
43+
function test_fromString() {
4444
// Normal
45-
equals("0.1.2", (SemVer.ofString("0.1.2").data : SemVer));
46-
equals("100.50.200", (SemVer.ofString("100.50.200").data : SemVer));
45+
equals("0.1.2", (SemVer.fromString("0.1.2").data : SemVer));
46+
equals("100.50.200", (SemVer.fromString("100.50.200").data : SemVer));
4747

4848
// Release tags
49-
equals("0.1.2-alpha", (SemVer.ofString("0.1.2-ALPHA").data : SemVer));
50-
equals("0.1.2-alpha", (SemVer.ofString("0.1.2-alpha").data : SemVer));
51-
equals("0.1.2-beta", (SemVer.ofString("0.1.2-beta").data : SemVer));
52-
equals("0.1.2-rc", (SemVer.ofString("0.1.2-rc").data : SemVer));
53-
equals("0.1.2-rc.1", (SemVer.ofString("0.1.2-rc.1").data : SemVer));
49+
equals("0.1.2-alpha", (SemVer.fromString("0.1.2-ALPHA").data : SemVer));
50+
equals("0.1.2-alpha", (SemVer.fromString("0.1.2-alpha").data : SemVer));
51+
equals("0.1.2-beta", (SemVer.fromString("0.1.2-beta").data : SemVer));
52+
equals("0.1.2-rc", (SemVer.fromString("0.1.2-rc").data : SemVer));
53+
equals("0.1.2-rc.1", (SemVer.fromString("0.1.2-rc.1").data : SemVer));
5454
}
5555

56-
function test_ofStringInvalid() {
56+
function test_fromStringInvalid() {
5757
equals("invalid", parseInvalid(null));
5858
equals("invalid", parseInvalid(""));
5959
equals("invalid", parseInvalid("1"));
@@ -70,7 +70,7 @@ class TestSemVer extends utest.Test {
7070
}
7171

7272
function parseInvalid(str:String) {
73-
return try (SemVer.ofString(str) : String) catch (e:String) {
73+
return try (SemVer.fromString(str) : String) catch (e:String) {
7474
"invalid";
7575
}
7676
}

test/TestUuid.hx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import om.UUID;
1+
import om.Uuid;
22
import utest.Assert.*;
33

44
class TestUuid extends utest.Test {
55
function test_create() {
6-
var uuid = UUID.create();
7-
isTrue(UUID.isValid(uuid));
6+
var uuid = Uuid.create();
7+
isTrue(Uuid.isValid(uuid));
88
}
99

1010
function test_rstring() {
11-
var s = UUID.rstring(128);
11+
var s = Uuid.rstring(128);
1212
equals(128, s.length);
13-
notEquals(UUID.rstring(128), UUID.rstring(128));
13+
notEquals(Uuid.rstring(128), Uuid.rstring(128));
1414
}
1515
}

test/Unit.hx

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,34 @@ import utest.ui.Report;
33

44
function main() {
55
var runner = new Runner();
6+
// runner.addCase( new TestRandom() );
7+
// runner.addCase( new TestResource() );
8+
// runner.addCase( new TestTuple() );
9+
// runner.addCase(new TestHxon());
10+
// runner.addCase(new TestReflectTools());
11+
// runner.addCase(new TestResult());
12+
// runner.addCase(new TestSystem());
613
runner.addCase(new TestAbstractEnumTools());
714
runner.addCase(new TestArrayBufferTools());
815
runner.addCase(new TestArrayTools());
916
runner.addCase(new TestChar());
1017
runner.addCase(new TestClock());
11-
runner.addCase(new TestEmitter());
1218
runner.addCase(new TestErrors());
13-
// runner.addCase( new TestFloatTools() );
19+
runner.addCase(new TestFloatTools());
1420
runner.addCase(new TestIntTools());
15-
// runner.addCase(new TestJson());
1621
runner.addCase(new TestMath());
1722
runner.addCase(new TestMaybe());
1823
runner.addCase(new TestNil());
1924
runner.addCase(new TestPair());
2025
runner.addCase(new TestPath());
21-
// runner.addCase( new TestPromise() );
22-
// runner.addCase( new TestRandom() );
2326
runner.addCase(new TestRef());
24-
// runner.addCase(new TestReflectTools());
2527
runner.addCase(new TestRegExp());
26-
// runner.addCase( new TestResource() );
27-
// runner.addCase( new TestResult() );
2828
runner.addCase(new TestSemVer());
2929
runner.addCase(new TestStringTools());
30-
// runner.addCase(new TestSystem());
3130
runner.addCase(new TestTime());
32-
// runner.addCase( new TestTuple() );
31+
runner.addCase(new TestTypeTools());
32+
runner.addCase(new TestUuid());
3333
runner.addCase(new TestWorker());
34-
// runner.addCase(new TestUuid());
3534
#if js
3635
// runner.addCase( new TestWorker() );
3736
#end

0 commit comments

Comments
 (0)