cleanup headers and especially #includes everywhere

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

diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index bf61746..71aa54f 100644 (file)
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -1,15 +1,20 @@
+#include <config.h>
+
+#include <apt-pkg/configuration.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 "assert.h"
+
 char *tempfile = NULL;
 int tempfile_fd = -1;
 
-void remove_tmpfile(void)
+static void remove_tmpfile(void)
 {
    if (tempfile_fd > 0)
       close(tempfile_fd);
@@ -19,20 +24,22 @@ void remove_tmpfile(void)
    }
 }
 
-int main(int argc, char *argv[])
+int main()
 {
+  _config->Set("APT::Sources::Use-Deb822", true);
+
    const char contents[] = ""
-      "Type: deb\n"
-      "Uri: http://ftp.debian.org/debian\n"
-      "Suite: stable\n"
-      "Section: main\n"
-      "Comment: Some random string\n"
-      " that can be very long\n"
+      "Types: deb\n"
+      "URIs: http://ftp.debian.org/debian\n"
+      "Suites: stable\n"
+      "Sections: main\n"
+      "Description: short\n"
+      " long description that can be very long\n"
       "\n"
-      "Type: deb\n"
-      "Uri: http://ftp.debian.org/debian\n"
-      "Suite: unstable\n"
-      "Section: main non-free\n"
+      "Types: deb\n"
+      "URIs: http://ftp.debian.org/debian\n"
+      "Suites: unstable\n"
+      "Sections: main non-free\n"
       ;
 
    FileFd fd;