lib,test: replace connection query() method with sync_exec{,_params}.

[mailshears.git] / test / mailshears_test.rb

diff --git a/test/mailshears_test.rb b/test/mailshears_test.rb
index 865bd4a18eefd72b071a45968a4ac90d10fc4ae8..94f2f4903bd7894b505fa21e8a3ff340503ba668 100644 (file)
--- a/test/mailshears_test.rb
+++ b/test/mailshears_test.rb
@@ -1,6 +1,14 @@
+# Without this, I get...
+#
+#   Warning: you should require 'minitest/autorun' instead.
+#   Warning: or add 'gem "minitest"' before 'require "minitest/autorun"'
+#
+# Whatever.
+gem 'minitest'
+require 'minitest/autorun'
+
 require 'common/configuration'
 require 'fileutils'
-require 'minitest/autorun'
 require 'pg'
 
 class MailshearsTest < MiniTest::Test
@@ -71,15 +79,15 @@ class MailshearsTest < MiniTest::Test
     #   +------------------  +---------+
     #
     #
-    #   +---------------------------------------------------------+
-    #   |                         shared                          |
-    #   +-----+--------------------+----------+-------------------+
-    #   | sid |     user_from      | calendar |    user_which     |
-    #   +-----+--------------------+----------+-------------------+
-    #   |   1 |  adam@example.net  | derp     | beth@example.net  |
-    #   +-----+--------------------+----------+-------------------+
-    #   |   2 | booger@example.com | derp     | carol@example.net |
-    #   +-----+--------------------+----------+-------------------+
+    #   +---------------------------------------------------------------------------------------------------------------------+
+    #   |                                                       shares                                                        |
+    #   +-----+-----------------------------------+---------------------------------------------------+-----------------------+
+    #   | sid |              owner                |                      calendar                     |          with         |
+    #   +-----+-----------------------------------+---------------------------------------------------+-----------------------+
+    #   |   1 | /caldav.php/adam%40example.net/   | /caldav.php/adam%40example.net/calendar-default   | /beth%40example.net/  |
+    #   +-----+-----------------------------------+---------------------------------------------------+-----------------------+
+    #   |   2 | /caldav.php/booger%40example.com/ | /caldav.php/booger%40example.com/calendar-default | /carol%40example.net/ |
+    #   +-----+-----------------------------------+---------------------------------------------------+-----------------------+
     #
     #
     # 2. davical_test
@@ -200,7 +208,7 @@ class MailshearsTest < MiniTest::Test
       plugin_dbname = cfg.send("#{plugin}_dbname")
       next if plugin_dbname.nil? # Skip the dovecot plugin
       query = "CREATE DATABASE #{plugin_dbname};"
-      connection.query(query)
+      connection.sync_exec(query)
 
       plugin_dbhost = cfg.send("#{plugin}_dbhost")
       plugin_dbport = cfg.send("#{plugin}_dbport")
@@ -215,9 +223,9 @@ class MailshearsTest < MiniTest::Test
                                        plugin_dbpass)
 
       sql = File.open("test/sql/#{plugin}.sql").read()
-      plugin_conn.query(sql)
+      plugin_conn.sync_exec(sql)
       sql = File.open("test/sql/#{plugin}-fixtures.sql").read()
-      plugin_conn.query(sql)
+      plugin_conn.sync_exec(sql)
       plugin_conn.close()
     end
 
@@ -238,7 +246,7 @@ class MailshearsTest < MiniTest::Test
       plugin_dbname = cfg.send("#{plugin}_dbname")
       next if plugin_dbname.nil? # Skip the dovecot plugin
       query = "DROP DATABASE IF EXISTS #{plugin_dbname};"
-      connection.query(query)
+      connection.sync_exec(query)
     end
 
     connection.close()