diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2011-11-05 18:05:23 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2011-11-05 18:05:23 +0900 |
| commit | 0c162dfbfb4a875fac9374c65cf93382ff9ce4ed (patch) | |
| tree | 6fbc9cc204305017438d9511db631b9b2e7fc538 /test/IteratableChunkChecksumValidatorTest.cc | |
| parent | 6ea1b68db186036e9f05c06915f8c4bd757c3a25 (diff) | |
Made util::fromHex and base32::decode function template
Diffstat (limited to 'test/IteratableChunkChecksumValidatorTest.cc')
| -rw-r--r-- | test/IteratableChunkChecksumValidatorTest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/IteratableChunkChecksumValidatorTest.cc b/test/IteratableChunkChecksumValidatorTest.cc index 921e9338..3e1cac84 100644 --- a/test/IteratableChunkChecksumValidatorTest.cc +++ b/test/IteratableChunkChecksumValidatorTest.cc @@ -2,6 +2,7 @@ #include <cppunit/extensions/HelperMacros.h> +#include "TestUtil.h" #include "DownloadContext.h" #include "DefaultPieceStorage.h" #include "Option.h" @@ -32,9 +33,9 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION( IteratableChunkChecksumValidatorTest ); const std::string IteratableChunkChecksumValidatorTest::csArray[] = - { util::fromHex("29b0e7878271645fffb7eec7db4a7473a1c00bc1"), - util::fromHex("4df75a661cb7eb2733d9cdaa7f772eae3a4e2976"), - util::fromHex("0a4ea2f7dd7c52ddf2099a444ab2184b4d341bdb") }; + { fromHex("29b0e7878271645fffb7eec7db4a7473a1c00bc1"), + fromHex("4df75a661cb7eb2733d9cdaa7f772eae3a4e2976"), + fromHex("0a4ea2f7dd7c52ddf2099a444ab2184b4d341bdb") }; void IteratableChunkChecksumValidatorTest::testValidate() { Option option; @@ -60,7 +61,7 @@ void IteratableChunkChecksumValidatorTest::testValidate() { // make the test fail std::deque<std::string> badHashes(&csArray[0], &csArray[3]); - badHashes[1] = util::fromHex("ffffffffffffffffffffffffffffffffffffffff"); + badHashes[1] = fromHex("ffffffffffffffffffffffffffffffffffffffff"); dctx->setPieceHashes("sha-1", badHashes.begin(), badHashes.end()); validator.init(); @@ -78,8 +79,8 @@ void IteratableChunkChecksumValidatorTest::testValidate_readError() { SharedHandle<DownloadContext> dctx (new DownloadContext(100, 500, A2_TEST_DIR"/chunkChecksumTestFile250.txt")); std::deque<std::string> hashes(&csArray[0], &csArray[3]); - hashes.push_back(util::fromHex("ffffffffffffffffffffffffffffffffffffffff")); - hashes.push_back(util::fromHex("ffffffffffffffffffffffffffffffffffffffff")); + hashes.push_back(fromHex("ffffffffffffffffffffffffffffffffffffffff")); + hashes.push_back(fromHex("ffffffffffffffffffffffffffffffffffffffff")); dctx->setPieceHashes("sha-1", hashes.begin(), hashes.end()); SharedHandle<DefaultPieceStorage> ps(new DefaultPieceStorage(dctx, &option)); ps->initStorage(); |