Revision: 2636
Author: janne.t.harkonen
Date: Tue Mar 16 01:12:12 2010
Log: refactored
http://code.google.com/p/robotframework/source/detail?r=2636
Modified:
/trunk/proto/atdd_example/test_vacalc.py
/trunk/proto/atdd_example/vacalc.py
=======================================
--- /trunk/proto/atdd_example/test_vacalc.py Mon Mar 15 13:54:40 2010
+++ /trunk/proto/atdd_example/test_vacalc.py Tue Mar 16 01:12:12 2010
@@ -16,19 +16,20 @@
def test_adding_employee(self):
store = EmployeeStore(None)
- employee = store.add_employee('Test Employee Store', '2000-12-24')
- self.assertEquals(employee.name, 'Test Employee Store')
- self.assertEquals(employee.startdate, datetime.date(2000, 12, 24))
- self.assertEquals(store._employees, {employee.name: employee})
+ employee = Employee('Test Employee Store', '2000-12-24')
+ store.add_employee(employee)
+ self.assertEquals(store.get_all_employees(), [employee])
def test_adding_duplicate_employee(self):
store = EmployeeStore(None)
- employee = store.add_employee('test', '2000-12-24')
- self.assertRaises(VacalcError,
store.add_employee, 'test', '2001-01-24')
+ store.add_employee(Employee('test', '2000-12-24'))
+ self.assertRaises(VacalcError, store.add_employee,
+ Employee('test', '2001-01-24'))
def test_getting_employee(self):
store = EmployeeStore(None)
- employee = store.add_employee('Mr Foo Bar', '1990-02-03')
+ employee = Employee('Mr Foo Bar', '1990-02-03')
+ store.add_employee(employee)
self.assertEquals(store.get_employee('Mr Foo Bar'), employee)
def test_get_missing_employee(self):
@@ -36,6 +37,5 @@
self.assertRaises(VacalcError, store.get_employee, 'I am not here')
-
if __name__ == '__main__':
unittest.main()
=======================================
--- /trunk/proto/atdd_example/vacalc.py Tue Mar 16 01:11:53 2010
+++ /trunk/proto/atdd_example/vacalc.py Tue Mar 16 01:12:12 2010
@@ -31,13 +31,15 @@
except KeyError:
raise VacalcError("Employee '%s' not found" % name)
- def add_employee(self, name, startdate):
- if name in self._employees:
- raise VacalcError("Employee '%s' already exists in the
system" % name)
- employee = Employee(name, startdate)
+ def get_all_employees(self):
+ return self._employees.values()
+
+ def add_employee(self, employee):
+ if employee.name in self._employees:
+ raise VacalcError("Employee '%s' already exists in the
system" %
+ employee.name)
self._employees[employee.name] = employee
self._serialize(employee)
- return employee
def _serialize(self, employee):
if not self._db_file:
@@ -68,7 +70,8 @@
return employee.count_vacation(year)
def add_employee(self, name, startdate):
- employee = self._employeestore.add_employee(name, startdate)
+ employee = Employee(name, startdate)
+ self._employeestore.add_employee(employee)
return "Successfully added employee '%s'." % employee.name
def get_employee(self, name):
