Changeset 1370

Show
Ignore:
Timestamp:
08/10/08 00:46:11 (5 months ago)
Author:
jtv
Message:

More test framework improvements.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1368 r1370  
     12008-08-10  Jeroen T. Vermeulen <jtv@xs4all.nl> 
     2 include/pqxx/connection.hxx, src/connection.cxx: 
     3  - Doc/comment update 
     4 test/test000.cxx, test/test001.cxx, test/test002.cxx, test/test004.cxx, 
     5 test/test005.cxx, test/test006.cxx, test/test007.cxx, test/test008.cxx, 
     6 test/test009.cxx, test/test085.cxx, test/test090.cxx, test/test092.cxx, 
     7 test/test_helpers.hxx, test/unit/test_escape.cxx, 
     8 test/unit/test_pipeline.cxx, test/unit/test_simultaneous_transactions.cxx, 
     9 test/unit/test_sql_cursor.cxx: 
     10  - New TestCase::run() so normal tests don't need pqxx::test::pqxxtest() 
     11  - Rigged up test setup so it runs with nullconnection 
     12  - Consistently use TestCase for database-connecting tests 
    1132008-08-09  Jeroen T. Vermeulen <jtv@xs4all.nl> 
    214 test/test000.cxx, test/test002.cxx, test/test004.cxx, test/test007.cxx, 

  • trunk/test/test000.cxx

    r1368 r1370  
    8282 
    8383 
    84 void test_000() 
     84void test_000(connection_base &, transaction_base &) 
    8585{ 
    8686  PQXX_CHECK_EQUAL(oid_none, 
    …… 
    257257int main() 
    258258{ 
    259   return test::pqxxtest(test_000); 
    260 } 
    261  
     259  test::TestCase<nullconnection, nontransaction> test000("test_000", test_000); 
     260  return test000.run(); 
     261} 
     262 

  • trunk/test/test001.cxx

    r1355 r1370  
    5252{ 
    5353  test::TestCase<> test001("test_001", test_001); 
    54   return test::pqxxtest(test001); 
     54  return test001.run(); 
    5555} 
    5656 

  • trunk/test/test002.cxx

    r1368 r1370  
    11#include <pqxx/compiler-internal.hxx> 
    22 
    3 #include <iostream> 
    4  
     3#include <iostream>  
    54#include <pqxx/connection> 
    65#include <pqxx/transaction> 
    …… 
    2726} 
    2827 
    29 void test_002() 
     28void test_002(connection_base &, transaction_base &) 
    3029{ 
    3130  // Before we really connect, test the expected behaviour of the default 
    …… 
    105104int main() 
    106105{ 
    107   return test::pqxxtest(test_002); 
     106  test::TestCase<nullconnection, nontransaction> test002("test_002", test_002); 
     107  return test002.run(); 
    108108} 
    109109 

  • trunk/test/test004.cxx

    r1368 r1370  
    7777 
    7878 
    79 void test_004() 
     79void test_004(connection_base &C, transaction_base &T) 
    8080{ 
    81   connection C(""); 
     81  T.abort(); 
     82 
    8283  cout << "Adding listener..." << endl; 
    8384  TestListener L(C); 
    …… 
    109110int main() 
    110111{ 
    111   return test::pqxxtest(test_004); 
     112  test::TestCase<connection, nontransaction> test004("test_004", test_004); 
     113  return test004.run(); 
    112114} 
    113115 

  • trunk/test/test005.cxx

    r1361 r1370  
    8080{ 
    8181  test::TestCase<> test005("test_005", test_005); 
    82   return test::pqxxtest(test005); 
     82  return test005.run(); 
    8383} 
    8484 

  • trunk/test/test006.cxx

    r1361 r1370  
    134134{ 
    135135  test::TestCase<> test006("test_006", test_006); 
    136   return test::pqxxtest(test006); 
     136  return test006.run(); 
    137137} 
    138138 

  • trunk/test/test007.cxx

    r1368 r1370  
    159159 
    160160 
    161 void test_007() 
     161void test_007(connection_base &C, transaction_base &T) 
    162162{ 
    163   connection C; 
     163  T.abort(); 
    164164  C.set_client_encoding("SQL_ASCII"); 
    165165 
    …… 
    180180} // namespace 
    181181 
     182 
    182183int main() 
    183184{ 
    184   test::pqxxtest(test_007); 
     185  test::TestCase<> test007("test_007", test_007); 
     186  return test007.run(); 
    185187} 
    186188 

  • trunk/test/test008.cxx

    r1364 r1370  
    6464{ 
    6565  test::TestCase<> test008("test_008", test_008); 
    66   return test::pqxxtest(test008); 
     66  return test008.run(); 
    6767} 
    6868 

  • trunk/test/test009.cxx

    r1367 r1370  
    102102{ 
    103103  test::TestCase<> test009("test_009", test_009); 
    104   return test::pqxxtest(test009); 
     104  return test009.run(); 
    105105} 
    106106 

  • trunk/test/test085.cxx

    r1368 r1370  
    207207{ 
    208208  test::TestCase<lazyconnection, nontransaction> test085("test_085", test_085); 
    209   return test::pqxxtest(test085); 
    210 } 
    211  
     209  return test085.run(); 
     210} 
     211 

  • trunk/test/test090.cxx

    r1368 r1370  
    8383{ 
    8484  test::TestCase<connection, nontransaction> test090("test_090", test_090); 
    85   return test::pqxxtest(test090); 
     85  return test090.run(); 
    8686} 
    8787 

  • trunk/test/test092.cxx

    r1368 r1370  
    8383{ 
    8484  test::TestCase<lazyconnection> test092("test_092", test_092); 
    85   return test::pqxxtest(test092); 
     85  return test092.run(); 
    8686} 
    8787 

  • trunk/test/test_helpers.hxx

    r1368 r1370  
    8787inline void prepare_series(transaction_base &t, int lowest, int highest) 
    8888{ 
    89   if (!have_generate_series(t.conn())) 
     89  connection_base &conn = t.conn(); 
     90  // Don't do this for nullconnections, so nullconnection tests can run. 
     91  if (conn.is_open() && !have_generate_series(conn)) 
    9092  { 
    9193    t.exec("CREATE TEMP TABLE series(x integer)"); 
    …… 
    133135  } 
    134136 
     137  // Invoke test function with its expected arguments 
    135138  void operator()() { m_func(m_conn, m_trans); } 
     139 
     140  // Run test, catching errors & returning Unix-style success value 
     141  int run() { return pqxxtest(*this); } 
    136142 
    137143private: 

  • trunk/test/unit/test_escape.cxx

    r1349 r1370  
    6868{ 
    6969  test::TestCase<> test1("test_esc", test_esc); 
    70   return test::pqxxtest(test1); 
     70  return test1.run(); 
    7171} 
    7272 

  • trunk/test/unit/test_pipeline.cxx

    r1368 r1370  
    5454{ 
    5555  test::TestCase<> test("pipeline_detach", test_pipeline_detach); 
    56   return test::pqxxtest(test); 
     56  return test.run(); 
    5757} 
    5858 

  • trunk/test/unit/test_simultaneous_transactions.cxx

    r1345 r1370  
    2121{ 
    2222  test::TestCase<> test("simultaneous_trans", test_simultaneous_transactions); 
    23   return test::pqxxtest(test); 
     23  return test.run(); 
    2424} 
    2525 

  • trunk/test/unit/test_sql_cursor.cxx

    r1368 r1370  
    288288        test4("hold_cursor", test_hold_cursor); 
    289289 
    290   return test::pqxxtest(test1) + 
    291         test::pqxxtest(test2) + 
    292         test::pqxxtest(test3) + 
    293         test::pqxxtest(test4); 
    294 } 
    295  
     290  return test1.run() + 
     291        test2.run() + 
     292        test3.run() + 
     293        test4.run(); 
     294} 
     295