Skip to content

Commit 1422865

Browse files
dpgeorgedpgeorge
committed
Merge pull request adafruit#445 from lurch/test-sorted-sets
Modify set tests to print sorted sets directly
2 parents a28507a + 1ff6011 commit 1422865

7 files changed

Lines changed: 28 additions & 53 deletions

File tree

‎tests/basics/set_add.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
s = {1, 2, 3, 4}
22
print(s.add(5))
3-
l = list(s)
4-
l.sort()
5-
print(l)
3+
print(sorted(s))

‎tests/basics/set_binop.py‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
1-
def r(s):
2-
l = list(s)
3-
l.sort()
4-
return l
51
sets = [set(), {1}, {1, 2}, {1, 2, 3}, {2, 3}, {2, 3, 5}, {5}, {7}]
62
for s in sets:
73
for t in sets:
8-
print(r(s), '|', r(t), '=', r(s | t))
9-
print(r(s), '^', r(t), '=', r(s ^ t))
10-
print(r(s), '&', r(t), '=', r(s & t))
11-
print(r(s), '-', r(t), '=', r(s - t))
4+
print(sorted(s), '|', sorted(t), '=', sorted(s | t))
5+
print(sorted(s), '^', sorted(t), '=', sorted(s ^ t))
6+
print(sorted(s), '&', sorted(t), '=', sorted(s & t))
7+
print(sorted(s), '-', sorted(t), '=', sorted(s - t))
128
u = s.copy()
139
u |= t
14-
print(r(s), "|=", r(t), '-->', r(u))
10+
print(sorted(s), "|=", sorted(t), '-->', sorted(u))
1511
u = s.copy()
1612
u ^= t
17-
print(r(s), "^=", r(t), '-->', r(u))
13+
print(sorted(s), "^=", sorted(t), '-->', sorted(u))
1814
u = s.copy()
1915
u &= t
20-
print(r(s), "&=", r(t), "-->", r(u))
16+
print(sorted(s), "&=", sorted(t), "-->", sorted(u))
2117
u = s.copy()
2218
u -= t
23-
print(r(s), "-=", r(t), "-->", r(u))
19+
print(sorted(s), "-=", sorted(t), "-->", sorted(u))
2420

25-
print(r(s), '==', r(t), '=', s == t)
26-
print(r(s), '!=', r(t), '=', s != t)
27-
print(r(s), '>', r(t), '=', s > t)
28-
print(r(s), '>=', r(t), '=', s >= t)
29-
print(r(s), '<', r(t), '=', s < t)
30-
print(r(s), '<=', r(t), '=', s <= t)
21+
print(sorted(s), '==', sorted(t), '=', s == t)
22+
print(sorted(s), '!=', sorted(t), '=', s != t)
23+
print(sorted(s), '>', sorted(t), '=', s > t)
24+
print(sorted(s), '>=', sorted(t), '=', s >= t)
25+
print(sorted(s), '<', sorted(t), '=', s < t)
26+
print(sorted(s), '<=', sorted(t), '=', s <= t)

‎tests/basics/set_copy.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33
s.add(5)
44
t.add(7)
55
for i in s, t:
6-
l = list(i)
7-
l.sort()
8-
print(l)
6+
print(sorted(i))

‎tests/basics/set_difference.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
def report(s):
2-
l = list(s)
3-
l.sort()
4-
print(l)
5-
61
l = [1, 2, 3, 4]
72
s = set(l)
83
outs = [s.difference(),
94
s.difference({1}),
105
s.difference({1}, [1, 2]),
116
s.difference({1}, {1, 2}, {2, 3})]
127
for out in outs:
13-
report(out)
8+
print(sorted(out))
149

1510
s = set(l)
1611
print(s.difference_update())
17-
report(s)
12+
print(sorted(s))
1813
print(s.difference_update({1}))
19-
report(s)
14+
print(sorted(s))
2015
print(s.difference_update({1}, [2]))
21-
report(s)
16+
print(sorted(s))

‎tests/basics/set_intersection.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
def report(s):
2-
l = list(s)
3-
l.sort()
4-
print(l)
5-
61
s = {1, 2, 3, 4}
7-
report(s)
8-
report(s.intersection({1, 3}))
9-
report(s.intersection([3, 4]))
2+
print(sorted(s))
3+
print(sorted(s.intersection({1, 3})))
4+
print(sorted(s.intersection([3, 4])))
105

116
print(s.intersection_update([1]))
12-
report(s)
7+
print(sorted(s))

‎tests/basics/set_symmetric_difference.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
print(sorted({1,2}.symmetric_difference([2,3])))
33
s = {1,2}
44
print(s.symmetric_difference_update({2,3}))
5-
l = list(s)
6-
l.sort()
7-
print(l)
5+
print(sorted(s))

‎tests/basics/set_update.py‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
def report(s):
2-
l = list(s)
3-
l.sort()
4-
print(l)
5-
61
s = {1}
72
s.update()
8-
report(s)
3+
print(s)
94
s.update([2])
10-
report(s)
5+
print(sorted(s))
116
s.update([1,3], [2,2,4])
12-
report(s)
7+
print(sorted(s))

0 commit comments

Comments
 (0)