require 'common/configuration'
require 'fileutils'
-require 'minitest/unit'
+require 'minitest/autorun'
require 'pg'
-class MailshearsTest < MiniTest::Unit::TestCase
+class MailshearsTest < MiniTest::Test
# This is that class that most (if not all) of our test cases will
# inherit. It provides the automatic setup and teardown of the
# filesystem and database that the test cases will exercise.
db_user = 'postgres'
db_pass = nil
- connection = PGconn.connect(db_host, db_port, db_opts, db_tty,
- db_name, db_user, db_pass)
+ connection = PG::Connection.new(db_host, db_port, db_opts, db_tty,
+ db_name, db_user, db_pass)
return connection
end
# +-------------------+-------------+------------+
#
#
- # +------------------------------------------------------+
- # | alias |
- # +-------------------+-------------------+--------------+
- # | address | goto | domain |
- # +-------------------+-------------------+--------------+
- # | alice@example.com | alice@example.com | example.com |
- # +-------------------+-------------------+--------------+
- # | bob@example.com | bob@example.com | example.com |
- # +-------------------+-------------------+--------------+
- # | adam@example.net | adam@example.net | example.net |
- # +-------------------+-------------------+--------------+
- # | beth@example.net | beth@example.net | example.net |
- # +-------------------+-------------------+--------------+
- # | carol@example.net | carol@example.net | example.net |
- # +-------------------+-------------------+--------------+
+ # +-------------------------------------------------------+
+ # | alias |
+ # +-------------------+--------------------+--------------+
+ # | address | goto | domain |
+ # +-------------------+--------------------+--------------+
+ # | alice@example.com | alice@example.com, | example.com |
+ # | | adam@example.net, | |
+ # | | bob@example.com, | |
+ # | | carol@example.net | |
+ # +-------------------+--------------------+--------------+
+ # | bob@example.com | bob@example.com | example.com |
+ # +-------------------+--------------------+--------------+
+ # | adam@example.net | adam@example.net | example.net |
+ # +-------------------+--------------------+--------------+
+ # | beth@example.net | beth@example.net | example.net |
+ # +-------------------+--------------------+--------------+
+ # | carol@example.net | carol@example.net | example.net |
+ # +-------------------+--------------------+--------------+
#
#
# +---------------------------------+
plugin_dbuser = cfg.send("#{plugin}_dbuser")
plugin_dbpass = cfg.send("#{plugin}_dbpass")
- plugin_conn = PGconn.connect(plugin_dbhost, plugin_dbport, plugin_dbopts,
- plugin_dbtty, plugin_dbname, plugin_dbuser,
- plugin_dbpass)
+ plugin_conn = PG::Connection.new(plugin_dbhost, plugin_dbport,
+ plugin_dbopts, plugin_dbtty,
+ plugin_dbname, plugin_dbuser,
+ plugin_dbpass)
sql = File.open("test/sql/#{plugin}.sql").read()
plugin_conn.query(sql)