Skip to content

Commit 26e7a0b

Browse files
shohamazonshohamazon
authored
Improve readability of transaction test (valkey-io#973)
1 parent 69d0754 commit 26e7a0b

File tree

2 files changed

+121
-117
lines changed

2 files changed

+121
-117
lines changed

‎node/tests/TestUtilities.ts

Lines changed: 72 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -63,75 +63,79 @@ export function transactionTest(
6363
const key8 = "{key}" + uuidv4();
6464
const field = uuidv4();
6565
const value = uuidv4();
66-
baseTransaction
67-
.set(key1, "bar")
68-
.set(key2, "baz", {
69-
returnOldValue: true,
70-
})
71-
.customCommand(["MGET", key1, key2])
72-
.mset({ [key3]: value })
73-
.mget([key1, key2])
74-
.del([key1])
75-
.hset(key4, { [field]: value })
76-
.hget(key4, field)
77-
.hgetall(key4)
78-
.hdel(key4, [field])
79-
.hmget(key4, [field])
80-
.hexists(key4, field)
81-
.lpush(key5, [field + "1", field + "2", field + "3", field + "4"])
82-
.lpop(key5)
83-
.llen(key5)
84-
.lrem(key5, 1, field + "1")
85-
.ltrim(key5, 0, 1)
86-
.lrange(key5, 0, -1)
87-
.lpopCount(key5, 2)
88-
.rpush(key6, [field + "1", field + "2", field + "3"])
89-
.rpop(key6)
90-
.rpopCount(key6, 2)
91-
.sadd(key7, ["bar", "foo"])
92-
.srem(key7, ["foo"])
93-
.scard(key7)
94-
.smembers(key7)
95-
.zadd(key8, { member1: 1, member2: 2 })
96-
.zaddIncr(key8, "member2", 1)
97-
.zrem(key8, ["member1"])
98-
.zcard(key8)
99-
.zscore(key8, "member2")
100-
.zcount(key8, { bound: 2 }, "positiveInfinity");
101-
return [
102-
"OK",
103-
null,
104-
["bar", "baz"],
105-
"OK",
106-
["bar", "baz"],
107-
1,
108-
1,
109-
value,
110-
{ [field]: value },
111-
1,
112-
[null],
113-
false,
114-
4,
115-
field + "4",
116-
3,
117-
1,
118-
"OK",
119-
[field + "3", field + "2"],
120-
[field + "3", field + "2"],
121-
3,
66+
const args: ReturnType[] = [];
67+
baseTransaction.set(key1, "bar");
68+
args.push("OK");
69+
baseTransaction.set(key2, "baz", {
70+
returnOldValue: true,
71+
});
72+
args.push(null);
73+
baseTransaction.customCommand(["MGET", key1, key2]);
74+
args.push(["bar", "baz"]);
75+
baseTransaction.mset({ [key3]: value });
76+
args.push("OK");
77+
baseTransaction.mget([key1, key2]);
78+
args.push(["bar", "baz"]);
79+
baseTransaction.del([key1]);
80+
args.push(1);
81+
baseTransaction.hset(key4, { [field]: value });
82+
args.push(1);
83+
baseTransaction.hget(key4, field);
84+
args.push(value);
85+
baseTransaction.hgetall(key4);
86+
args.push({ [field]: value });
87+
baseTransaction.hdel(key4, [field]);
88+
args.push(1);
89+
baseTransaction.hmget(key4, [field]);
90+
args.push([null]);
91+
baseTransaction.hexists(key4, field);
92+
args.push(false);
93+
baseTransaction.lpush(key5, [
94+
field + "1",
95+
field + "2",
12296
field + "3",
123-
[field + "2", field + "1"],
124-
2,
125-
1,
126-
1,
127-
["bar"],
128-
2,
129-
3,
130-
1,
131-
1,
132-
3.0,
133-
1,
134-
];
97+
field + "4",
98+
]);
99+
args.push(4);
100+
baseTransaction.lpop(key5);
101+
args.push(field + "4");
102+
baseTransaction.llen(key5);
103+
args.push(3);
104+
baseTransaction.lrem(key5, 1, field + "1");
105+
args.push(1);
106+
baseTransaction.ltrim(key5, 0, 1);
107+
args.push("OK");
108+
baseTransaction.lrange(key5, 0, -1);
109+
args.push([field + "3", field + "2"]);
110+
baseTransaction.lpopCount(key5, 2);
111+
args.push([field + "3", field + "2"]);
112+
baseTransaction.rpush(key6, [field + "1", field + "2", field + "3"]);
113+
args.push(3);
114+
baseTransaction.rpop(key6);
115+
args.push(field + "3");
116+
baseTransaction.rpopCount(key6, 2);
117+
args.push([field + "2", field + "1"]);
118+
baseTransaction.sadd(key7, ["bar", "foo"]);
119+
args.push(2);
120+
baseTransaction.srem(key7, ["foo"]);
121+
args.push(1);
122+
baseTransaction.scard(key7);
123+
args.push(1);
124+
baseTransaction.smembers(key7);
125+
args.push(["bar"]);
126+
baseTransaction.zadd(key8, { member1: 1, member2: 2 });
127+
args.push(2);
128+
baseTransaction.zaddIncr(key8, "member2", 1);
129+
args.push(3);
130+
baseTransaction.zrem(key8, ["member1"]);
131+
args.push(1);
132+
baseTransaction.zcard(key8);
133+
args.push(1);
134+
baseTransaction.zscore(key8, "member2");
135+
args.push(3.0);
136+
baseTransaction.zcount(key8, { bound: 2 }, "positiveInfinity");
137+
args.push(1);
138+
return args;
135139
}
136140

137141
export class RedisCluster {

‎python/python/tests/test_transaction.py

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -32,120 +32,120 @@ def transaction_test(
3232

3333
value = datetime.now(timezone.utc).strftime("%m/%d/%Y, %H:%M:%S")
3434
value2 = get_random_string(5)
35+
args: List[TResult] = []
3536

3637
transaction.set(key, value)
38+
args.append(OK)
3739
transaction.get(key)
40+
args.append(value)
3841
transaction.type(key)
42+
args.append("string")
3943

4044
transaction.exists([key])
45+
args.append(1)
4146

4247
transaction.delete([key])
48+
args.append(1)
4349
transaction.get(key)
50+
args.append(None)
4451

4552
transaction.mset({key: value, key2: value2})
53+
args.append(OK)
4654
transaction.mget([key, key2])
55+
args.append([value, value2])
4756

4857
transaction.incr(key3)
58+
args.append(1)
4959
transaction.incrby(key3, 2)
60+
args.append(3)
5061

5162
transaction.decr(key3)
63+
args.append(2)
5264
transaction.decrby(key3, 2)
65+
args.append(0)
5366

5467
transaction.incrbyfloat(key3, 0.5)
68+
args.append(0.5)
5569

5670
transaction.unlink([key3])
71+
args.append(1)
5772

5873
transaction.ping()
74+
args.append("PONG")
5975

6076
transaction.config_set({"timeout": "1000"})
77+
args.append(OK)
6178
transaction.config_get(["timeout"])
79+
args.append({"timeout": "1000"})
6280

6381
transaction.hset(key4, {key: value, key2: value2})
82+
args.append(2)
6483
transaction.hget(key4, key2)
84+
args.append(value2)
6585
transaction.hlen(key4)
86+
args.append(2)
6687

6788
transaction.hincrby(key4, key3, 5)
89+
args.append(5)
6890
transaction.hincrbyfloat(key4, key3, 5.5)
91+
args.append(10.5)
6992

7093
transaction.hexists(key4, key)
94+
args.append(True)
7195
transaction.hmget(key4, [key, "nonExistingField", key2])
96+
args.append([value, None, value2])
7297
transaction.hgetall(key4)
98+
args.append({key: value, key2: value2, key3: "10.5"})
7399
transaction.hdel(key4, [key, key2])
100+
args.append(2)
74101

75102
transaction.client_getname()
103+
args.append(None)
76104

77105
transaction.lpush(key5, [value, value, value2, value2])
106+
args.append(4)
78107
transaction.llen(key5)
108+
args.append(4)
79109
transaction.lpop(key5)
110+
args.append(value2)
80111
transaction.lrem(key5, 1, value)
112+
args.append(1)
81113
transaction.ltrim(key5, 0, 1)
114+
args.append(OK)
82115
transaction.lrange(key5, 0, -1)
116+
args.append([value2, value])
83117
transaction.lpop_count(key5, 2)
118+
args.append([value2, value])
84119

85120
transaction.rpush(key6, [value, value2, value2])
121+
args.append(3)
86122
transaction.rpop(key6)
123+
args.append(value2)
87124
transaction.rpop_count(key6, 2)
125+
args.append([value2, value])
88126

89127
transaction.sadd(key7, ["foo", "bar"])
128+
args.append(2)
90129
transaction.srem(key7, ["foo"])
130+
args.append(1)
91131
transaction.smembers(key7)
132+
args.append({"bar"})
92133
transaction.scard(key7)
134+
args.append(1)
93135

94136
transaction.zadd(key8, {"one": 1, "two": 2, "three": 3})
137+
args.append(3)
95138
transaction.zadd_incr(key8, "one", 3)
139+
args.append(4)
96140
transaction.zrem(key8, ["one"])
141+
args.append(1)
97142
transaction.zcard(key8)
143+
args.append(2)
98144
transaction.zcount(key8, ScoreLimit(2, True), InfBound.POS_INF)
145+
args.append(2)
99146
transaction.zscore(key8, "two")
100-
return [
101-
OK,
102-
value,
103-
"string",
104-
1,
105-
1,
106-
None,
107-
OK,
108-
[value, value2],
109-
1,
110-
3,
111-
2,
112-
0,
113-
0.5,
114-
1,
115-
"PONG",
116-
OK,
117-
{"timeout": "1000"},
118-
2,
119-
value2,
120-
2,
121-
5,
122-
10.5,
123-
True,
124-
[value, None, value2],
125-
{key: value, key2: value2, key3: "10.5"},
126-
2,
127-
None,
128-
4,
129-
4,
130-
value2,
131-
1,
132-
OK,
133-
[value2, value],
134-
[value2, value],
135-
3,
136-
value2,
137-
[value2, value],
138-
2,
139-
1,
140-
{"bar"},
141-
1,
142-
3,
143-
4,
144-
1,
145-
2,
146-
2,
147-
2.0,
148-
]
147+
args.append(2.0)
148+
return args
149149

150150

151151
@pytest.mark.asyncio

0 commit comments

Comments
 (0)