Browse Source

write a proper testcase replacing the print-only uri.cc test

debian/1.8.y
David Kalnischkies 11 years ago
parent
commit
bf5438c190
  1. 2
      test/libapt/globalerror_test.cc
  2. 6
      test/libapt/makefile
  3. 112
      test/libapt/uri_test.cc
  4. 6
      test/makefile
  5. 34
      test/uri.cc

2
test/libapt/globalerror_test.cc

@ -101,7 +101,7 @@ int main(int argc,char *argv[])
longText.clear();
for (size_t i = 0; i < 50; ++i)
longText.append("РезийбёбAZ");
equals(_error->Warning(longText.c_str()), false);
equals(_error->Warning("%s", longText.c_str()), false);
equals(_error->PopMessage(text), false);
equals(text, longText);

6
test/libapt/makefile

@ -52,3 +52,9 @@ PROGRAM = StrUtil${BASENAME}
SLIBS = -lapt-pkg
SOURCE = strutil_test.cc
include $(PROGRAM_H)
# test the URI parsing stuff
PROGRAM = URI${BASENAME}
SLIBS = -lapt-pkg
SOURCE = uri_test.cc
include $(PROGRAM_H)

112
test/libapt/uri_test.cc

@ -0,0 +1,112 @@
#include <apt-pkg/strutl.h>
#include "assert.h"
int main() {
// Basic stuff
{
URI U("http://www.debian.org:90/temp/test");
equals("http", U.Access);
equals("", U.User);
equals("", U.Password);
equals(90, U.Port);
equals("www.debian.org", U.Host);
equals("/temp/test", U.Path);
} {
URI U("http://jgg:foo@ualberta.ca/blah");
equals("http", U.Access);
equals("jgg", U.User);
equals("foo", U.Password);
equals(0, U.Port);
equals("ualberta.ca", U.Host);
equals("/blah", U.Path);
} {
URI U("file:/usr/bin/foo");
equals("file", U.Access);
equals("", U.User);
equals("", U.Password);
equals(0, U.Port);
equals("", U.Host);
equals("/usr/bin/foo", U.Path);
} {
URI U("cdrom:Moo Cow Rom:/debian");
equals("cdrom", U.Access);
equals("", U.User);
equals("", U.Password);
equals(0, U.Port);
equals("Moo Cow Rom", U.Host);
equals("/debian", U.Path);
} {
URI U("gzip:./bar/cow");
equals("gzip", U.Access);
equals("", U.User);
equals("", U.Password);
equals(0, U.Port);
equals(".", U.Host);
equals("/bar/cow", U.Path);
} {
URI U("ftp:ftp.fr.debian.org/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb");
equals("ftp", U.Access);
equals("", U.User);
equals("", U.Password);
equals(0, U.Port);
equals("ftp.fr.debian.org", U.Host);
equals("/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", U.Path);
}
// RFC 2732 stuff
{
URI U("http://[1080::8:800:200C:417A]/foo");
equals("http", U.Access);
equals("", U.User);
equals("", U.Password);
equals(0, U.Port);
equals("1080::8:800:200C:417A", U.Host);
equals("/foo", U.Path);
} {
URI U("http://[::FFFF:129.144.52.38]:80/index.html");
equals("http", U.Access);
equals("", U.User);
equals("", U.Password);
equals(80, U.Port);
equals("::FFFF:129.144.52.38", U.Host);
equals("/index.html", U.Path);
} {
URI U("http://[::FFFF:129.144.52.38:]:80/index.html");
equals("http", U.Access);
equals("", U.User);
equals("", U.Password);
equals(80, U.Port);
equals("::FFFF:129.144.52.38:", U.Host);
equals("/index.html", U.Path);
} {
URI U("http://[::FFFF:129.144.52.38:]/index.html");
equals("http", U.Access);
equals("", U.User);
equals("", U.Password);
equals(0, U.Port);
equals("::FFFF:129.144.52.38:", U.Host);
equals("/index.html", U.Path);
}
/* My Evil Corruption of RFC 2732 to handle CDROM names! Fun for
the whole family! */
{
URI U("cdrom:[The Debian 1.2 disk, 1/2 R1:6]/debian/");
equals("cdrom", U.Access);
equals("", U.User);
equals("", U.Password);
equals(0, U.Port);
equals("The Debian 1.2 disk, 1/2 R1:6", U.Host);
equals("/debian/", U.Path);
} {
URI U("cdrom:Foo Bar Cow/debian/");
equals("cdrom", U.Access);
equals("", U.User);
equals("", U.Password);
equals(0, U.Port);
equals("Foo Bar Cow", U.Host);
equals("/debian/", U.Path);
}
return 0;
}

6
test/makefile

@ -11,12 +11,6 @@ SLIBS =
SOURCE = mthdcat.cc
include $(PROGRAM_H)
# Program for testing methods
PROGRAM=uritest
SLIBS = -lapt-pkg
SOURCE = uri.cc
include $(PROGRAM_H)
# Scratch program to test incomplete code fragments in
PROGRAM=scratch-test
SLIBS = -lapt-inst -lapt-pkg

34
test/uri.cc

@ -1,34 +0,0 @@
#include <apt-pkg/strutl.h>
#include <stdio.h>
void Test(const char *Foo)
{
URI U(Foo);
printf("%s a='%s' u='%s' p='%s' port='%u'\n h='%s' p='%s'\n",
Foo,U.Access.c_str(),U.User.c_str(),U.Password.c_str(),
U.Port,U.Host.c_str(),U.Path.c_str());
}
int main()
{
// Basic stuff
Test("http://www.debian.org:90/temp/test");
Test("http://jgg:foo@ualberta.ca/blah");
Test("file:/usr/bin/foo");
Test("cdrom:Moo Cow Rom:/debian");
Test("gzip:./bar/cow");
// RFC 2732 stuff
Test("http://[1080::8:800:200C:417A]/foo");
Test("http://[::FFFF:129.144.52.38]:80/index.html");
Test("http://[::FFFF:129.144.52.38:]:80/index.html");
Test("http://[::FFFF:129.144.52.38:]/index.html");
/* My Evil Corruption of RFC 2732 to handle CDROM names! Fun for
the whole family! */
Test("cdrom:[The Debian 1.2 disk, 1/2 R1:6]/debian/");
Test("cdrom:Foo Bar Cow/debian/");
Test("ftp:ftp.fr.debian.org/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb");
}
Loading…
Cancel
Save