started to add simple parseUrl implementation

10 files changed, 47 insertions, 15 deletions

diff --git a/tests/url/GNUmakefile b/tests/url/GNUmakefile
index 81d7a0e..be50549 100644
--- a/tests/url/GNUmakefile
+++ b/tests/url/GNUmakefile
@@ -27,5 +27,10 @@ local_clean:
 local_distclean:
 
 local_test:
-	@-./exec_test test1 "output normal URL" http://www.andreasbaumann.cc/index.html
-	@-./exec_test test2 "normalize a relative URL" http://www.andreasbaumann.cc/index.html /software.html
+	@-./exec_test test1 test1 "parse illegal protocol" www.andreasbaumann.cc
+	@-./exec_test test1 test2 "parse normal start URL without slash" http://www.andreasbaumann.cc
+	@-./exec_test test1 test3 "parse normal start URL with slash" http://www.andreasbaumann.cc/
+	@-./exec_test test1 test4 "parse normal URL" http://www.andreasbaumann.cc/index.html
+	@-./exec_test test1 test5 "parse normal URL with default port" http://www.andreasbaumann.cc:80/index.html
+	@-./exec_test test1 test6 "parse normal URL with non-standard port" http://www.andreasbaumann.cc:8080/index.html
+	@-./exec_test test2 test100 "normalize a relative URL" http://www.andreasbaumann.cc/index.html /software.html
diff --git a/tests/url/exec_test b/tests/url/exec_test
index 8628c2d..92b656f 100755
--- a/tests/url/exec_test
+++ b/tests/url/exec_test
@@ -2,9 +2,11 @@
 
 BINARY=$1
 shift
+ID=$1
+shift
 TITLE=$1
 shift
 
-printf "$BINARY: $TITLE .. "
-./$BINARY $* >$BINARY.RES 2>&1
-diff $BINARY.MUST $BINARY.RES > $BINARY.DIFF && printf "OK\n" || printf "ERROR\n"
+printf "$ID: $TITLE .. "
+./$BINARY $* >$ID.RES 2>&1
+diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n"
diff --git a/tests/url/test1.MUST b/tests/url/test1.MUST
index 38a3a27..1b6af48 100644
--- a/tests/url/test1.MUST
+++ b/tests/url/test1.MUST
@@ -1,6 +1 @@
-protocol: http
-port: 80
-domain: www.andreasbaumann.cc
-path: /index.html
-fragment: 
-
+Illegal URL!
diff --git a/tests/url/test1.cpp b/tests/url/test1.cpp
index 677bf10..ac6a086 100644
--- a/tests/url/test1.cpp
+++ b/tests/url/test1.cpp
@@ -18,13 +18,19 @@ int main( int argc, char *argv[] )
 	URLNormalizer *normalizer = new SimpleURLNormalizer( );
 	URL url = normalizer->parseUrl( urlstring );
 	delete normalizer;
+
+	if( url == URL::Null ) {
+		cerr << "Illegal URL!" << endl;
+		return 1;
+	}
 	
 	cout 	<< "protocol: " << url.protocol( ) << endl
 		<< "port: " << url.port( ) << endl
 		<< "domain: " << url.domain( ) << endl
 		<< "path: " << url.path( ) << endl
-		<< "fragment: " << url.fragment( ) << endl
-		<< endl;
+		<< "fragment: " << url.fragment( ) << endl;
+
+	cout	<< "URL: " << url << endl;
 		
 	return 0;
 }
diff --git a/tests/url/test100.MUST b/tests/url/test100.MUST
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/url/test100.MUST
diff --git a/tests/url/test2.MUST b/tests/url/test2.MUST
index 4718213..3172868 100644
--- a/tests/url/test2.MUST
+++ b/tests/url/test2.MUST
@@ -1,6 +1,6 @@
 protocol: http
 port: 80
 domain: www.andreasbaumann.cc
-path: /software.html
+path: /
 fragment: 
-
+URL: http://www.andreasbaumann.cc/
diff --git a/tests/url/test3.MUST b/tests/url/test3.MUST
new file mode 100644
index 0000000..3172868
--- /dev/null
+++ b/tests/url/test3.MUST
@@ -0,0 +1,6 @@
+protocol: http
+port: 80
+domain: www.andreasbaumann.cc
+path: /
+fragment: 
+URL: http://www.andreasbaumann.cc/
diff --git a/tests/url/test4.MUST b/tests/url/test4.MUST
new file mode 100644
index 0000000..f7d1220
--- /dev/null
+++ b/tests/url/test4.MUST
@@ -0,0 +1,6 @@
+protocol: http
+port: 80
+domain: www.andreasbaumann.cc
+path: /index.html
+fragment: 
+URL: http://www.andreasbaumann.cc/index.html
diff --git a/tests/url/test5.MUST b/tests/url/test5.MUST
new file mode 100644
index 0000000..f7d1220
--- /dev/null
+++ b/tests/url/test5.MUST
@@ -0,0 +1,6 @@
+protocol: http
+port: 80
+domain: www.andreasbaumann.cc
+path: /index.html
+fragment: 
+URL: http://www.andreasbaumann.cc/index.html
diff --git a/tests/url/test6.MUST b/tests/url/test6.MUST
new file mode 100644
index 0000000..5ed0d82
--- /dev/null
+++ b/tests/url/test6.MUST
@@ -0,0 +1,6 @@
+protocol: http
+port: 8080
+domain: www.andreasbaumann.cc
+path: /index.html
+fragment: 
+URL: http://www.andreasbaumann.cc:8080/index.html