jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use doAssert in tests (#16486)

Browse source
This commit is contained in:
flywind 2020-12-28 07:13:21 -06:00 • committed by GitHub
commit 6d442a40a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 1056 additions and 1056 deletions
Download patch file Download diff file Expand all files Collapse all files

94
tests/collections/ttables.nim
View file

@ -50,20 +50,20 @@ block thashes:
var t = initTable[int,int]()
t[0] = 42
t[1] = t[0] + 1
assert(t[0] == 42)
assert(t[1] == 43)
doAssert(t[0] == 42)
doAssert(t[1] == 43)
let t2 = {1: 1, 2: 2}.toTable
assert(t2[2] == 2)
doAssert(t2[2] == 2)
# Test with char
block:
var t = initTable[char,int]()
t['0'] = 42
t['1'] = t['0'] + 1
assert(t['0'] == 42)
assert(t['1'] == 43)
doAssert(t['0'] == 42)
doAssert(t['1'] == 43)
let t2 = {'1': 1, '2': 2}.toTable
assert(t2['2'] == 2)
doAssert(t2['2'] == 2)
# Test with enum
block:
@ -72,10 +72,10 @@ block thashes:
var t = initTable[E,int]()
t[eA] = 42
t[eB] = t[eA] + 1
assert(t[eA] == 42)
assert(t[eB] == 43)
doAssert(t[eA] == 42)
doAssert(t[eB] == 43)
let t2 = {eA: 1, eB: 2}.toTable
assert(t2[eB] == 2)
doAssert(t2[eB] == 2)
# Test with range
block:
@ -84,10 +84,10 @@ block thashes:
var t = initTable[R,int]() # causes warning, why?
t[1] = 42 # causes warning, why?
t[2] = t[1] + 1
assert(t[1] == 42)
assert(t[2] == 43)
doAssert(t[1] == 42)
doAssert(t[2] == 43)
let t2 = {1.R: 1, 2.R: 2}.toTable
assert(t2[2.R] == 2)
doAssert(t2[2.R] == 2)
# Test which combines the generics for tuples + ordinals
block:
@ -96,10 +96,10 @@ block thashes:
var t = initTable[(string, E, int, char), int]()
t[("a", eA, 0, '0')] = 42
t[("b", eB, 1, '1')] = t[("a", eA, 0, '0')] + 1
assert(t[("a", eA, 0, '0')] == 42)
assert(t[("b", eB, 1, '1')] == 43)
doAssert(t[("a", eA, 0, '0')] == 42)
doAssert(t[("b", eB, 1, '1')] == 43)
let t2 = {("a", eA, 0, '0'): 1, ("b", eB, 1, '1'): 2}.toTable
assert(t2[("b", eB, 1, '1')] == 2)
doAssert(t2[("b", eB, 1, '1')] == 2)
# Test to check if overloading is possible
# Unfortunately, this does not seem to work for int
@ -165,9 +165,9 @@ block tableconstr:
ignoreExpr({2: 3, "key": "value"})
# NEW:
assert 56 in 50..100
doAssert 56 in 50..100
assert 56 in ..60
doAssert 56 in ..60
block ttables2:
@ -239,8 +239,8 @@ block tablesref:
t[(1,1)] = "11"
for x in 0..1:
for y in 0..1:
assert t[(x,y)] == $x & $y
assert t.sortedPairs ==
doAssert t[(x,y)] == $x & $y
doAssert t.sortedPairs ==
@[((x: 0, y: 0), "00"), ((x: 0, y: 1), "01"), ((x: 1, y: 0), "10"), ((x: 1, y: 1), "11")]
block tableTest2:
@ -253,31 +253,31 @@ block tablesref:
t["012"] = 67.9
t["123"] = 1.5 # test overwriting
assert t["123"] == 1.5
doAssert t["123"] == 1.5
try:
echo t["111"] # deleted
except KeyError:
discard
assert(not hasKey(t, "111"))
assert "111" notin t
doAssert(not hasKey(t, "111"))
doAssert "111" notin t
for key, val in items(data): t[key] = val.toFloat
for key, val in items(data): assert t[key] == val.toFloat
for key, val in items(data): doAssert t[key] == val.toFloat
block orderedTableTest1:
var t = newOrderedTable[string, int](2)
for key, val in items(data): t[key] = val
for key, val in items(data): assert t[key] == val
for key, val in items(data): doAssert t[key] == val
var i = 0
# `pairs` needs to yield in insertion order:
for key, val in pairs(t):
assert key == data[i][0]
assert val == data[i][1]
doAssert key == data[i][0]
doAssert val == data[i][1]
inc(i)
for key, val in mpairs(t): val = 99
for val in mvalues(t): assert val == 99
for val in mvalues(t): doAssert val == 99
block countTableTest1:
var s = data.toTable
@ -286,11 +286,11 @@ block tablesref:
for x in [t, r]:
for k in s.keys:
x.inc(k)
assert x[k] == 1
doAssert x[k] == 1
x.inc("90", 3)
x.inc("12", 2)
x.inc("34", 1)
assert t.largest()[0] == "90"
doAssert t.largest()[0] == "90"
t.sort()
r.sort(SortOrder.Ascending)
@ -301,9 +301,9 @@ block tablesref:
var i = 0
for (k, v) in ps:
case i
of 0: assert k == "90" and v == 4
of 1: assert k == "12" and v == 3
of 2: assert k == "34" and v == 2
of 0: doAssert k == "90" and v == 4
of 1: doAssert k == "12" and v == 3
of 2: doAssert k == "34" and v == 2
else: break
inc i
@ -327,17 +327,17 @@ block tablesref:
block nilTest:
var i, j: TableRef[int, int] = nil
assert i == j
doAssert i == j
j = newTable[int, int]()
assert i != j
assert j != i
doAssert i != j
doAssert j != i
i = newTable[int, int]()
assert i == j
doAssert i == j
proc orderedTableSortTest() =
var t = newOrderedTable[string, int](2)
for key, val in items(data): t[key] = val
for key, val in items(data): assert t[key] == val
for key, val in items(data): doAssert t[key] == val
proc cmper(x, y: tuple[key: string, val: int]): int = cmp(x.key, y.key)
t.sort(cmper)
var i = 0
@ -369,25 +369,25 @@ block tablesref:
t["test"] = 1.2345
t["111"] = 1.000043
t["123"] = 1.23
assert t.len() != 0
doAssert t.len() != 0
t.clear()
assert t.len() == 0
doAssert t.len() == 0
block clearOrderedTableTest:
var t = newOrderedTable[string, int](2)
for key, val in items(data): t[key] = val
assert t.len() != 0
doAssert t.len() != 0
t.clear()
assert t.len() == 0
doAssert t.len() == 0
block clearCountTableTest:
var t = newCountTable[string]()
t.inc("90", 3)
t.inc("12", 2)
t.inc("34", 1)
assert t.len() != 0
doAssert t.len() != 0
t.clear()
assert t.len() == 0
doAssert t.len() == 0
orderedTableSortTest()
echo "3"
@ -415,7 +415,7 @@ block: # https://github.com/nim-lang/Nim/issues/13496
doAssert sortedPairs(t) == @[(15, 1), (17, 3), (19, 2)]
var s = newSeq[int]()
for v in t.values: s.add(v)
assert s.len == 3
doAssert s.len == 3
doAssert sortedItems(s) == @[1, 2, 3]
when t is OrderedTable|OrderedTableRef:
doAssert toSeq(t.keys) == @[15, 19, 17]
@ -433,14 +433,14 @@ block: # https://github.com/nim-lang/Nim/issues/13496
block testNonPowerOf2:
var a = initTable[int, int](7)
a[1] = 10
assert a[1] == 10
doAssert a[1] == 10
var b = initTable[int, int](9)
b[1] = 10
assert b[1] == 10
doAssert b[1] == 10
block emptyOrdered:
var t1: OrderedTable[int, string]
var t2: OrderedTable[int, string]
assert t1 == t2
doAssert t1 == t2