2009-02-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Don't use sha256 in tests because it might not be supported by
	the SSL library.
	* test/MetalinkProcessorTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-02-10 14:44:33 +00:00
parent ab06444ba7
commit 52b17520de
2 changed files with 29 additions and 16 deletions

View File

@ -1,3 +1,9 @@
2009-02-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Don't use sha256 in tests because it might not be supported by the
SSL library.
* test/MetalinkProcessorTest.cc
2009-02-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-02-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed tests giving -1 for unsigned argument. Removed tests giving -1 for unsigned argument.

View File

@ -1,4 +1,9 @@
#include "MetalinkProcessorFactory.h" #include "MetalinkProcessorFactory.h"
#include <iostream>
#include <cppunit/extensions/HelperMacros.h>
#include "MetalinkParserStateMachine.h" #include "MetalinkParserStateMachine.h"
#include "Exception.h" #include "Exception.h"
#include "DefaultDiskWriter.h" #include "DefaultDiskWriter.h"
@ -12,8 +17,6 @@
# include "Checksum.h" # include "Checksum.h"
#endif // ENABLE_MESSAGE_DIGEST #endif // ENABLE_MESSAGE_DIGEST
#include "Signature.h" #include "Signature.h"
#include <iostream>
#include <cppunit/extensions/HelperMacros.h>
namespace aria2 { namespace aria2 {
@ -411,11 +414,9 @@ void MetalinkProcessorTest::testMultiplePieces()
"<files>" "<files>"
"<file name=\"aria2.tar.bz2\">" "<file name=\"aria2.tar.bz2\">"
" <verification>" " <verification>"
" <pieces length=\"512\" type=\"md5\">"
" </pieces>"
" <pieces length=\"1024\" type=\"sha1\">" " <pieces length=\"1024\" type=\"sha1\">"
" </pieces>" " </pieces>"
" <pieces length=\"2048\" type=\"sha256\">" " <pieces length=\"512\" type=\"md5\">"
" </pieces>" " </pieces>"
" </verification>" " </verification>"
"</file>" "</file>"
@ -447,7 +448,7 @@ void MetalinkProcessorTest::testBadPieceNo()
" <hash piece=\"0\">abc</hash>" " <hash piece=\"0\">abc</hash>"
" <hash piece=\"xyz\">xyz</hash>" " <hash piece=\"xyz\">xyz</hash>"
" </pieces>" " </pieces>"
" <pieces length=\"512\" type=\"sha256\">" " <pieces length=\"1024\" type=\"sha1\">"
" <hash piece=\"0\">abc</hash>" " <hash piece=\"0\">abc</hash>"
" </pieces>" " </pieces>"
" </verification>" " </verification>"
@ -460,7 +461,9 @@ void MetalinkProcessorTest::testBadPieceNo()
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->entries[0];
SharedHandle<ChunkChecksum> c = e->chunkChecksum; SharedHandle<ChunkChecksum> c = e->chunkChecksum;
CPPUNIT_ASSERT_EQUAL(std::string("sha256"), c->getAlgo()); CPPUNIT_ASSERT(!c.isNull());
CPPUNIT_ASSERT_EQUAL((size_t)1024, c->getChecksumLength());
CPPUNIT_ASSERT_EQUAL(std::string("sha1"), c->getAlgo());
} catch(Exception& e) { } catch(Exception& e) {
CPPUNIT_FAIL(e.stackTrace()); CPPUNIT_FAIL(e.stackTrace());
} }
@ -477,7 +480,7 @@ void MetalinkProcessorTest::testBadPieceLength()
" <pieces length=\"xyz\" type=\"sha1\">" " <pieces length=\"xyz\" type=\"sha1\">"
" <hash piece=\"0\">abc</hash>" " <hash piece=\"0\">abc</hash>"
" </pieces>" " </pieces>"
" <pieces length=\"1024\" type=\"sha256\">" " <pieces length=\"1024\" type=\"sha1\">"
" <hash piece=\"0\">abc</hash>" " <hash piece=\"0\">abc</hash>"
" </pieces>" " </pieces>"
" </verification>" " </verification>"
@ -487,10 +490,12 @@ void MetalinkProcessorTest::testBadPieceLength()
try { try {
SharedHandle<Metalinker> m = proc->parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc->parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size());
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->entries[0];
SharedHandle<ChunkChecksum> c = e->chunkChecksum; SharedHandle<ChunkChecksum> c = e->chunkChecksum;
CPPUNIT_ASSERT(!c.isNull());
CPPUNIT_ASSERT_EQUAL(std::string("sha256"), c->getAlgo()); CPPUNIT_ASSERT_EQUAL((size_t)1024, c->getChecksumLength());
CPPUNIT_ASSERT_EQUAL(std::string("sha1"), c->getAlgo());
} catch(Exception& e) { } catch(Exception& e) {
CPPUNIT_FAIL(e.stackTrace()); CPPUNIT_FAIL(e.stackTrace());
} }
@ -507,7 +512,7 @@ void MetalinkProcessorTest::testUnsupportedType_piece()
" <pieces length=\"512\" type=\"ARIA2\">" " <pieces length=\"512\" type=\"ARIA2\">"
" <hash piece=\"0\">abc</hash>" " <hash piece=\"0\">abc</hash>"
" </pieces>" " </pieces>"
" <pieces length=\"1024\" type=\"sha256\">" " <pieces length=\"1024\" type=\"sha1\">"
" <hash piece=\"0\">abc</hash>" " <hash piece=\"0\">abc</hash>"
" </pieces>" " </pieces>"
" </verification>" " </verification>"
@ -520,7 +525,9 @@ void MetalinkProcessorTest::testUnsupportedType_piece()
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->entries[0];
SharedHandle<ChunkChecksum> c = e->chunkChecksum; SharedHandle<ChunkChecksum> c = e->chunkChecksum;
CPPUNIT_ASSERT_EQUAL(std::string("sha256"), c->getAlgo()); CPPUNIT_ASSERT(!c.isNull());
CPPUNIT_ASSERT_EQUAL((size_t)1024, c->getChecksumLength());
CPPUNIT_ASSERT_EQUAL(std::string("sha1"), c->getAlgo());
} catch(Exception& e) { } catch(Exception& e) {
CPPUNIT_FAIL(e.stackTrace()); CPPUNIT_FAIL(e.stackTrace());
} }