2010-02-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Use vector instead of deque for MetalinkEntry and MetalinkResource
	objects.
	* src/Metalink2RequestGroup.cc
	* src/Metalink2RequestGroup.h
	* src/MetalinkEntry.cc
	* src/MetalinkEntry.h
	* src/MetalinkHelper.cc
	* src/MetalinkHelper.h
	* src/Metalinker.cc
	* src/Metalinker.h
	* src/main.cc
	* test/MetalinkEntryTest.cc
	* test/MetalinkHelperTest.cc
	* test/MetalinkProcessorTest.cc
	* test/MetalinkerTest.cc

4 files changed, 23 insertions, 15 deletions

diff --git a/test/MetalinkEntryTest.cc b/test/MetalinkEntryTest.cc
index 2074bf82..be4314cb 100644
--- a/test/MetalinkEntryTest.cc
+++ b/test/MetalinkEntryTest.cc
@@ -79,7 +79,7 @@ void MetalinkEntryTest::testDropUnsupportedResource() {
   CPPUNIT_ASSERT_EQUAL((size_t)2, entry->resources.size());
 #endif // ENABLE_MESSAGE_DIGEST
   
-  std::deque<SharedHandle<MetalinkResource> >::const_iterator itr =
+  std::vector<SharedHandle<MetalinkResource> >::const_iterator itr =
     entry->resources.begin();
   CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP,
                        (*itr++)->type);
@@ -113,7 +113,7 @@ void MetalinkEntryTest::testSetLocationPriority()
 
   const char* locationsSrc[] = { "jp", "al", "ro" };
 
-  std::deque<std::string> locations(&locationsSrc[0], &locationsSrc[3]);
+  std::vector<std::string> locations(&locationsSrc[0], &locationsSrc[3]);
 
   entry->setLocationPriority(locations, -100);
 
diff --git a/test/MetalinkHelperTest.cc b/test/MetalinkHelperTest.cc
index 3886ac9b..e6f7a840 100644
--- a/test/MetalinkHelperTest.cc
+++ b/test/MetalinkHelperTest.cc
@@ -30,7 +30,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MetalinkHelperTest );
 void MetalinkHelperTest::testParseAndQuery()
 {
   Option option;
-  std::deque<SharedHandle<MetalinkEntry> > result;
+  std::vector<SharedHandle<MetalinkEntry> > result;
   MetalinkHelper::parseAndQuery(result, "test.xml", &option);
   CPPUNIT_ASSERT_EQUAL((size_t)5, result.size());
 }
@@ -39,7 +39,7 @@ void MetalinkHelperTest::testParseAndQuery_version()
 {
   Option option;
   option.put(PREF_METALINK_VERSION, "0.5.1");
-  std::deque<SharedHandle<MetalinkEntry> > result;
+  std::vector<SharedHandle<MetalinkEntry> > result;
   MetalinkHelper::parseAndQuery(result, "test.xml", &option);
   CPPUNIT_ASSERT_EQUAL((size_t)1, result.size());
   SharedHandle<MetalinkEntry> entry = result.front();
diff --git a/test/MetalinkProcessorTest.cc b/test/MetalinkProcessorTest.cc
index 9821bc80..b5ef067e 100644
--- a/test/MetalinkProcessorTest.cc
+++ b/test/MetalinkProcessorTest.cc
@@ -147,7 +147,7 @@ void MetalinkProcessorTest::testParseFileV4_attrs()
   MetalinkProcessor proc;
   SharedHandle<Metalinker> m = proc.parseFile("metalink4-attrs.xml");
   CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size());
-  std::deque<SharedHandle<MetalinkResource> > resources =
+  std::vector<SharedHandle<MetalinkResource> > resources =
     m->entries[0]->resources;
   CPPUNIT_ASSERT_EQUAL((size_t)3, resources.size());
   CPPUNIT_ASSERT_EQUAL(999999, resources[0]->priority);
@@ -172,7 +172,8 @@ void MetalinkProcessorTest::testParseFile()
   try {
     SharedHandle<Metalinker> metalinker = proc.parseFile("test.xml");
 
-    std::deque<SharedHandle<MetalinkEntry> >::iterator entryItr = metalinker->entries.begin();
+    std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr =
+      metalinker->entries.begin();
 
     SharedHandle<MetalinkEntry> entry1 = *entryItr;
     CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), entry1->getPath());
@@ -202,7 +203,8 @@ void MetalinkProcessorTest::testParseFile()
         "-----END PGP SIGNATURE-----"),
        entry1->getSignature()->getBody());
 
-    std::deque<SharedHandle<MetalinkResource> >::iterator resourceItr1 = entry1->resources.begin();
+    std::vector<SharedHandle<MetalinkResource> >::iterator resourceItr1 =
+      entry1->resources.begin();
     SharedHandle<MetalinkResource> resource1 = *resourceItr1;
     CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP, resource1->type);
     CPPUNIT_ASSERT_EQUAL(std::string("jp"), resource1->location);
@@ -294,7 +296,8 @@ void MetalinkProcessorTest::testParseFromBinaryStream()
   try {
     SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
 
-    std::deque<SharedHandle<MetalinkEntry> >::iterator entryItr = m->entries.begin();
+    std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr =
+      m->entries.begin();
     SharedHandle<MetalinkEntry> entry1 = *entryItr;
     CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), entry1->getPath());
   } catch(Exception& e) {
@@ -348,7 +351,8 @@ void MetalinkProcessorTest::testBadSize()
   try {
     SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
 
-    std::deque<SharedHandle<MetalinkEntry> >::iterator entryItr = m->entries.begin();
+    std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr =
+      m->entries.begin();
     SharedHandle<MetalinkEntry> e = *entryItr;
     CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), e->getPath());
     CPPUNIT_ASSERT_EQUAL((uint64_t)0ULL, e->getLength());
@@ -380,7 +384,8 @@ void MetalinkProcessorTest::testBadMaxConn()
   try {
     SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
 
-    std::deque<SharedHandle<MetalinkEntry> >::iterator entryItr = m->entries.begin();
+    std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr =
+      m->entries.begin();
     SharedHandle<MetalinkEntry> e = *entryItr;
     CPPUNIT_ASSERT_EQUAL((uint64_t)43743838ULL, e->getLength());
   } catch(Exception& e) {
@@ -412,7 +417,8 @@ void MetalinkProcessorTest::testNoName()
   try {
     SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
     CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size());
-    std::deque<SharedHandle<MetalinkEntry> >::iterator entryItr = m->entries.begin();
+    std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr =
+      m->entries.begin();
     SharedHandle<MetalinkEntry> e = *entryItr;
     CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), e->getPath());
   } catch(Exception& e) {
diff --git a/test/MetalinkerTest.cc b/test/MetalinkerTest.cc
index 7a46e307..fcb82cc6 100644
--- a/test/MetalinkerTest.cc
+++ b/test/MetalinkerTest.cc
@@ -1,7 +1,9 @@
 #include "Metalinker.h"
-#include "MetalinkEntry.h"
+
 #include <cppunit/extensions/HelperMacros.h>
 
+#include "MetalinkEntry.h"
+
 namespace aria2 {
 
 class MetalinkerTest:public CppUnit::TestFixture {
@@ -44,7 +46,7 @@ void MetalinkerTest::testQueryEntry() {
   language = "ja-JP";
   os = "Linux-m68k";
   {
-    std::deque<SharedHandle<MetalinkEntry> > result;
+    std::vector<SharedHandle<MetalinkEntry> > result;
     metalinker->queryEntry(result, version, language, os);
     CPPUNIT_ASSERT_EQUAL((size_t)1, result.size());
     CPPUNIT_ASSERT_EQUAL(std::string("0.5.1"), result.at(0)->version);
@@ -55,7 +57,7 @@ void MetalinkerTest::testQueryEntry() {
   language = "";
   os = "";
   {
-    std::deque<SharedHandle<MetalinkEntry> > result;
+    std::vector<SharedHandle<MetalinkEntry> > result;
     metalinker->queryEntry(result, version, language, os);
     CPPUNIT_ASSERT_EQUAL((size_t)0, result.size());
   }
@@ -64,7 +66,7 @@ void MetalinkerTest::testQueryEntry() {
   language = "";
   os = "";
   {
-    std::deque<SharedHandle<MetalinkEntry> > result;
+    std::vector<SharedHandle<MetalinkEntry> > result;
     metalinker->queryEntry(result, version, language, os);
     CPPUNIT_ASSERT_EQUAL((size_t)1, result.size());
     CPPUNIT_ASSERT_EQUAL(std::string("0.5.2"), result.at(0)->version);