nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Geary.AccountInformation: Rework how special use folder paths are stored

Browse source 
Use a simple list of strings to store path steps, since we don't know
what the root will be in advance, and this leads to errors if callers
try to compare the info's paths to (say) an actual IMAP path.

Store path steps in a SpecialUse to path step map property, rather than
as individual properties for each special use, to reduce repetition.
This commit is contained in:
Michael Gratton 2020-04-22 18:56:32 +10:00 • committed by Michael James Gratton
parent 9a2fe63a5f
commit 400850cc44
4 changed files with 163 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

21
test/client/accounts/accounts-manager-test.vala
View file

@ -40,15 +40,9 @@ class Accounts.ManagerTest : TestCase {
// engine without creating all of these dirs.
this.tmp = GLib.File.new_for_path(
GLib.DirUtils.make_tmp("geary-engine-test-XXXXXX")
GLib.DirUtils.make_tmp("accounts-manager-test-XXXXXX")
);
GLib.File config = this.tmp.get_child("config");
config.make_directory();
GLib.File data = this.tmp.get_child("data");
data.make_directory();
this.primary_mailbox = new Geary.RFC822.MailboxAddress(
null, "test1@example.com"
);
@ -60,7 +54,7 @@ class Accounts.ManagerTest : TestCase {
this.mediator,
this.primary_mailbox
);
this.test = new Manager(this.mediator, config, data);
this.test = new Manager(this.mediator, this.tmp, this.tmp);
}
public override void tear_down() throws GLib.Error {
@ -169,12 +163,13 @@ class Accounts.ManagerTest : TestCase {
this.account.save_sent = false;
this.account.signature = "blarg";
this.account.use_signature = false;
Accounts.AccountConfigV1 config = new Accounts.AccountConfigV1(false);
Geary.ConfigFile file =
new Geary.ConfigFile(this.tmp.get_child("config"));
new Geary.ConfigFile(this.tmp.get_child("config.ini"));
Accounts.AccountConfigV1 config = new Accounts.AccountConfigV1(false);
config.save(this.account, file);
Geary.AccountInformation copy = config.load(
file, TEST_ID, this.mediator, null, null
);
@ -194,7 +189,7 @@ class Accounts.ManagerTest : TestCase {
new Accounts.AccountConfigLegacy();
Geary.ConfigFile file =
new Geary.ConfigFile(this.tmp.get_child("config"));
new Geary.ConfigFile(this.tmp.get_child("config.ini"));
config.save(this.account, file);
Geary.AccountInformation copy = config.load(
@ -221,7 +216,7 @@ class Accounts.ManagerTest : TestCase {
Geary.Credentials.Requirement.NONE;
Accounts.ServiceConfigV1 config = new Accounts.ServiceConfigV1();
Geary.ConfigFile file =
new Geary.ConfigFile(this.tmp.get_child("config"));
new Geary.ConfigFile(this.tmp.get_child("config.ini"));
config.save(this.account, this.account.outgoing, file);
config.load(file, copy, copy.outgoing);
@ -246,7 +241,7 @@ class Accounts.ManagerTest : TestCase {
Geary.Credentials.Requirement.NONE;
Accounts.ServiceConfigLegacy config = new Accounts.ServiceConfigLegacy();
Geary.ConfigFile file =
new Geary.ConfigFile(this.tmp.get_child("config"));
new Geary.ConfigFile(this.tmp.get_child("config.ini"));
config.save(this.account, this.account.outgoing, file);
config.load(file, copy, copy.outgoing);