Changeset 9672 for main/waeup.kofa/trunk/src/waeup/kofa/tests

Timestamp:

17 Nov 2012, 22:43:58 (12 years ago)

Author:

uli

Message:

Try to rip out all UI-related stuff from w.k.reports. Put it into views.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/tests/test_reports.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_reports.py

@@ -211 +211 @@
         return
 
-    def test_description(self):
-        # IReportJobs provide a description of the started job
-        self.register_generator('report1')
-        args, kw = ['a', 'b'], dict(a=1, b=2)
-        job = AsyncReportJob(self.root_folder, 'report1', args=args, kw=kw)
-        self.assertEqual(
-            job.description,
-            "Report 1 ('a', 'b', 1, 2)")
-        # w/o args nor kwargs
-        job = AsyncReportJob(self.root_folder, 'report1')
-        self.assertEqual(
-            job.description,
-            'Report 1 ()')
-        # with args only
-        job = AsyncReportJob(self.root_folder, 'report1', args=args)
-        self.assertEqual(
-            job.description, "Report 1 ('a', 'b')")
-        # with keywords only
-        job = AsyncReportJob(self.root_folder, 'report1', kw=kw)
-        self.assertEqual(
-            job.description, "Report 1 (1, 2)")
-        return
-
-    def test_description_invalid_generator(self):
-        # We can get a description even with an invalid generator
-        job = AsyncReportJob(self.root_folder, 'NOT EXISTENT')
-        self.assertEqual(
-            job.description, u'Unregistered Report Generator ()')
-        # with args set (no kws)
-        job = AsyncReportJob(
-            self.root_folder, 'NOT EXISTENT', args=['a', 'b'])
-        self.assertEqual(
-            job.description, u"Unregistered Report Generator ('a', 'b')")
-        # with kw set (no args)
-        job = AsyncReportJob(
-            self.root_folder, 'NOT_EXISTENT', kw=dict(a=1, b=2))
-        self.assertEqual(
-            job.description, u'Unregistered Report Generator (1, 2)')
-        # with args and kws set
-        job = AsyncReportJob(
-            self.root_folder, 'NOT_EXISTENT', args=['a'], kw=dict(b=2))
-        self.assertEqual(
-            job.description, u"Unregistered Report Generator ('a', 2)")
-        return
-
-    def test_report_status(self):
-        # We can get a report status apart from the job status
-        job = AsyncReportJob(self.root_folder, 'report1')
-        self.assertEqual(job.report_status, u'running')
-        return
-
-    def test_report_status_failed(self):
-        # A failed job is reflected in report_status
-        job = AsyncReportJob(self.root_folder, None) # no report generator
-        setSite(self.root_folder)
-        self.assertTrue(job.failed is None)
-        manager = getUtility(IJobManager)
-        manager.put(job)
-        wait_for_result(job)
-        self.assertEqual(job.report_status, u'FAILED')
-        return
-
-    def test_report_status_finished(self):
-        # A finished report is reflected in report_status
-        job = AsyncReportJob(self.root_folder, 'report1')
-        setSite(self.root_folder)
-        manager = getUtility(IJobManager)
-        manager.put(job)
-        wait_for_result(job)
-        self.assertEqual(job.report_status, u'finished')
-        return
-
 class FakeJobWithResult(FakeJob):
 
@@ -383 +311 @@
             [('new', u'new', u'Report 1'),
              ('completed', u'completed', u'Report 1')]
-            )
-        return
-
-    def test_get_report_job_description(self):
-        # we can get the descriptions of jobs...
-        container = ReportJobContainer()
-        container.start_report_job('report1', 'alice')
-        container.start_report_job('report1', 'bob')
-        result = container.get_report_jobs_description(user_id='bob')
-        # we'll get the job id, a description and the status
-        self.assertEqual(
-            result,
-            [('2', 'Report 1 ()', u'running', False, False, True, None, 'bob'),]
             )
         return