@@ -40,8 +40,8 @@ SIGNIN (
4040 });
4141
4242 testWidgets ('Verify the current namespace' , (WidgetTester tester) async {
43- final results = ( await db.query ('INFO FOR NS' )) ! as List ;
44- final result = Map <String , dynamic >.from (results.first as Map );
43+ final results = await db.query ('INFO FOR NS' );
44+ final result = Map <String , dynamic >.from (results! as Map );
4545 expect (
4646 result['databases' ],
4747 isEmpty, // nothing had been created
@@ -54,8 +54,8 @@ SIGNIN (
5454 'name' : 'Tobie' ,
5555 'settings' : {'active' : true , 'marketing' : true },
5656 };
57- final results = ( await db.create ('person' , data)) ! as List ;
58- final tobie = Map <String , dynamic >.from (results.first as Map );
57+ final result = await db.create ('person' , data);
58+ final tobie = Map <String , dynamic >.from (result ! as Map );
5959 expect (tobie['id' ], isNotNull);
6060 });
6161
@@ -72,10 +72,10 @@ DEFINE FIELD created ON document TYPE datetime;
7272 'content' : 'doc 1' ,
7373 'created' : created,
7474 };
75- final results = ( await db
76- .query ('CREATE ONLY document CONTENT ${jsonEncode (data )}' )) ! as List ;
75+ final result =
76+ await db .query ('CREATE ONLY document CONTENT ${jsonEncode (data )}' );
7777 final doc = Map <String , dynamic >.from (
78- results.first as Map ,
78+ result ! as Map ,
7979 );
8080 expect (doc['id' ], isNotNull);
8181 expect (doc['created' ], equals (created));
@@ -84,11 +84,11 @@ DEFINE FIELD created ON document TYPE datetime;
8484 final mergeData = {
8585 'created' : mergedDate,
8686 };
87- final merged = ( await db.query (
87+ final merged = await db.query (
8888 'UPDATE ONLY ${doc ['id' ]} MERGE ${jsonEncode (mergeData )}' ,
89- )) ! as List ;
89+ );
9090 final mergedDoc = Map <String , dynamic >.from (
91- merged.first as Map ,
91+ merged! as Map ,
9292 );
9393 expect (mergedDoc['created' ], equals (mergedDate));
9494 });
@@ -99,13 +99,12 @@ DEFINE FIELD created ON document TYPE datetime;
9999 'name' : 'Tom' ,
100100 'settings' : {'active' : true , 'marketing' : false },
101101 };
102- final created = (( await db.create ('person' , data)) ! as List ).first ;
102+ final created = await db.create ('person' , data);
103103 final tom = Map <String , dynamic >.from (created! as Map );
104104 tom['name' ] = 'Tom John' ;
105105 tom.remove ('settings' );
106106
107- final updated =
108- ((await db.update (tom.remove ('id' ) as String , tom))! as List ).first;
107+ final updated = await db.update (tom.remove ('id' ) as String , tom);
109108 final updatedTom = Map <String , dynamic >.from (updated! as Map );
110109 expect (updatedTom['name' ], equals (tom['name' ]));
111110 expect (updatedTom['settings' ], isNull);
@@ -117,13 +116,12 @@ DEFINE FIELD created ON document TYPE datetime;
117116 'name' : 'Tom' ,
118117 'settings' : {'active' : true , 'marketing' : false },
119118 };
120- final created = (( await db.create ('person' , data)) ! as List ).first ;
119+ final created = await db.create ('person' , data);
121120 final tom = Map <String , dynamic >.from (created! as Map );
122121 final mergeData = {
123122 'settings' : {'marketing' : true },
124123 };
125- final merged =
126- ((await db.merge (tom['id' ] as String , mergeData))! as List ).first;
124+ final merged = await db.merge (tom['id' ] as String , mergeData);
127125 final mergedTom = Map <String , dynamic >.from (merged! as Map );
128126 final settings = Map <String , dynamic >.from (mergedTom['settings' ] as Map );
129127 expect (settings['active' ], equals (true ));
@@ -136,10 +134,10 @@ DEFINE FIELD created ON document TYPE datetime;
136134 'name' : 'Tom' ,
137135 'settings' : {'active' : true , 'marketing' : false },
138136 };
139- final created = (( await db.create ('person' , data)) ! as List ).first ;
137+ final created = await db.create ('person' , data);
140138 final tom = Map <String , dynamic >.from (created! as Map );
141- final result = (( await db.select (tom['id' ] as String ))! as List ).first ;
142- final selectedTom = Map <String , dynamic >.from (result ! as Map );
139+ final results = (await db.select (tom['id' ] as String ))! as List ;
140+ final selectedTom = Map <String , dynamic >.from (results.first as Map );
143141 expect (tom['name' ], equals (selectedTom['name' ]));
144142 });
145143
@@ -160,7 +158,7 @@ DEFINE FIELD created ON document TYPE datetime;
160158 },
161159 );
162160 const sql = 'SELECT * FROM person' ;
163- final results = (( await db.query (sql)) ! as List ).first ;
161+ final results = await db.query (sql);
164162 final people = results! as List ;
165163 expect (people.length, equals (2 ));
166164 });
@@ -171,7 +169,7 @@ DEFINE FIELD created ON document TYPE datetime;
171169 'name' : 'Tom' ,
172170 'settings' : {'active' : true , 'marketing' : false },
173171 };
174- final created = (( await db.create ('person' , data)) ! as List ).first ;
172+ final created = await db.create ('person' , data);
175173 final tom = Map <String , dynamic >.from (created! as Map );
176174 final id = tom['id' ] as String ;
177175 await db.delete (id);
@@ -193,10 +191,9 @@ DEFINE FIELD created ON document TYPE datetime;
193191 await db.patch ('keyValue' , [
194192 {'op' : 'replace' , 'path' : '/key' , 'value' : 'newValue' },
195193 ]);
196- final result =
197- ((await db.query ('SELECT key FROM keyValue' ))! as List ).first;
194+ final result = await db.query ('SELECT key FROM keyValue' );
198195 expect (
199- result as List ,
196+ result! as List ,
200197 equals ([
201198 {'key' : 'newValue' },
202199 ]),
0 commit comments