Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/hostels/tests.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/hostels/tests.py (modified) (9 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/hostels/tests.py

@@ -19 +19 @@
 Tests for hostels and their UI components.
 """
-import os
 import shutil
 import tempfile
@@ -37 +36 @@
 from waeup.kofa.hostels.container import HostelsContainer
 from waeup.kofa.hostels.hostel import Hostel, Bed
-from waeup.kofa.hostels.batching import HostelProcessor
-from waeup.kofa.hostels.export import BedExporter, HostelExporter
 from waeup.kofa.testing import (FunctionalLayer, FunctionalTestCase)
 from waeup.kofa.students.student import Student
 from waeup.kofa.students.accommodation import BedTicket
 from waeup.kofa.university.department import Department
-
-HOSTEL_SAMPLE_DATA = open(
-    os.path.join(os.path.dirname(__file__), 'sample_hostel_data.csv'),
-    'rb').read()
-
-HOSTEL_HEADER_FIELDS = HOSTEL_SAMPLE_DATA.split(
-    '\n')[0].split(',')
 
 class HostelsContainerTestCase(FunctionalTestCase):
@@ -152 +142 @@
         # Create a bed
         bed = Bed()
-        bed.bed_id = u'hall_block_room_bed'
+        bed.bed_id = u'xyz'
         bed.bed_number = 1
-        bed.bed_type = u'a_b_c'
+        bed.bed_type = u'abc'
         self.app['hostels'][hostel.hostel_id][bed.bed_id] = bed
 
@@ -167 +157 @@
         self.browser.handleErrors = False
 
-        self.logfile = os.path.join(
-            self.app['datacenter'].storage, 'logs', 'hostels.log')
-
     def tearDown(self):
         super(HostelsFullSetup, self).tearDown()
@@ -187 +174 @@
         # We can find a certain bed
         cat = queryUtility(ICatalog, name='beds_catalog')
-        results = cat.searchResults(bed_type=(u'a_b_c', u'a_b_c'))
+        results = cat.searchResults(bed_type=(u'abc', u'abc'))
         results = [x for x in results] # Turn results generator into list
         assert len(results) == 1
-        assert results[0] is self.app['hostels']['hall-x']['hall_block_room_bed']
+        assert results[0] is self.app['hostels']['hall-x']['xyz']
 
     def test_search_by_owner(self):
         # We can find a certain bed
-        myobj = self.app['hostels']['hall-x']['hall_block_room_bed']
+        myobj = self.app['hostels']['hall-x']['xyz']
         myobj.owner = u'abc'
         notify(grok.ObjectModifiedEvent(myobj))
@@ -201 +188 @@
         results = [x for x in results] # Turn results generator into list
         assert len(results) == 1
-        assert results[0] is self.app['hostels']['hall-x']['hall_block_room_bed']
+        assert results[0] is self.app['hostels']['hall-x']['xyz']
 
 class HostelsUITests(HostelsFullSetup):
@@ -313 +300 @@
         self.assertMatches(
           '...No allocated bed selected...', self.browser.contents)
-        # Managers can manually allocate students after cancellation
+        # Managers can manually allocate studenst after cancellation
         self.browser.open(self.container_path + '/hall-1/hall-1_A_101_A')
         self.browser.getControl(name="form.owner").value = [self.student_id]
@@ -347 +334 @@
         # Also the number of the bed has changed.
         self.assertFalse(new_number == old_number)
-        # The number of occupied bed are displayed on container page.
-        self.browser.open(self.container_path)
-        self.assertTrue('1 of 8' in self.browser.contents)
         # Remove entire hostel
         self.browser.open(self.manage_container_path)
@@ -362 +346 @@
         results = [x for x in results]
         assert len(results) == 0
-
-    def test_clear_hostels(self):
-        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open(self.container_path)
-        self.browser.getLink("Manage accommodation").click()
-        self.browser.getControl("Add hostel").click()
-        self.browser.getControl("Create hostel").click()
-        hall = self.app['hostels']['hall-1']
-        hall.blocks_for_female = ['A','B']
-        hall.rooms_per_floor = 1
-        hall.beds_for_fresh = ['A']
-        hall.beds_for_returning = ['B']
-        hall.beds_for_final = ['C']
-        hall.beds_for_all = ['D','E']
-        self.browser.open(self.container_path + '/hall-1/manage')
-        self.browser.getControl("Update all beds").click()
-        cat = queryUtility(ICatalog, name='beds_catalog')
-        results = cat.searchResults(bed_type=(None, None))
-        self.assertEqual(len(results), 11)
-        self.browser.getControl("Clear hostel").click()
-        self.assertEqual(len(self.app['hostels']['hall-1']), 0)
-        # Only the bed in hall-x remains in the catalog.
-        results = cat.searchResults(bed_type=(None, None))
-        self.assertEqual(len(results), 1)
-        # We can clear all hostels at the same time.
-        self.browser.open(self.manage_container_path)
-        self.browser.getControl("Clear all hostels").click()
-        results = cat.searchResults(bed_type=(None, None))
-        self.assertEqual(len(results), 0)
-        # Both actions have been logged.
-        logcontent = open(self.logfile).read()
-        self.assertTrue('INFO - zope.mgr - hostels.browser.HostelManageFormPage'
-                        ' - hall-1 - cleared' in logcontent)
-        self.assertTrue('zope.mgr - hostels.browser.HostelsContainerManagePage'
-                        ' - hostels - all hostels cleared' in logcontent)
-
-class ExportTests(HostelsFullSetup):
-
-    layer = FunctionalLayer
-
-    def setUp(self):
-        super(ExportTests, self).setUp()
-        self.workdir = tempfile.mkdtemp()
-        self.outfile = os.path.join(self.workdir, 'myoutput.csv')
-        return
-
-    def test_export_hostels(self):
-        exporter = HostelExporter()
-        exporter.export_all(self.app, self.outfile)
-        result = open(self.outfile, 'rb').read()
-        self.assertEqual(
-            result,
-            'beds_for_all,beds_for_final,beds_for_fresh,beds_for_pre,'
-            'beds_for_returning,beds_reserved,blocks_for_female,'
-            'blocks_for_male,floors_per_block,hostel_id,hostel_name,'
-            'rooms_per_floor,sort_id,special_handling\r\n,,,,,[],,,1,'
-            'hall-x,Hall 1,2,10,regular\r\n'
-            )
-        return
-
-    def test_export_beds(self):
-        exporter = BedExporter()
-        exporter.export_all(self.app, self.outfile)
-        result = open(self.outfile, 'rb').read()
-        self.assertEqual(
-            result,
-            'bed_id,bed_number,bed_type,owner,hall,block,room,bed,'
-            'special_handling,sex,bt\r\nhall_block_room_bed,1,a_b_c,,'
-            'hall,block,room,bed,a,b,c\r\n'
-            )
-        return
-
-class HostelProcessorTest(HostelsFullSetup):
-
-    layer = FunctionalLayer
-
-    def test_import(self):
-        self.processor = HostelProcessor()
-        self.workdir = tempfile.mkdtemp()
-        self.csv_file = os.path.join(self.workdir, 'sample_student_data.csv')
-        open(self.csv_file, 'wb').write(HOSTEL_SAMPLE_DATA)
-        num, num_warns, fin_file, fail_file = self.processor.doImport(
-            self.csv_file, HOSTEL_HEADER_FIELDS)
-        self.assertEqual(num_warns,0)
-        self.assertEqual(len(self.app['hostels'].keys()), 11) # including hall-x
-        self.assertEqual(self.app['hostels'][
-            'block-a-upper-hostel'].hostel_id,'block-a-upper-hostel')
-        self.assertEqual(self.app['hostels'][
-            'block-a-upper-hostel'].beds_for_final, ['A', 'B'])
-        logcontent = open(self.logfile).read()
-        self.assertTrue(
-            "Hostel Processor - block-a-upper-hostel - "
-            "Record updated: beds_for_pre=['G'], floors_per_block=1, "
-            "beds_for_final=['A', 'B'], rooms_per_floor=32, "
-            "blocks_for_male=[], hostel_id=block-a-upper-hostel, "
-            "sort_id=20, beds_for_returning=['C', 'D'], "
-            "hostel_name=Block A Upper Hostel, beds_for_fresh=['E', 'F'], "
-            "blocks_for_female=['A'], beds_for_all=[], beds_reserved=[]"
-            in logcontent)
-        shutil.rmtree(os.path.dirname(fin_file))
-        return