Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

1 files changed, 38 insertions, 35 deletions

diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc
index e04ab261b..bec87601f 100644
--- a/test/libapt/indexcopytosourcelist_test.cc
+++ b/test/libapt/indexcopytosourcelist_test.cc
@@ -7,30 +7,35 @@
 #include <string>
 #include <stdio.h>
 
-#include "assert.h"
+#include <gtest/gtest.h>
 
 class NoCopy : public IndexCopy {
-public:
-   std::string ConvertToSourceList(std::string CD,std::string Path) {
-      IndexCopy::ConvertToSourceList(CD, Path);
-      return Path;
-   }
-   bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) { return false; }
-   bool RewriteEntry(FILE * /*Target*/, std::string /*File*/) { return false; }
-   const char *GetFileName() { return NULL; }
-   const char *Type() { return NULL; }
+   public:
+      std::string ConvertToSourceList(std::string CD,std::string Path) {
+	 IndexCopy::ConvertToSourceList(CD, Path);
+	 return Path;
+      }
+      bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) { return false; }
+      bool RewriteEntry(FILE * /*Target*/, std::string /*File*/) { return false; }
+      const char *GetFileName() { return NULL; }
+      const char *Type() { return NULL; }
 
 };
 
-int main() {
+TEST(IndexCopyTest, ConvertToSourceList)
+{
    NoCopy ic;
    std::string const CD("/media/cdrom/");
 
    char const * Releases[] = { "unstable", "wheezy-updates", NULL };
    char const * Components[] = { "main", "non-free", NULL };
 
-   for (char const ** Release = Releases; *Release != NULL; ++Release) {
-      for (char const ** Component = Components; *Component != NULL; ++Component) {
+   for (char const ** Release = Releases; *Release != NULL; ++Release)
+   {
+      SCOPED_TRACE(std::string("Release ") + *Release);
+      for (char const ** Component = Components; *Component != NULL; ++Component)
+      {
+	 SCOPED_TRACE(std::string("Component ") + *Component);
 	 std::string const Path = std::string("dists/") + *Release + "/" + *Component + "/";
 	 std::string const Binary = Path + "binary-";
 	 std::string const A = Binary + "armel/";
@@ -41,49 +46,47 @@ int main() {
 
 	 _config->Clear("APT");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), A);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), B);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), C);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(A, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
 
 	 _config->Clear("APT");
 	 _config->Set("APT::Architecture", "mips");
 	 _config->Set("APT::Architectures::", "mips");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), A);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), C);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(A, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
 
 	 _config->Clear("APT");
 	 _config->Set("APT::Architecture", "kfreebsd-mips");
 	 _config->Set("APT::Architectures::", "kfreebsd-mips");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), A);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), B);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(A, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
 
 	 _config->Clear("APT");
 	 _config->Set("APT::Architecture", "armel");
 	 _config->Set("APT::Architectures::", "armel");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), B);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), C);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(B, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
 
 	 _config->Clear("APT");
 	 _config->Set("APT::Architecture", "armel");
 	 _config->Set("APT::Architectures::", "armel");
 	 _config->Set("APT::Architectures::", "mips");
 	 APT::Configuration::getArchitectures(false);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + A), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + B), List);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + C), C);
-	 equals(ic.ConvertToSourceList("/media/cdrom/", CD + S), List);
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + A));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + B));
+	 EXPECT_EQ(C, ic.ConvertToSourceList("/media/cdrom/", CD + C));
+	 EXPECT_EQ(List, ic.ConvertToSourceList("/media/cdrom/", CD + S));
       }
    }
-
-   return 0;
 }