From 91df6fcc7c7de1d3b30239129f0fb1f150fa5533 Mon Sep 17 00:00:00 2001
From: Daniel Grana <dangra@gmail.com>
Date: Mon, 31 Aug 2009 08:58:29 -0300
Subject: [PATCH] test genspider in a single testcase

---
 scrapy/tests/test_commands.py | 54 +++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/scrapy/tests/test_commands.py b/scrapy/tests/test_commands.py
index 0d1e79788..ee489db87 100644
--- a/scrapy/tests/test_commands.py
+++ b/scrapy/tests/test_commands.py
@@ -54,41 +54,41 @@ class CommandTest(ProjectTest):
         self.env['SCRAPY_SETTINGS_MODULE'] = '%s.settings' % self.project_name
 
 
+class GenspiderCommandTest(CommandTest):
+
+    def test_template_default(self, *args):
+        self.assertEqual(0, self.call('genspider', 'testspider', 'test.com', *args))
+        assert exists(join(self.proj_mod_path, 'spiders', 'testspider.py'))
+        self.assertEqual(1, self.call('genspider', 'otherspider', 'test.com'))
+
+    def test_template_basic(self):
+        self.test_template_default('--template=basic')
+
+    def test_template_csvfeed(self):
+        self.test_template_default('--template=csvfeed')
+
+    def test_template_xmlfeed(self):
+        self.test_template_default('--template=xmlfeed')
+
+    def test_template_crawl(self):
+        self.test_template_default('--template=crawl')
+
+    def test_list(self):
+        self.assertEqual(0, self.call('genspider', '--list'))
+
+    def test_dump(self):
+        self.assertEqual(0, self.call('genspider', '--dump'))
+        self.assertEqual(0, self.call('genspider', '--dump', '--template=basic'))
+
+
 class MiscCommandsTest(CommandTest):
 
     def test_crawl(self):
         self.assertEqual(0, self.call('crawl'))
 
-    def test_genspider_subcommands(self):
-        self.assertEqual(0, self.call('genspider', '--list'))
-        self.assertEqual(0, self.call('genspider', '--dump'))
-        self.assertEqual(0, self.call('genspider', '--dump', '--template=basic'))
-
     def test_list(self):
         self.assertEqual(0, self.call('list'))
 
 
-class BaseGenspiderTest(CommandTest):
-    template = 'basic'
-
-    def test_genspider(self):
-        self.assertEqual(0, self.call('genspider', 'testspider', 'test.com', \
-                '--template=%s' % self.template))
-        assert exists(join(self.proj_mod_path, 'spiders', 'testspider.py'))
-        self.assertEqual(1, self.call('genspider', 'otherspider', 'test.com'))
-
-
-class CrawlGenspiderTest(BaseGenspiderTest):
-    template = 'crawl'
-
-
-class CsvFeedGenspiderTest(BaseGenspiderTest):
-    template = 'csvfeed'
-
-
-class XMLFeedGenspiderTest(BaseGenspiderTest):
-    template = 'xmlfeed'
-
-
 if __name__ == '__main__':
     unittest.main()