Revision: 2642
Author: janne.t.harkonen
Date: Tue Mar 16 03:49:15 2010
Log: Implemented show_vacation
http://code.google.com/p/robotframework/source/detail?r=2642
Modified:
/trunk/proto/atdd_example/vacalc.py
=======================================
--- /trunk/proto/atdd_example/vacalc.py Tue Mar 16 03:35:51 2010
+++ /trunk/proto/atdd_example/vacalc.py Tue Mar 16 03:49:15 2010
@@ -118,9 +118,10 @@
def __init__(self, employeestore):
self._employeestore = employeestore
- def vacation(self, name, year):
- employee = self._employeestore.get_employee(name, year)
- return employee.count_vacation(year)
+ def show_vacation(self, name, year):
+ employee = self._employeestore.get_employee(name)
+ vacation = Vacation(employee._startdate, int(year))
+ return "%s has %d vacation days in year %s" % (name,
vacation.days, year)
def add_employee(self, name, startdate):
employee = Employee(name, startdate)
