From 8cf73c3b4dd2b0b0d9c724685b46aa9f3b5db044 Mon Sep 17 00:00:00 2001
From: Andreas Waidler <arandes@programmers.at>
Date: Sun, 26 Jun 2011 15:43:12 +0200
Subject: [PATCH] Now testing ascending/descending order of items properly.

---
 TODO                                            |   4 +-
 tests_usr/sample.sh                             | 154 ++++++++++++------------
 tests_usr/{sample.rss => sample_ascending.rss}  |  16 +--
 tests_usr/{sample.rss => sample_descending.rss} |   0
 4 files changed, 89 insertions(+), 85 deletions(-)
 copy tests_usr/{sample.rss => sample_ascending.rss} (100%)
 rename tests_usr/{sample.rss => sample_descending.rss} (100%)

diff --git a/TODO b/TODO
index 93c745b..2c003d0 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,8 @@
-* test: item_order_ascending.sh -> sample_asc.sh
 * Make directories/items read-only.
 * no date -> current date. write all items with date >=
   feed date.
 * check whether dates are handled properly (timezones!)
-* fix remaining bugs (see README)
-* support lastBuildDate and pubDate for channels
 * replace assertions by proper error handling
 * clean state after a tag level is left, so we can pipe
   multiple streams, one after another, into one instance.
+* fix remaining bugs (see README)
diff --git a/tests_usr/sample.sh b/tests_usr/sample.sh
index 299cd4a..5c2618a 100755
--- a/tests_usr/sample.sh
+++ b/tests_usr/sample.sh
@@ -27,78 +27,84 @@ item1_link()   { assert_value  "feed/Item 1" link  "/dev/random"; }
 item2_link()   { assert_value  "feed/Item 2" link  "/dev/urandom"; }
 item3_link()   { assert_value  "feed/Item 3" link  "/dev/null"; }
 
+test_sample()
+{
+	echo "Running agg on sample feed ($1) (directory missing)..."
+	agg_run "sample_$1.rss"
+	t feed_exists
+	t feed_date
+	t item1_exists
+	t item2_exists
+	t item3_exists
+	t item1_date
+	t item2_date
+	t item3_date
+	t item1_title
+	t item2_title
+	t item3_title
+	t item1_desc
+	t item2_desc
+	t item3_desc
+	t item1_link
+	t item2_link
+	t item3_link
+	
+	echo "Running agg sample feed ($1) (up to date) ..."
+	agg_run "sample_$1.rss"
+	t feed_exists
+	t feed_date
+	t item1_exists
+	t item2_exists
+	t item3_exists
+	t item1_date
+	t item2_date
+	t item3_date
+	t item1_title
+	t item2_title
+	t item3_title
+	t item1_desc
+	t item2_desc
+	t item3_desc
+	t item1_link
+	t item2_link
+	t item3_link
+	
+	echo "Deleting old news..."
+	agg_clean feed
+	t feed_exists
+	t feed_date
+	t feed_empty
+	
+	echo "Running agg on sample feed ($1) (directory up to date but empty)..."
+	agg_run "sample_$1.rss"
+	t feed_exists
+	t feed_date
+	t feed_empty
+	
+	echo "Changing mtime..."
+	touch -md "1970-01-01 00:00:00.000000000 +0000" feed
+	
+	echo "Running agg on sample feed ($1) (directory outdated and empty)..."
+	agg_run "sample_$1.rss"
+	t feed_exists
+	t feed_date
+	t item1_exists
+	t item2_exists
+	t item3_exists
+	t item1_date
+	t item2_date
+	t item3_date
+	t item1_title
+	t item2_title
+	t item3_title
+	t item1_desc
+	t item2_desc
+	t item3_desc
+	t item1_link
+	t item2_link
+	t item3_link
+}
 
-echo "Running agg on sample feed (directory missing)..."
-agg_run sample.rss
-t feed_exists
-t feed_date
-t item1_exists
-t item2_exists
-t item3_exists
-t item1_date
-t item2_date
-t item3_date
-t item1_title
-t item2_title
-t item3_title
-t item1_desc
-t item2_desc
-t item3_desc
-t item1_link
-t item2_link
-t item3_link
-
-echo "Running agg sample feed (up to date) ..."
-agg_run sample.rss 
-t feed_exists
-t feed_date
-t item1_exists
-t item2_exists
-t item3_exists
-t item1_date
-t item2_date
-t item3_date
-t item1_title
-t item2_title
-t item3_title
-t item1_desc
-t item2_desc
-t item3_desc
-t item1_link
-t item2_link
-t item3_link
-
-echo "Deleting old news..."
-agg_clean feed
-t feed_exists
-t feed_date
-t feed_empty
-
-echo "Running agg on sample feed (directory up to date but empty)..."
-agg_run sample.rss 
-t feed_exists
-t feed_date
-t feed_empty
-
-echo "Changing mtime..."
-touch -md "1970-01-01 00:00:00.000000000 +0000" feed
-
-echo "Running agg on sample feed (directory outdated and empty)..."
-agg_run sample.rss 
-t feed_exists
-t feed_date
-t item1_exists
-t item2_exists
-t item3_exists
-t item1_date
-t item2_date
-t item3_date
-t item1_title
-t item2_title
-t item3_title
-t item1_desc
-t item2_desc
-t item3_desc
-t item1_link
-t item2_link
-t item3_link
+test_sample descending
+rm -rf feed
+test_sample ascending
diff --git a/tests_usr/sample.rss b/tests_usr/sample_ascending.rss
similarity index 100%
copy from tests_usr/sample.rss
copy to tests_usr/sample_ascending.rss
index f6b4628..a45a4ec 100644
--- a/tests_usr/sample.rss
+++ b/tests_usr/sample_ascending.rss
@@ -10,10 +10,10 @@
 		</description>
 
 		<item>
-			<title>Item 1</title>
-			<pubDate>Sat, 02 Oct 2010 22:43:23 +0200</pubDate>
-			<description>Random item.</description>
-			<link>/dev/random</link>
+			<title>Item 3</title>
+			<pubDate>Thu, 01 Apr 2010 12:54:06 +0200</pubDate>
+			<description>No item.</description>
+			<link>/dev/null</link>
 		</item>
 		<item>
 			<title>Item 2</title>
@@ -22,10 +22,10 @@
 			<link>/dev/urandom</link>
 		</item>
 		<item>
-			<title>Item 3</title>
-			<pubDate>Thu, 01 Apr 2010 12:54:06 +0200</pubDate>
-			<description>No item.</description>
-			<link>/dev/null</link>
+			<title>Item 1</title>
+			<pubDate>Sat, 02 Oct 2010 22:43:23 +0200</pubDate>
+			<description>Random item.</description>
+			<link>/dev/random</link>
 		</item>
 	</channel>
 </rss>
diff --git a/tests_usr/sample.rss b/tests_usr/sample_descending.rss
similarity index 100%
rename from tests_usr/sample.rss
rename to tests_usr/sample_descending.rss
-- 
2.11.4.GIT