github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2010-03-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Fixed unitest fails if openssl doesn't support sha-256.
	* src/MetalinkParserStateV4Impl.cc
	* test/MetalinkProcessorTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2010-03-08 12:01:08 +00:00
parent 6921e3c543
commit c4a35932cb
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-03-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed unitest fails if openssl doesn't support sha-256.
* src/MetalinkParserStateV4Impl.cc
* test/MetalinkProcessorTest.cc
2010-03-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-03-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Wait until message arrives(again) Wait until message arrives(again)

2
src/MetalinkParserStateV4Impl.cc
View File

@ -350,7 +350,7 @@ void PiecesMetalinkParserStateV4::endElement
const std::string& nsUri, const std::string& nsUri,
const std::string& characters) const std::string& characters)
{ {
stm->commitChunkChecksumTransaction(); stm->commitChunkChecksumTransactionV4();
} }
void PieceHashMetalinkParserStateV4::endElement void PieceHashMetalinkParserStateV4::endElement

22
test/MetalinkProcessorTest.cc
View File

@ -13,6 +13,7 @@
#include "MetalinkResource.h" #include "MetalinkResource.h"
#include "MetalinkMetaurl.h" #include "MetalinkMetaurl.h"
#ifdef ENABLE_MESSAGE_DIGEST #ifdef ENABLE_MESSAGE_DIGEST
# include "messageDigest.h"
# include "ChunkChecksum.h" # include "ChunkChecksum.h"
# include "Checksum.h" # include "Checksum.h"
#endif // ENABLE_MESSAGE_DIGEST #endif // ENABLE_MESSAGE_DIGEST
@ -85,7 +86,6 @@ void MetalinkProcessorTest::testParseFileV4()
SharedHandle<MetalinkEntry> e; SharedHandle<MetalinkEntry> e;
SharedHandle<MetalinkResource> r; SharedHandle<MetalinkResource> r;
SharedHandle<MetalinkMetaurl> mu; SharedHandle<MetalinkMetaurl> mu;
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size());
e = m->entries[0]; e = m->entries[0];
CPPUNIT_ASSERT_EQUAL(std::string("example.ext"), e->getPath()); CPPUNIT_ASSERT_EQUAL(std::string("example.ext"), e->getPath());
@ -97,6 +97,7 @@ void MetalinkProcessorTest::testParseFileV4()
CPPUNIT_ASSERT(!e->checksum.isNull()); CPPUNIT_ASSERT(!e->checksum.isNull());
CPPUNIT_ASSERT_EQUAL(std::string("sha-1"), e->checksum->getAlgo()); CPPUNIT_ASSERT_EQUAL(std::string("sha-1"), e->checksum->getAlgo());
CPPUNIT_ASSERT(!e->chunkChecksum.isNull()); CPPUNIT_ASSERT(!e->chunkChecksum.isNull());
if(MessageDigestContext::supports(MessageDigestContext::SHA256)) {
CPPUNIT_ASSERT_EQUAL(std::string("sha-256"), e->chunkChecksum->getAlgo()); CPPUNIT_ASSERT_EQUAL(std::string("sha-256"), e->chunkChecksum->getAlgo());
CPPUNIT_ASSERT_EQUAL((size_t)262144, e->chunkChecksum->getChecksumLength()); CPPUNIT_ASSERT_EQUAL((size_t)262144, e->chunkChecksum->getChecksumLength());
CPPUNIT_ASSERT_EQUAL((size_t)3, e->chunkChecksum->countChecksum()); CPPUNIT_ASSERT_EQUAL((size_t)3, e->chunkChecksum->countChecksum());
@ -106,7 +107,24 @@ void MetalinkProcessorTest::testParseFileV4()
e->chunkChecksum->getChecksum(1)); e->chunkChecksum->getChecksum(1));
CPPUNIT_ASSERT_EQUAL(std::string("37290d74ac4d186e3a8e5785d259d2ec04fac91ae28092e7620ec8bc99e830aa"), CPPUNIT_ASSERT_EQUAL(std::string("37290d74ac4d186e3a8e5785d259d2ec04fac91ae28092e7620ec8bc99e830aa"),
e->chunkChecksum->getChecksum(2)); e->chunkChecksum->getChecksum(2));
#endif // ENABLE_MESSAGE_DIGEST } else {
CPPUNIT_ASSERT_EQUAL(std::string("sha-1"), e->chunkChecksum->getAlgo());
CPPUNIT_ASSERT_EQUAL((size_t)262144, e->chunkChecksum->getChecksumLength());
CPPUNIT_ASSERT_EQUAL((size_t)3, e->chunkChecksum->countChecksum());
CPPUNIT_ASSERT_EQUAL
(std::string("5bd9f7248df0f3a6a86ab6c95f48787d546efa14"),
e->chunkChecksum->getChecksum(0));
CPPUNIT_ASSERT_EQUAL
(std::string("9413ee70957a09d55704123687478e07f18c7b29"),
e->chunkChecksum->getChecksum(1));
CPPUNIT_ASSERT_EQUAL
(std::string("44213f9f4d59b557314fadcd233232eebcac8012"),
e->chunkChecksum->getChecksum(2));
}
#else // !ENABLE_MESSAGE_DIGEST
CPPUNIT_ASSERT(e->checksum.isNull());
CPPUNIT_ASSERT(e->chunkChecksum.isNull());
#endif // !ENABLE_MESSAGE_DIGEST
CPPUNIT_ASSERT(!e->getSignature().isNull()); CPPUNIT_ASSERT(!e->getSignature().isNull());
CPPUNIT_ASSERT_EQUAL(std::string("application/pgp-signature"), CPPUNIT_ASSERT_EQUAL(std::string("application/pgp-signature"),
e->getSignature()->getType()); e->getSignature()->getType());