Skip to content

Commit bda2351

Browse files
committed
db [nfc]: Simplify name and tests of getGlobalSettings
Now that this method no longer has the job of ensuring there's a record in the table, its name can reflect that simpler role, replacing "ensureGlobalSettings". This simpler role also makes one test case no longer relevant.
1 parent 2365bb3 commit bda2351

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

lib/model/database.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ class AppDatabase extends _$AppDatabase {
181181
});
182182
}
183183

184-
// TODO rename ensureGlobalSettings to reflect its reduced role
185-
Future<GlobalSettingsData> ensureGlobalSettings() async {
184+
Future<GlobalSettingsData> getGlobalSettings() async {
186185
// The migrations ensure there is a row.
187186
return await (select(globalSettings)..limit(1)).getSingle();
188187
}

lib/model/store.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ class LiveGlobalStore extends GlobalStore {
855855
// by doing this loading up front before constructing a [GlobalStore].
856856
static Future<GlobalStore> load() async {
857857
final db = AppDatabase(NativeDatabase.createInBackground(await _dbFile()));
858-
final globalSettings = await db.ensureGlobalSettings();
858+
final globalSettings = await db.getGlobalSettings();
859859
final accounts = await db.select(db.accounts).get();
860860
return LiveGlobalStore._(db: db,
861861
globalSettings: globalSettings,

test/model/database_test.dart

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,25 @@ void main() {
2626
});
2727

2828
test('initialize GlobalSettings with defaults', () async {
29-
check(await database.ensureGlobalSettings()).themeSetting.isNull();
30-
});
31-
32-
test('ensure single GlobalSettings row', () async {
33-
final globalSettings = await database.ensureGlobalSettings();
34-
check(await database.select(database.globalSettings).get())
35-
.single.equals(globalSettings);
36-
37-
// Subsequent calls to `ensureGlobalSettings` do not insert new rows.
38-
check(await database.ensureGlobalSettings()).equals(globalSettings);
39-
check(await database.select(database.globalSettings).get())
40-
.single.equals(globalSettings);
29+
check(await database.getGlobalSettings()).themeSetting.isNull();
4130
});
4231

4332
test('does not crash if multiple global settings rows', () async {
4433
await database.into(database.globalSettings)
4534
.insert(const GlobalSettingsCompanion(themeSetting: Value(ThemeSetting.dark)));
4635

4736
check(await database.select(database.globalSettings).get()).length.equals(2);
48-
check(await database.ensureGlobalSettings()).themeSetting.isNull();
37+
check(await database.getGlobalSettings()).themeSetting.isNull();
4938
});
5039

5140
test('GlobalSettings updates work', () async {
52-
check(await database.ensureGlobalSettings())
41+
check(await database.getGlobalSettings())
5342
.themeSetting.isNull();
5443

5544
// As in doUpdateGlobalSettings.
5645
await database.update(database.globalSettings)
5746
.write(GlobalSettingsCompanion(themeSetting: Value(ThemeSetting.dark)));
58-
check(await database.ensureGlobalSettings())
47+
check(await database.getGlobalSettings())
5948
.themeSetting.equals(ThemeSetting.dark);
6049
});
6150

0 commit comments

Comments
 (0)