bring back deb822 sources.list entries as .sources

[apt.git] / test / libapt / sourcelist_test.cc

diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index 0300ce929d38840668a760f7585bf2f7018870a1..83c441092f6622e43db9b31199c6a58ae7ce1f13 100644 (file)
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -1,55 +1,39 @@
+#include <config.h>
+

 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/sourcelist.h>

-#include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>

 
 

-#include "assert.h"
+#include <string>

 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 

-char *tempfile = NULL;
-int tempfile_fd = -1;
+#include <gtest/gtest.h>

 
 

-void remove_tmpfile(void)
-{
-   if (tempfile_fd > 0)
-      close(tempfile_fd);
-   if (tempfile != NULL) {
-      unlink(tempfile);
-      free(tempfile);
-   }
-}
+#include "file-helpers.h"

 
 

-int main(int argc, char *argv[])
+TEST(SourceListTest,ParseFileDeb822)

 {
 {

-  _config->Set("APT::Sources::Use-Deb822", true);
-
-   const char contents[] = ""
+   FileFd fd;
+   std::string tempfile;
+   createTemporaryFile("parsefiledeb822.XXXXXX.sources", fd, &tempfile,

       "Types: deb\n"
       "URIs: http://ftp.debian.org/debian\n"
       "Suites: stable\n"
       "Types: deb\n"
       "URIs: http://ftp.debian.org/debian\n"
       "Suites: stable\n"

-      "Sections: main\n"
+      "Components: main\n"

       "Description: short\n"
       " long description that can be very long\n"
       "\n"
       "Types: deb\n"
       "URIs: http://ftp.debian.org/debian\n"
       "Suites: unstable\n"
       "Description: short\n"
       " long description that can be very long\n"
       "\n"
       "Types: deb\n"
       "URIs: http://ftp.debian.org/debian\n"
       "Suites: unstable\n"

-      "Sections: main non-free\n"
-      ;
-
-   FileFd fd;
-   atexit(remove_tmpfile);
-   tempfile = strdup("apt-test.XXXXXXXX");
-   tempfile_fd = mkstemp(tempfile);
-
-   /* (Re-)Open (as FileFd), write and seek to start of the temp file */
-   equals(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite), true);
-   equals(fd.Write(contents, strlen(contents)), true);
-   equals(fd.Seek(0), true);
+      "Components: main non-free\n");
+   fd.Close();

 
 

-   pkgSourceList sources(tempfile);
-   equals(sources.size(), 2);
+   pkgSourceList sources;
+   EXPECT_EQ(true, sources.Read(tempfile));
+   EXPECT_EQ(2, sources.size());

 
 

-   /* clean up handled by atexit handler, so just return here */
-   return 0;
+   if (tempfile.empty() == false)
+      unlink(tempfile.c_str());

 }
 }