diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
| commit | 07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch) | |
| tree | 2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /test/NetrcTest.cc | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'test/NetrcTest.cc')
| -rw-r--r-- | test/NetrcTest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/NetrcTest.cc b/test/NetrcTest.cc index a47c046a..90e27af2 100644 --- a/test/NetrcTest.cc +++ b/test/NetrcTest.cc @@ -36,32 +36,32 @@ void NetrcTest::testFindAuthenticator() { Netrc netrc; netrc.addAuthenticator - (SharedHandle<Authenticator>(new Authenticator("host1", "tujikawa", "tujikawapasswd", "tujikawaaccount"))); + (std::shared_ptr<Authenticator>(new Authenticator("host1", "tujikawa", "tujikawapasswd", "tujikawaaccount"))); netrc.addAuthenticator - (SharedHandle<Authenticator>(new Authenticator("host2", "aria2", "aria2password", "aria2account"))); + (std::shared_ptr<Authenticator>(new Authenticator("host2", "aria2", "aria2password", "aria2account"))); netrc.addAuthenticator - (SharedHandle<Authenticator>(new Authenticator(".my.domain", "dmname", "dmpass", "dmaccount"))); + (std::shared_ptr<Authenticator>(new Authenticator(".my.domain", "dmname", "dmpass", "dmaccount"))); netrc.addAuthenticator - (SharedHandle<Authenticator>(new DefaultAuthenticator("default", "defaultpassword", "defaultaccount"))); + (std::shared_ptr<Authenticator>(new DefaultAuthenticator("default", "defaultpassword", "defaultaccount"))); - SharedHandle<Authenticator> aria2auth = netrc.findAuthenticator("host2"); + std::shared_ptr<Authenticator> aria2auth = netrc.findAuthenticator("host2"); CPPUNIT_ASSERT(aria2auth); CPPUNIT_ASSERT_EQUAL(std::string("aria2"), aria2auth->getLogin()); CPPUNIT_ASSERT_EQUAL(std::string("aria2password"), aria2auth->getPassword()); CPPUNIT_ASSERT_EQUAL(std::string("aria2account"), aria2auth->getAccount()); - SharedHandle<Authenticator> defaultauth = netrc.findAuthenticator("host3"); + std::shared_ptr<Authenticator> defaultauth = netrc.findAuthenticator("host3"); CPPUNIT_ASSERT(defaultauth); CPPUNIT_ASSERT_EQUAL(std::string("default"), defaultauth->getLogin()); CPPUNIT_ASSERT_EQUAL(std::string("defaultpassword"), defaultauth->getPassword()); CPPUNIT_ASSERT_EQUAL(std::string("defaultaccount"), defaultauth->getAccount()); - SharedHandle<Authenticator> domainMatchAuth = + std::shared_ptr<Authenticator> domainMatchAuth = netrc.findAuthenticator("host3.my.domain"); CPPUNIT_ASSERT(domainMatchAuth); CPPUNIT_ASSERT_EQUAL(std::string("dmname"), domainMatchAuth->getLogin()); - SharedHandle<Authenticator> domainMatchAuth2 = + std::shared_ptr<Authenticator> domainMatchAuth2 = netrc.findAuthenticator("my.domain"); CPPUNIT_ASSERT(domainMatchAuth2); CPPUNIT_ASSERT_EQUAL(std::string("default"), domainMatchAuth2->getLogin()); @@ -71,24 +71,24 @@ void NetrcTest::testParse() { Netrc netrc; netrc.parse(A2_TEST_DIR"/sample.netrc"); - std::vector<SharedHandle<Authenticator> >::const_iterator itr = + std::vector<std::shared_ptr<Authenticator> >::const_iterator itr = netrc.getAuthenticators().begin(); - SharedHandle<Authenticator> tujikawaauth = *itr; + std::shared_ptr<Authenticator> tujikawaauth = *itr; CPPUNIT_ASSERT(tujikawaauth); CPPUNIT_ASSERT_EQUAL(std::string("host1"), tujikawaauth->getMachine()); CPPUNIT_ASSERT_EQUAL(std::string("tujikawa"), tujikawaauth->getLogin()); CPPUNIT_ASSERT_EQUAL(std::string("tujikawapassword"), tujikawaauth->getPassword()); CPPUNIT_ASSERT_EQUAL(std::string("tujikawaaccount"), tujikawaauth->getAccount()); ++itr; - SharedHandle<Authenticator> aria2auth = *itr; + std::shared_ptr<Authenticator> aria2auth = *itr; CPPUNIT_ASSERT(aria2auth); CPPUNIT_ASSERT_EQUAL(std::string("host2"), aria2auth->getMachine()); CPPUNIT_ASSERT_EQUAL(std::string("aria2"), aria2auth->getLogin()); CPPUNIT_ASSERT_EQUAL(std::string("aria2password"), aria2auth->getPassword()); CPPUNIT_ASSERT_EQUAL(std::string("aria2account"), aria2auth->getAccount()); ++itr; - SharedHandle<Authenticator> defaultauth = *itr; + std::shared_ptr<Authenticator> defaultauth = *itr; CPPUNIT_ASSERT(defaultauth); CPPUNIT_ASSERT_EQUAL(std::string("anonymous"), defaultauth->getLogin()); CPPUNIT_ASSERT_EQUAL(std::string("ARIA2@USER"), defaultauth->getPassword()); |