Changeset 1893

Show
Ignore:
Timestamp:
Wed Feb 1 14:12:36 2006
Author:
fgerlits
Message:

added previously undeclared throw clause in the setUp() of these tests,
plus caught previously uncaught exception

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx

    r1823 r1893  
    90 90  *----------------------------------------------------------------------------*/  
    91 91 void  
    92   WebStorageClientTest :: setUp(void)                         throw ()  
      92 WebStorageClientTest :: setUp(void)             throw (CPPUNIT_NS::Exception)  
    92 92 {  
    93 93     Ptr<AuthenticationClientFactory>::Ref   acf;  
    …… 
    102 102         acf->configure(*root);  
    103 103     } catch (std::invalid_argument &e) {  
    104           CPPUNIT_FAIL("semantic error in authentication configuration file");  
      104         std::string     eMsg = "semantic error in "  
      105                                "authentication configuration file:\n";  
      106         eMsg += e.what();  
      107         CPPUNIT_FAIL(eMsg);  
    105 108     } catch (xmlpp::exception &e) {  
    106           CPPUNIT_FAIL("error parsing authentication configuration file");  
      109         std::string     eMsg = "error parsing "  
      110                                "authentication configuration file:\n";  
      111         eMsg += e.what();  
      112         CPPUNIT_FAIL(eMsg);  
    107 113     }  
    108 114  
    117 123         wsc.reset(new WebStorageClient());  
    118 124         wsc->configure(*root);  
    119           wsc->reset();  
    120 125     } catch (std::invalid_argument &e) {  
    121           CPPUNIT_FAIL("semantic error in storage configuration file");  
      126         std::string     eMsg = "semantic error in "  
      127                                "authentication configuration file:\n";  
      128         eMsg += e.what();  
      129         CPPUNIT_FAIL(eMsg);  
    122 130     } catch (xmlpp::exception &e) {  
    123           CPPUNIT_FAIL("error parsing storage configuration file");  
      131         std::string     eMsg = "error parsing "  
      132                                "authentication configuration file:\n";  
      133         eMsg += e.what();  
      134         CPPUNIT_FAIL(eMsg);  
    124 135     }  
      136      
      137     CPPUNIT_ASSERT_NO_THROW(  
      138         wsc->reset()  
      139     );  
    125 140 }  
    126 141  

  • trunk/livesupport/src/modules/storageClient/src/TestStorageClientTest.cxx

    r1601 r1893  
    75 75  *----------------------------------------------------------------------------*/  
    76 76 void  
    77   TestStorageClientTest :: setUp(void)                         throw ()  
      77 TestStorageClientTest :: setUp(void)            throw (CPPUNIT_NS::Exception)  
    77 77 {  
    78 78     try {  

  • trunk/livesupport/src/modules/storageClient/src/WebStorageClientTest.h

    r1601 r1893  
    174 174          */  
    175 175         void  
    176           setUp(void)                                     throw ();  
      176         setUp(void)                             throw (CPPUNIT_NS::Exception);  
    176 176  
    177 177         /**  

  • trunk/livesupport/src/modules/storageClient/src/TestStorageClientTest.h

    r1601 r1893  
    168 168          */  
    169 169         void  
    170           setUp(void)                                     throw ();  
      170         setUp(void)                             throw (CPPUNIT_NS::Exception);  
    170 170  
    171 171         /**