- Revision
- 15930
- Author
- grant
- Date
- 2007-11-27 17:22:18 -0800 (Tue, 27 Nov 2007)
Log Message
[APP] Move tests up to top level of project
Modified Paths
Added Paths
- branches/rearchitecture/Chandler-App/test_chandler.py
- branches/rearchitecture/Chandler-App/test_domain.py
- branches/rearchitecture/Chandler-App/test_minicalendar.py
- branches/rearchitecture/Chandler-App/test_sidebar.py
Removed Paths
Diff
Deleted: branches/rearchitecture/Chandler-App/ocap/chandler/test_chandler.py (15929 => 15930)
--- branches/rearchitecture/Chandler-App/ocap/chandler/test_chandler.py 2007-11-28 00:07:41 UTC (rev 15929) +++ branches/rearchitecture/Chandler-App/ocap/chandler/test_chandler.py 2007-11-28 01:22:18 UTC (rev 15930) @@ -1,3 +0,0 @@ -from test_domain import * -from test_minicalendar import * -from test_sidebar import *
Deleted: branches/rearchitecture/Chandler-App/ocap/chandler/test_domain.py (15929 => 15930)
--- branches/rearchitecture/Chandler-App/ocap/chandler/test_domain.py 2007-11-28 00:07:41 UTC (rev 15929) +++ branches/rearchitecture/Chandler-App/ocap/chandler/test_domain.py 2007-11-28 01:22:18 UTC (rev 15930) @@ -1,113 +0,0 @@ -import unittest -import datetime -import peak.events.trellis as trellis -import ocap.chandler.domain as domain - - - -class MiniCalendarEventTestCase(unittest.TestCase): - start = datetime.datetime(2007, 8, 5, 9) - end = datetime.datetime(2007, 8, 5, 10) - day = datetime.date( 2007, 8, 5 ) - - def testInit(self): - event = domain.Event() - - self.failIf(event is None) - self.failIf(event.start) - self.failIf(event.end) - - def _getEvent(self): - return domain.Event(start=self.start, title="test") - - def testSimpleEvent(self): - event = self._getEvent() - - self.failIf(event is None) - self.assertEqual(event.start, self.start) - self.assertEqual(event.end, self.end) - self.assertEqual(event.title, "test") - - event.start += datetime.timedelta(hours=2) - self.assertEqual(event.duration, datetime.timedelta(hours=1)) - - def testManyDays(self): - days1 = domain.ManyDays(days=domain._makeDays(2007, 8, xrange(4, 10), - (9,))) - days2 = domain.ManyDays(days=domain._makeDays(2007, 8, xrange(5, 12), - (11, 13))) - self.assertEqual(len(days1[self.day].events), 1) - self.assertEqual(len(days2[self.day].events), 2) - - combined = days1 + days2 - self.assertEqual(len(combined[self.day].events), 3) - self.assertEqual(len(combined[datetime.date(2007, 8, 11)].events), 2) - - def testBusy(self): - event = self._getEvent() - self.assertEqual(event.busyHoursForDay(self.day), 1) - self.assertEqual(event.busyHoursForDay(self.day + one_day), 0) - - days = domain.ManyDays(days=domain._makeDays(2007, 8, [5], (9,10,11))) - day_instance = days[self.day] - self.assertEqual(day_instance.busy, 3) - - day_instance.events.add(event) - self.assertEqual(day_instance.busy, 4) - -class ListModelTestCase(unittest.TestCase): - items = (1, 2, 3) - - def testInit(self): - listModel = domain.ListModel() - - self.failIf(listModel is None) - self.failIf(listModel.selected) - self.failIf(listModel) - - - def testWithItem(self): - listModel = domain.ListModel(data="" - - self.failUnless(list(listModel) == list(self.items)) - self.failUnlessEqual(len(listModel), 3) - - listModel.selected.add(2) - self.failUnless(2 in listModel.selected) - - def testRemoveItem(self): - listModel = domain.ListModel(data="" - - listModel.selected.add(1) - self.failIf(2 in listModel.selected) - self.failUnless(1 in listModel.selected) - - listModel.data.remove(1) - self.failIf(1 in listModel.selected) - self.failIf(1 in listModel) - - def testMultiple(self): - listModel = domain.ListModel(data="" - - listModel.selected.update([1,2]) - - # Now remove multiple items from the full set of items. They - # should get removed from the listModel's selected, too. - # <Use a modifier so that they're processed as a single unit> - @domain.trellis.modifier - def removeSome(): - listModel.selected.remove(1) - listModel.selected.remove(2) - - removeSome() - self.failIf(listModel.selected) - - def testSelectedNonexistent(self): - listModel = domain.ListModel(data="" - listModel.selected.add(4) - self.failIf(4 in listModel.selected) - self.failIf(4 in listModel.data) - - -if __name__ == "__main__": - unittest.main()
Deleted: branches/rearchitecture/Chandler-App/ocap/chandler/test_minicalendar.py (15929 => 15930)
--- branches/rearchitecture/Chandler-App/ocap/chandler/test_minicalendar.py 2007-11-28 00:07:41 UTC (rev 15929) +++ branches/rearchitecture/Chandler-App/ocap/chandler/test_minicalendar.py 2007-11-28 01:22:18 UTC (rev 15930) @@ -1,54 +0,0 @@ -import domain -from ocap.chandler import minicalendar, preview -import unittest -from datetime import datetime, date, time, timedelta -import peak.events.trellis as trellis - -class MiniCalendarPresentationTestCase(unittest.TestCase): - - def testPresentation(self): - presentation = minicalendar.MiniCalendarPresentation() - self.assertEqual(presentation.oldDate, None) - self.assertEqual(presentation.selectedDate, None) - self.assertEqual(presentation.firstVisibleDate, None) - - day = date(2007,11,20) - presentation.selectedDate = day - self.assertEqual(presentation.firstVisibleDate, day.replace(day=1)) - self.assertEqual(presentation.oldDate, None) - - presentation.selectedDate = date(2007,12,20) - self.assertEqual(presentation.oldDate, day) - self.assertEqual(presentation.firstVisibleDate, day.replace(day=1)) - -class PreviewAreaPresentationTestCase(unittest.TestCase): - - day = date(2007,11,18) - event1 = domain.Event(title = "event1", - start = datetime.combine(day, time(8))) - event2 = domain.Event(title = "an event that starts with the letter a", - start = datetime.combine(day, time(8))) - event3 = domain.Event(title = "event3", - start = datetime.combine(day, time(7))) - event4 = domain.Event(title = "another event", - start = datetime.combine(day, time(8)), - duration = timedelta(hours=2)) - events = [event1, event2, event3, event4] - day_of_events = domain.Day(date=day, events=trellis.Set(events)) - - days = domain.ManyDays(days=trellis.Dict({day : day_of_events})) - - - def testPresentation(self): - presentation = preview.PreviewAreaPresentation(selected_date = self.day, - days=self.days) - - presentation.active_view = 'calendar' - self.assertEqual(presentation.previewed_day, presentation.today) - self.assertEqual(presentation.event_list, []) - - presentation.active_view = 'list' - self.assertEqual(presentation.previewed_day, self.day) - expected_order = [self.event3, self.event2, self.event1, self.event4] - self.assertEqual(presentation.event_list, expected_order) -
Deleted: branches/rearchitecture/Chandler-App/ocap/chandler/test_sidebar.py (15929 => 15930)
--- branches/rearchitecture/Chandler-App/ocap/chandler/test_sidebar.py 2007-11-28 00:07:41 UTC (rev 15929) +++ branches/rearchitecture/Chandler-App/ocap/chandler/test_sidebar.py 2007-11-28 01:22:18 UTC (rev 15930) @@ -1,49 +0,0 @@ -import unittest -import peak.events.trellis as trellis -import ocap.chandler.interaction as interaction - -class InteractionTestCase(unittest.TestCase): - - def test(self): - app = interaction.Application() - - self.failUnlessEqual(len(app.sidebar), 7) - self.failUnlessEqual(set(app.sidebar.selected), set([app.sidebar[0]])) - - def testSorting(self): - app = interaction.Application() - - # A new User sidebar entry with a large negative sortKey - # should appear first in the user items - entry = interaction.UserSidebarEntry(sortKey=-100) - app.sidebar.data.add(entry) - self.failUnless(entry is app.sidebar[4]) - - entry = interaction.SidebarEntry(sortKey=-1000) - app.sidebar.data.add(entry) - self.failUnless(entry is app.sidebar[0]) - - -class SidebarEntryTestCase(unittest.TestCase): - - def testInit(self): - collection = interaction.UserSidebarEntry() - self.failIf(collection.hue is None) - - def testHues(self): - collections = [interaction.UserSidebarEntry() for i in xrange(4)] - special = interaction.UserSidebarEntry(hue=45) - collections.extend(interaction.UserSidebarEntry() for i in xrange(5)) - - self.failUnlessEqual(special.hue, 45) - - self.failUnlessEqual(set(x.hue for x in collections), - set(interaction.HUES)) - - # Make sure that predefined hues cycle - for i in xrange(9): - self.failUnlessEqual(interaction.UserSidebarEntry().hue, - collections[i].hue) - -if __name__ == "__main__": - unittest.main() \ No newline at end of file
Modified: branches/rearchitecture/Chandler-App/setup.py (15929 => 15930)
--- branches/rearchitecture/Chandler-App/setup.py 2007-11-28 00:07:41 UTC (rev 15929) +++ branches/rearchitecture/Chandler-App/setup.py 2007-11-28 01:22:18 UTC (rev 15930) @@ -26,7 +26,7 @@ description="Chandler Application (Pilot Project)", long_description = open('README.txt').read(), # get_description(), install_requires=['Chandler-Platform'], - test_suite = 'ocap.chandler.test_chandler', + test_suite = 'test_chandler', packages = find_packages(), namespace_packages = ['ocap', 'ocap.chandler'], entry_points = """
Copied: branches/rearchitecture/Chandler-App/test_chandler.py (from rev 15884, branches/rearchitecture/Chandler-App/ocap/chandler/test_chandler.py) ( => )
Copied: branches/rearchitecture/Chandler-App/test_domain.py (from rev 15846, branches/rearchitecture/Chandler-App/ocap/chandler/test_domain.py)Copied: branches/rearchitecture/Chandler-App/test_minicalendar.py (from rev 15846, branches/rearchitecture/Chandler-App/ocap/chandler/test_minicalendar.py) (15846 => 15930)
--- branches/rearchitecture/Chandler-App/ocap/chandler/test_minicalendar.py 2007-11-15 03:03:16 UTC (rev 15846) +++ branches/rearchitecture/Chandler-App/test_minicalendar.py 2007-11-28 01:22:18 UTC (rev 15930) @@ -0,0 +1,54 @@ +import ocap.chandler.domain as domain +from ocap.chandler import minicalendar, preview +import unittest +from datetime import datetime, date, time, timedelta +import peak.events.trellis as trellis + +class MiniCalendarPresentationTestCase(unittest.TestCase): + + def testPresentation(self): + presentation = minicalendar.MiniCalendarPresentation() + self.assertEqual(presentation.oldDate, None) + self.assertEqual(presentation.selectedDate, None) + self.assertEqual(presentation.firstVisibleDate, None) + + day = date(2007,11,20) + presentation.selectedDate = day + self.assertEqual(presentation.firstVisibleDate, day.replace(day=1)) + self.assertEqual(presentation.oldDate, None) + + presentation.selectedDate = date(2007,12,20) + self.assertEqual(presentation.oldDate, day) + self.assertEqual(presentation.firstVisibleDate, day.replace(day=1)) + +class PreviewAreaPresentationTestCase(unittest.TestCase): + + day = date(2007,11,18) + event1 = domain.Event(title = "event1", + start = datetime.combine(day, time(8))) + event2 = domain.Event(title = "an event that starts with the letter a", + start = datetime.combine(day, time(8))) + event3 = domain.Event(title = "event3", + start = datetime.combine(day, time(7))) + event4 = domain.Event(title = "another event", + start = datetime.combine(day, time(8)), + duration = timedelta(hours=2)) + events = [event1, event2, event3, event4] + day_of_events = domain.Day(date=day, events=trellis.Set(events)) + + days = domain.ManyDays(days=trellis.Dict({day : day_of_events})) + + + def testPresentation(self): + presentation = preview.PreviewAreaPresentation(selected_date = self.day, + days=self.days) + + presentation.active_view = 'calendar' + self.assertEqual(presentation.previewed_day, presentation.today) + self.assertEqual(presentation.event_list, []) + + presentation.active_view = 'list' + self.assertEqual(presentation.previewed_day, self.day) + expected_order = [self.event3, self.event2, self.event1, self.event4] + self.assertEqual(presentation.event_list, expected_order) +
Copied: branches/rearchitecture/Chandler-App/test_sidebar.py (from rev 15884, branches/rearchitecture/Chandler-App/ocap/chandler/test_sidebar.py) ( => )
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
