From 67440844c422ee30b31df9a46a7f99ac0e833add Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 9 Nov 2019 03:13:45 +0100 Subject: Refactor and improve test suite. --- tests/00-db-migration-0-to-1/after.sql | 14 -------------- tests/00-db-migration-0-to-1/before.sql | 14 -------------- tests/00-db-migration-0-to-1/local.conf | 6 ------ tests/00-db-migration-0-to-1/remote.conf | 6 ------ tests/00-db-migration-0-to-1/run | 33 -------------------------------- 5 files changed, 73 deletions(-) delete mode 100644 tests/00-db-migration-0-to-1/after.sql delete mode 100644 tests/00-db-migration-0-to-1/before.sql delete mode 100644 tests/00-db-migration-0-to-1/local.conf delete mode 100644 tests/00-db-migration-0-to-1/remote.conf delete mode 100644 tests/00-db-migration-0-to-1/run (limited to 'tests/00-db-migration-0-to-1') diff --git a/tests/00-db-migration-0-to-1/after.sql b/tests/00-db-migration-0-to-1/after.sql deleted file mode 100644 index 18b0ad7..0000000 --- a/tests/00-db-migration-0-to-1/after.sql +++ /dev/null @@ -1,14 +0,0 @@ -PRAGMA foreign_keys=OFF; -BEGIN TRANSACTION; -CREATE TABLE local (idx INTEGER NOT NULL PRIMARY KEY REFERENCES mailboxes(idx), UIDVALIDITY UNSIGNED INT NOT NULL CHECK (UIDVALIDITY > 0), UIDNEXT UNSIGNED INT NOT NULL, HIGHESTMODSEQ UNSIGNED BIGINT NOT NULL); -CREATE TABLE remote (idx INTEGER NOT NULL PRIMARY KEY REFERENCES mailboxes(idx), UIDVALIDITY UNSIGNED INT NOT NULL CHECK (UIDVALIDITY > 0), UIDNEXT UNSIGNED INT NOT NULL, HIGHESTMODSEQ UNSIGNED BIGINT NOT NULL); -CREATE TABLE mapping (idx INTEGER NOT NULL REFERENCES mailboxes(idx), lUID UNSIGNED INT NOT NULL CHECK (lUID > 0), rUID UNSIGNED INT NOT NULL CHECK (rUID > 0), PRIMARY KEY (idx,lUID), UNIQUE (idx,rUID)); -CREATE TABLE IF NOT EXISTS "mailboxes" (idx INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, mailbox BLOB COLLATE BINARY NOT NULL CHECK (mailbox != '') UNIQUE, subscribed BOOLEAN NOT NULL); -INSERT INTO mailboxes VALUES(1,X'61006231006332',0); -INSERT INTO mailboxes VALUES(2,X'61006231006331',0); -INSERT INTO mailboxes VALUES(3,X'494e424f58',0); -INSERT INTO mailboxes VALUES(4,X'6132',0); -INSERT INTO mailboxes VALUES(5,X'610062320063',0); -DELETE FROM sqlite_sequence; -INSERT INTO sqlite_sequence VALUES('mailboxes',5); -COMMIT; diff --git a/tests/00-db-migration-0-to-1/before.sql b/tests/00-db-migration-0-to-1/before.sql deleted file mode 100644 index 333a1dc..0000000 --- a/tests/00-db-migration-0-to-1/before.sql +++ /dev/null @@ -1,14 +0,0 @@ -PRAGMA foreign_keys=OFF; -BEGIN TRANSACTION; -CREATE TABLE mailboxes (idx INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, mailbox TEXT NOT NULL CHECK (mailbox != '') UNIQUE, subscribed BOOLEAN NOT NULL); -INSERT INTO mailboxes VALUES(1,'a.b1.c2',0); -INSERT INTO mailboxes VALUES(2,'a.b1.c1',0); -INSERT INTO mailboxes VALUES(3,'INBOX',0); -INSERT INTO mailboxes VALUES(4,'a2',0); -INSERT INTO mailboxes VALUES(5,'a.b2.c',0); -CREATE TABLE local (idx INTEGER NOT NULL PRIMARY KEY REFERENCES mailboxes(idx), UIDVALIDITY UNSIGNED INT NOT NULL CHECK (UIDVALIDITY > 0), UIDNEXT UNSIGNED INT NOT NULL, HIGHESTMODSEQ UNSIGNED BIGINT NOT NULL); -CREATE TABLE remote (idx INTEGER NOT NULL PRIMARY KEY REFERENCES mailboxes(idx), UIDVALIDITY UNSIGNED INT NOT NULL CHECK (UIDVALIDITY > 0), UIDNEXT UNSIGNED INT NOT NULL, HIGHESTMODSEQ UNSIGNED BIGINT NOT NULL); -CREATE TABLE mapping (idx INTEGER NOT NULL REFERENCES mailboxes(idx), lUID UNSIGNED INT NOT NULL CHECK (lUID > 0), rUID UNSIGNED INT NOT NULL CHECK (rUID > 0), PRIMARY KEY (idx,lUID), UNIQUE (idx,rUID)); -DELETE FROM sqlite_sequence; -INSERT INTO sqlite_sequence VALUES('mailboxes',5); -COMMIT; diff --git a/tests/00-db-migration-0-to-1/local.conf b/tests/00-db-migration-0-to-1/local.conf deleted file mode 100644 index 93497d9..0000000 --- a/tests/00-db-migration-0-to-1/local.conf +++ /dev/null @@ -1,6 +0,0 @@ -namespace inbox { - separator = . - location = maildir:~/inbox:LAYOUT=index - inbox = yes - list = yes -} diff --git a/tests/00-db-migration-0-to-1/remote.conf b/tests/00-db-migration-0-to-1/remote.conf deleted file mode 100644 index 93497d9..0000000 --- a/tests/00-db-migration-0-to-1/remote.conf +++ /dev/null @@ -1,6 +0,0 @@ -namespace inbox { - separator = . - location = maildir:~/inbox:LAYOUT=index - inbox = yes - list = yes -} diff --git a/tests/00-db-migration-0-to-1/run b/tests/00-db-migration-0-to-1/run deleted file mode 100644 index 757fe04..0000000 --- a/tests/00-db-migration-0-to-1/run +++ /dev/null @@ -1,33 +0,0 @@ -# create some mailboxes -doveadm -u "local" mailbox create "a.b1.c1" "a.b1.c2" "a.b2.c" "a2" -doveadm -u "remote" mailbox create "a.b1.c1" "a.b1.c2" "a.b2.c" "a2" - -# import an existing non-migrated database -sqlite3 "$XDG_DATA_HOME/interimap/remote.db" <"$TESTDIR/before.sql" - -# migrate -interimap - -xgrep -Fx "Upgrading database version from 0" <"$STDERR" -check_mailboxes_status "a.b1.c1" "a.b1.c2" "a.b2.c" "a2" - -# verify that the new schema is as expected -sqlite3 "$XDG_DATA_HOME/interimap/remote.db" >"$TMPDIR/dump.sql" <<-EOF - DELETE FROM local; - DELETE FROM remote; - .dump -EOF - -# re-import and dump the expected dump to work around SQLite format -# differences across versions -sqlite3 "$XDG_DATA_HOME/interimap/remote2.db" <"$TESTDIR/after.sql" -sqlite3 "$XDG_DATA_HOME/interimap/remote2.db" >"$TMPDIR/dump-expected.sql" <<-EOF - .dump -EOF - -# XXX need 'user_version' PRAGMA in the dump for future migrations -# http://sqlite.1065341.n5.nabble.com/dump-command-and-user-version-td101228.html -diff -u --label="a/dump.sql" --label="b/dump.sql" \ - "$TMPDIR/dump-expected.sql" "$TMPDIR/dump.sql" - -# vim: set filetype=sh : -- cgit v1.2.3