Skip to content

Commit be16621

Browse files
BirjuVachhaniBirjuVachhani
committed
🎨 refactor getAll and removeAll methods to use Set instead of List for key handling
1 parent 24b576a commit be16621

File tree

5 files changed

+35
-39
lines changed

5 files changed

+35
-39
lines changed

‎packages/hyper_secure_storage/test/secure_storage_backend_test.dart‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter_test/flutter_test.dart';
22
import 'package:hyper_secure_storage/hyper_secure_storage_backend.dart';
3-
import 'package:hyper_storage/hyper_storage.dart';
43

54
import 'mock_secure_storage.dart';
65

@@ -191,7 +190,7 @@ void main() {
191190
await backend.setInt('key2', 42);
192191
await backend.setBool('key3', true);
193192

194-
final data = await backend.getAll();
193+
final data = await backend.getAll(await backend.getKeys());
195194
expect(data, {
196195
'key1': 'value1',
197196
'key2': 42,
@@ -200,7 +199,7 @@ void main() {
200199
});
201200

202201
test('getAll returns empty map for empty storage', () async {
203-
final data = await backend.getAll();
202+
final data = await backend.getAll(await backend.getKeys());
204203
expect(data, isEmpty);
205204
});
206205

@@ -210,7 +209,7 @@ void main() {
210209
await backend.setBool('key3', true);
211210
await backend.setDouble('key4', 3.14);
212211

213-
final data = await backend.getAll(['key1', 'key3']);
212+
final data = await backend.getAll({'key1', 'key3'});
214213
expect(data, {
215214
'key1': 'value1',
216215
'key3': true,
@@ -223,7 +222,7 @@ void main() {
223222
await backend.setString('key1', 'value1');
224223
await backend.setInt('key2', 42);
225224

226-
final data = await backend.getAll([]);
225+
final data = await backend.getAll({});
227226
expect(data, {
228227
'key1': 'value1',
229228
'key2': 42,
@@ -233,15 +232,15 @@ void main() {
233232
test('getAll with non-existent keys in allowList', () async {
234233
await backend.setString('key1', 'value1');
235234

236-
final data = await backend.getAll(['key1', 'nonExistent']);
235+
final data = await backend.getAll({'key1', 'nonExistent'});
237236
expect(data, {'key1': 'value1'});
238237
});
239238

240239
test('getAll parses JSON values correctly', () async {
241240
await backend.setJson('json', {'name': 'test', 'value': 42});
242241
await backend.setStringList('list', ['a', 'b', 'c']);
243242

244-
final data = await backend.getAll();
243+
final data = await backend.getAll(await backend.getKeys());
245244
expect(data['json'], {'name': 'test', 'value': 42});
246245
expect(data['list'], ['a', 'b', 'c']);
247246
});
@@ -275,7 +274,7 @@ void main() {
275274
await backend.setString('key2', 'value2');
276275
await backend.setString('key3', 'value3');
277276

278-
await backend.removeAll(['key1', 'key3']);
277+
await backend.removeAll({'key1', 'key3'});
279278

280279
expect(await backend.containsKey('key1'), false);
281280
expect(await backend.containsKey('key2'), true);
@@ -284,14 +283,14 @@ void main() {
284283

285284
test('removeAll handles empty list', () async {
286285
await backend.setString('key', 'value');
287-
await backend.removeAll([]);
286+
await backend.removeAll({});
288287
expect(await backend.getString('key'), 'value');
289288
});
290289

291290
test('removeAll handles non-existent keys', () async {
292291
await backend.setString('key1', 'value1');
293292
await expectLater(
294-
backend.removeAll(['key1', 'nonExistent']),
293+
backend.removeAll({'key1', 'nonExistent'}),
295294
completes,
296295
);
297296
expect(await backend.containsKey('key1'), false);
@@ -416,7 +415,7 @@ void main() {
416415

417416
test('handles JSON arrays in getAll', () async {
418417
await backend.setString('array', '[1,2,3]');
419-
final data = await backend.getAll();
418+
final data = await backend.getAll(await backend.getKeys());
420419
expect(data['array'], [1, 2, 3]);
421420
});
422421

‎packages/hyper_storage/test/item_holder_test.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -715,10 +715,8 @@ class CustomUserHolder extends ItemHolder<User> {
715715

716716
// Another custom ItemHolder for testing type mismatch
717717
class AnotherCustomHolder extends ItemHolder<String> {
718-
AnotherCustomHolder(HyperStorageContainer parent, StorageBackend backend, String encodedKey)
718+
AnotherCustomHolder(HyperStorageContainer super.parent, StorageBackend backend, super.key)
719719
: super(
720-
parent,
721-
encodedKey,
722720
getter: (backend, key) => backend.getString(key),
723721
setter: (backend, key, value) => backend.setString(key, value),
724722
);

‎packages/hyper_storage_hive/test/hive_backend_test.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ void main() {
227227
await backend.setInt('key2', 42);
228228
await backend.setBool('key3', true);
229229

230-
final data = await backend.getAll();
230+
final data = await backend.getAll(await backend.getKeys());
231231
expect(data, {
232232
'key1': 'value1',
233233
'key2': 42,
@@ -236,7 +236,7 @@ void main() {
236236
});
237237

238238
test('getAll returns empty map for empty storage', () async {
239-
final data = await backend.getAll();
239+
final data = await backend.getAll(await backend.getKeys());
240240
expect(data, isEmpty);
241241
});
242242

@@ -246,7 +246,7 @@ void main() {
246246
await backend.setBool('key3', true);
247247
await backend.setDouble('key4', 3.14);
248248

249-
final data = await backend.getAll(['key1', 'key3']);
249+
final data = await backend.getAll({'key1', 'key3'});
250250
expect(data, {
251251
'key1': 'value1',
252252
'key3': true,
@@ -259,7 +259,7 @@ void main() {
259259
await backend.setString('key1', 'value1');
260260
await backend.setInt('key2', 42);
261261

262-
final data = await backend.getAll([]);
262+
final data = await backend.getAll({});
263263
expect(data, {
264264
'key1': 'value1',
265265
'key2': 42,
@@ -269,7 +269,7 @@ void main() {
269269
test('getAll with non-existent keys in allowList', () async {
270270
await backend.setString('key1', 'value1');
271271

272-
final data = await backend.getAll(['key1', 'nonExistent']);
272+
final data = await backend.getAll({'key1', 'nonExistent'});
273273
expect(data, {'key1': 'value1'});
274274
});
275275
});
@@ -302,7 +302,7 @@ void main() {
302302
await backend.setString('key2', 'value2');
303303
await backend.setString('key3', 'value3');
304304

305-
await backend.removeAll(['key1', 'key3']);
305+
await backend.removeAll({'key1', 'key3'});
306306

307307
expect(await backend.containsKey('key1'), false);
308308
expect(await backend.containsKey('key2'), true);
@@ -311,14 +311,14 @@ void main() {
311311

312312
test('removeAll handles empty list', () async {
313313
await backend.setString('key', 'value');
314-
await backend.removeAll([]);
314+
await backend.removeAll({});
315315
expect(await backend.getString('key'), 'value');
316316
});
317317

318318
test('removeAll handles non-existent keys', () async {
319319
await backend.setString('key1', 'value1');
320320
await expectLater(
321-
backend.removeAll(['key1', 'nonExistent']),
321+
backend.removeAll({'key1', 'nonExistent'}),
322322
completes,
323323
);
324324
expect(await backend.containsKey('key1'), false);

‎packages/hyper_storage_hive/test/lazy_hive_backend_test.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ void main() {
227227
await backend.setInt('key2', 42);
228228
await backend.setBool('key3', true);
229229

230-
final data = await backend.getAll();
230+
final data = await backend.getAll(await backend.getKeys());
231231
expect(data, {
232232
'key1': 'value1',
233233
'key2': 42,
@@ -236,7 +236,7 @@ void main() {
236236
});
237237

238238
test('getAll returns empty map for empty storage', () async {
239-
final data = await backend.getAll();
239+
final data = await backend.getAll(await backend.getKeys());
240240
expect(data, isEmpty);
241241
});
242242

@@ -246,7 +246,7 @@ void main() {
246246
await backend.setBool('key3', true);
247247
await backend.setDouble('key4', 3.14);
248248

249-
final data = await backend.getAll(['key1', 'key3']);
249+
final data = await backend.getAll({'key1', 'key3'});
250250
expect(data, {
251251
'key1': 'value1',
252252
'key3': true,
@@ -259,7 +259,7 @@ void main() {
259259
await backend.setString('key1', 'value1');
260260
await backend.setInt('key2', 42);
261261

262-
final data = await backend.getAll([]);
262+
final data = await backend.getAll({});
263263
expect(data, {
264264
'key1': 'value1',
265265
'key2': 42,
@@ -269,7 +269,7 @@ void main() {
269269
test('getAll with non-existent keys in allowList', () async {
270270
await backend.setString('key1', 'value1');
271271

272-
final data = await backend.getAll(['key1', 'nonExistent']);
272+
final data = await backend.getAll({'key1', 'nonExistent'});
273273
expect(data, {'key1': 'value1'});
274274
});
275275
});
@@ -302,7 +302,7 @@ void main() {
302302
await backend.setString('key2', 'value2');
303303
await backend.setString('key3', 'value3');
304304

305-
await backend.removeAll(['key1', 'key3']);
305+
await backend.removeAll({'key1', 'key3'});
306306

307307
expect(await backend.containsKey('key1'), false);
308308
expect(await backend.containsKey('key2'), true);
@@ -311,14 +311,14 @@ void main() {
311311

312312
test('removeAll handles empty list', () async {
313313
await backend.setString('key', 'value');
314-
await backend.removeAll([]);
314+
await backend.removeAll({});
315315
expect(await backend.getString('key'), 'value');
316316
});
317317

318318
test('removeAll handles non-existent keys', () async {
319319
await backend.setString('key1', 'value1');
320320
await expectLater(
321-
backend.removeAll(['key1', 'nonExistent']),
321+
backend.removeAll({'key1', 'nonExistent'}),
322322
completes,
323323
);
324324
expect(await backend.containsKey('key1'), false);

‎packages/hyper_storage_shared_preferences/test/shared_preferences_backend_test.dart‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter_test/flutter_test.dart';
2-
import 'package:hyper_storage/hyper_storage.dart';
32
import 'package:hyper_storage_shared_preferences/shared_preferences_backend.dart';
43

54
import 'mock_shared_preferences.dart';
@@ -189,7 +188,7 @@ void main() {
189188
await backend.setInt('key2', 42);
190189
await backend.setBool('key3', true);
191190

192-
final data = await backend.getAll();
191+
final data = await backend.getAll(await backend.getKeys());
193192
expect(data, {
194193
'key1': 'value1',
195194
'key2': 42,
@@ -198,7 +197,7 @@ void main() {
198197
});
199198

200199
test('getAll returns empty map for empty storage', () async {
201-
final data = await backend.getAll();
200+
final data = await backend.getAll(await backend.getKeys());
202201
expect(data, isEmpty);
203202
});
204203

@@ -208,7 +207,7 @@ void main() {
208207
await backend.setBool('key3', true);
209208
await backend.setDouble('key4', 3.14);
210209

211-
final data = await backend.getAll(['key1', 'key3']);
210+
final data = await backend.getAll({'key1', 'key3'});
212211
expect(data, {
213212
'key1': 'value1',
214213
'key3': true,
@@ -221,7 +220,7 @@ void main() {
221220
await backend.setString('key1', 'value1');
222221
await backend.setInt('key2', 42);
223222

224-
final data = await backend.getAll([]);
223+
final data = await backend.getAll({});
225224
expect(data, {
226225
'key1': 'value1',
227226
'key2': 42,
@@ -231,7 +230,7 @@ void main() {
231230
test('getAll with non-existent keys in allowList', () async {
232231
await backend.setString('key1', 'value1');
233232

234-
final data = await backend.getAll(['key1', 'nonExistent']);
233+
final data = await backend.getAll({'key1', 'nonExistent'});
235234
expect(data, {'key1': 'value1'});
236235
});
237236
});
@@ -264,7 +263,7 @@ void main() {
264263
await backend.setString('key2', 'value2');
265264
await backend.setString('key3', 'value3');
266265

267-
await backend.removeAll(['key1', 'key3']);
266+
await backend.removeAll({'key1', 'key3'});
268267

269268
expect(await backend.containsKey('key1'), false);
270269
expect(await backend.containsKey('key2'), true);
@@ -273,14 +272,14 @@ void main() {
273272

274273
test('removeAll handles empty list', () async {
275274
await backend.setString('key', 'value');
276-
await backend.removeAll([]);
275+
await backend.removeAll({});
277276
expect(await backend.getString('key'), 'value');
278277
});
279278

280279
test('removeAll handles non-existent keys', () async {
281280
await backend.setString('key1', 'value1');
282281
await expectLater(
283-
backend.removeAll(['key1', 'nonExistent']),
282+
backend.removeAll({'key1', 'nonExistent'}),
284283
completes,
285284
);
286285
expect(await backend.containsKey('key1'), false);

0 commit comments

Comments
 (0)