From b76f736d8dac0da9a2c1b306a4f06fe9009438dd Mon Sep 17 00:00:00 2001 From: Gavin Carr Date: Thu, 20 Dec 2007 06:25:45 +0000 Subject: [PATCH] Test suite updates. --- t/static_basic/config/blosxom.conf | 2 - t/static_basic/config/plugins.conf | 2 - t/static_basic/expected/2006/07/19/index.rss | 48 ++++++++------------ t/static_basic/expected/2006/07/index.rss | 48 ++++++++------------ t/static_basic/expected/2006/index.rss | 48 ++++++++------------ t/static_basic/expected/index.rss | 48 ++++++++------------ t/templates/config/blosxom.conf | 2 - t/templates/config/plugins.conf | 2 - t/templates/expected.html | 34 ++++++++++++++ t/templates/expected.rss | 34 ++++++++++++++ t/templates/spec.yaml | 11 +---- 11 files changed, 141 insertions(+), 138 deletions(-) delete mode 100644 t/static_basic/config/plugins.conf delete mode 100644 t/templates/config/plugins.conf create mode 100644 t/templates/expected.html create mode 100644 t/templates/expected.rss diff --git a/t/static_basic/config/blosxom.conf b/t/static_basic/config/blosxom.conf index 18ddf7a..7d8ef26 100644 --- a/t/static_basic/config/blosxom.conf +++ b/t/static_basic/config/blosxom.conf @@ -1,6 +1,4 @@ $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data"; -$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf"; -$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc"; $static_dir = "$ENV{BLOSXOM_CONFIG_DIR}/../static"; $static_password = 'static'; @static_flavours = qw/html rss/; diff --git a/t/static_basic/config/plugins.conf b/t/static_basic/config/plugins.conf deleted file mode 100644 index d3be1b1..0000000 --- a/t/static_basic/config/plugins.conf +++ /dev/null @@ -1,2 +0,0 @@ -storydate -rss20 diff --git a/t/static_basic/expected/2006/07/19/index.rss b/t/static_basic/expected/2006/07/19/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/07/19/index.rss +++ b/t/static_basic/expected/2006/07/19/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/2006/07/index.rss b/t/static_basic/expected/2006/07/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/07/index.rss +++ b/t/static_basic/expected/2006/07/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/2006/index.rss b/t/static_basic/expected/2006/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/index.rss +++ b/t/static_basic/expected/2006/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/index.rss b/t/static_basic/expected/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/index.rss +++ b/t/static_basic/expected/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/templates/config/blosxom.conf b/t/templates/config/blosxom.conf index 27d4b12..ae83e48 100644 --- a/t/templates/config/blosxom.conf +++ b/t/templates/config/blosxom.conf @@ -1,3 +1 @@ $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data"; -$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf"; -$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc"; diff --git a/t/templates/config/plugins.conf b/t/templates/config/plugins.conf deleted file mode 100644 index d3be1b1..0000000 --- a/t/templates/config/plugins.conf +++ /dev/null @@ -1,2 +0,0 @@ -storydate -rss20 diff --git a/t/templates/expected.html b/t/templates/expected.html new file mode 100644 index 0000000..22ee8a0 --- /dev/null +++ b/t/templates/expected.html @@ -0,0 +1,34 @@ +Content-Type: text/xhtml; charset=UTF-8 + + + + + + My Weblog + + + +

My Weblog

+

+

2006-07-19

+

Lorem ipsum

+
Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet +ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor +sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym +ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas +cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon +ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer +tyr wuz de ramas cora dola tym ipso hor.
+

posted at: 22:54 | path: | permanent link to this entry

+ + + diff --git a/t/templates/expected.rss b/t/templates/expected.rss new file mode 100644 index 0000000..a03fc8a --- /dev/null +++ b/t/templates/expected.rss @@ -0,0 +1,34 @@ +Content-Type: text/xml; charset=ISO-8859-1 + + + + + + + + My Weblog + http://localhost/./blosxom.cgi + Yet another Blosxom weblog. + en + + + Lorem ipsum + http://localhost/./blosxom.cgi/2006/07/19#1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet +ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor +sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym +ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas +cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon +ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer +tyr wuz de ramas cora dola tym ipso hor. + + + diff --git a/t/templates/spec.yaml b/t/templates/spec.yaml index 167aadb..93883d3 100644 --- a/t/templates/spec.yaml +++ b/t/templates/spec.yaml @@ -1,13 +1,4 @@ tests: - - "" - - "expected/index.html" - - - - "path=/index.rss" - - "expected/index.rss" - - - - "path=/web/index.html" - - "expected/web/index.html" - - - - "path=/web/index.rss" - - "expected/web/index.rss" + - expected.html -- 2.30.2