From 1daf62f05c19e6f96d16d3688055dfd20d89d2b8 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 23 May 2011 20:37:54 +0200 Subject: - add tests - remove notes - fix minamount for subaccounts --- bank-eiffel/tests/test_account.e | 111 ++++++++++++++++++++++++++++++++------- bank-eiffel/tests/test_person.e | 37 ++++--------- 2 files changed, 101 insertions(+), 47 deletions(-) (limited to 'bank-eiffel/tests') diff --git a/bank-eiffel/tests/test_account.e b/bank-eiffel/tests/test_account.e index e1ca892..4430ab0 100644 --- a/bank-eiffel/tests/test_account.e +++ b/bank-eiffel/tests/test_account.e @@ -1,12 +1,3 @@ -note - description: "[ - Eiffel tests that can be executed by testing tool. - ]" - author: "EiffelStudio test wizard" - date: "$Date$" - revision: "$Revision$" - testing: "type/manual" - class TEST_ACCOUNT @@ -23,11 +14,13 @@ feature -- Test routines account1: ACCOUNT account2: ACCOUNT do - create person1.make ("SOME_SURNAME_1", "SOME_FIRSTNAME_1") - create person2.make ("SOME_SURNAME_2", "SOME_FIRSTNAME_2") - create person3.make ("SOME_SURNAME_3", "SOME_FIRSTNAME_3") + create person1.make ("PERSON1", "PERSON1") + create person2.make ("PERSON2", "PERSON2") + create person3.make ("PERSON3", "PERSON3") create account1.make (person1, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + assert("CREATE_EDIT_ACCOUNT_MINAMOUNT", account1.transfer_minamount = 2.0) + assert("CREATE_EDIT_ACCOUNT_SIGNER_1", account1.get_authorized_signers.count = 1) account1.add_authorized_signer (person2) account1.add_authorized_signer (person2) @@ -66,20 +59,100 @@ feature -- Test routines CREATE_STUDENTACCOUNT local - person: STUDENT + student: STUDENT + account: STUDENTACCOUNT + do + create student.make("STUDENT", "STUDENT") + create account.make(student, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + assert("CREATE_STUDENTACCOUNT", attached {ACCOUNT} account) + assert("CREATE_STUDENTACCOUNT_MINAMOUNT", account.transfer_minamount = 1.0) + end + + CREATE_STUDENTACCOUNT_ONLY_STUDENTS + local account: STUDENTACCOUNT + student: STUDENT + person: PERSON + retiree: RETIREE + retry_count: INTEGER do - create person.make("SOME_SURNAME", "SOME_FIRSTNAME") - create account.make(person, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + create student.make("STUDENT", "STUDENT") + create person.make("PERSON", "PERSON") + create retiree.make("RETIREE", "RETIREE") + + if retry_count = 0 then + create account.make(person, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + assert("CREATE_STUDENTACCOUNT_ONLY_STUDENTS_1", False) + elseif retry_count = 1 then + create account.make(retiree, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + assert("CREATE_STUDENTACCOUNT_ONLY_STUDENTS_2", False) + elseif retry_count = 2 then + create account.make(student, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + account.add_authorized_signer (create {STUDENT}.make("STUDENT2", "STUDENT2")) + assert("CREATE_STUDENTACCOUNT_ONE_STUDENT_ONLY_1", False) + elseif retry_count = 3 then + create account.make(student, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + account.add_authorized_signer (person) + assert("CREATE_STUDENTACCOUNT_ONE_STUDENT_ONLY_2", False) + elseif retry_count = 4 then + create account.make(student, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + account.add_authorized_signer (retiree) + assert("CREATE_STUDENTACCOUNT_ONE_STUDENT_ONLY_3", False) + end + rescue + if not (create {EXCEPTIONS}).is_developer_exception then + retry_count := retry_count + 1 + retry + end end CREATE_RETIREEACCOUNT local - person: RETIREE + retiree: RETIREE account: RETIREEACCOUNT do - create person.make("SOME_SURNAME", "SOME_FIRSTNAME") - create account.make(person, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + create retiree.make("RETIREE", "RETIREE") + create account.make(retiree, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + assert("CREATE_RETIREEACCOUNT", attached {ACCOUNT} account) + assert("CREATE_RETIREEACCOUNT_MINAMOUNT", account.transfer_minamount = 1.0) end -end + + CREATE_RETIREEACCOUNT_ONLY_RETIREES + local + account: RETIREEACCOUNT + retiree: RETIREE + person: PERSON + student: STUDENT + retry_count: INTEGER + do + create retiree.make("RETIREE", "RETIREE") + create person.make("PERSON", "PERSON") + create student.make("STUDENT", "STUDENT") + + if retry_count = 0 then + create account.make(person, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + assert("CREATE_RETIREEACCOUNT_ONLY_RETIREES_1", False) + elseif retry_count = 1 then + create account.make(student, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + assert("CREATE_RETIREEACCOUNT_ONLY_RETIREES_2", False) + elseif retry_count = 2 then + create account.make(retiree, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + account.add_authorized_signer (create {RETIREE}.make("RETIREE2", "RETIREE2")) + assert("CREATE_RETIREEACCOUNT_ONE_RETIREE_ONLY_1", False) + elseif retry_count = 3 then + create account.make(retiree, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + account.add_authorized_signer (person) + assert("CREATE_RETIREEACCOUNT_ONE_RETIREE_ONLY_2", False) + elseif retry_count = 4 then + create account.make(retiree, 0.01, 0.02, -50.0, [0.01, 0.022], [0.01, 0.02], [-100.0, -50.0]) + account.add_authorized_signer (student) + assert("CREATE_RETIREEACCOUNT_ONE_RETIREE_ONLY_3", False) + end + rescue + if not (create {EXCEPTIONS}).is_developer_exception then + retry_count := retry_count + 1 + retry + end + end +end diff --git a/bank-eiffel/tests/test_person.e b/bank-eiffel/tests/test_person.e index 67aea34..f42767c 100644 --- a/bank-eiffel/tests/test_person.e +++ b/bank-eiffel/tests/test_person.e @@ -1,12 +1,3 @@ -note - description: "[ - Eiffel tests that can be executed by testing tool. - ]" - author: "EiffelStudio test wizard" - date: "$Date$" - revision: "$Revision$" - testing: "type/manual" - class TEST_PERSON @@ -14,10 +5,11 @@ inherit EQA_TEST_SET feature -- Test routines - CREATE_EDIT_PERSON local person: PERSON + student: STUDENT + retiree: RETIREE do create person.make("SOME_SURNAME_1", "SOME_FIRSTNAME_1") assert("CREATE_EDIT_PERSON_FIRSTNAME_1", person.firstname.is_equal("SOME_FIRSTNAME_1")) @@ -27,31 +19,28 @@ feature -- Test routines assert("CREATE_EDIT_PERSON_FIRSTNAME_2", person.firstname.is_equal("SOME_FIRSTNAME_2")) person.surname := "SOME_SURNAME_2" assert("CREATE_EDIT_PERSON_SURNAME_2", person.surname.is_equal("SOME_SURNAME_2")) + + create student.make ("STUDENT_SURNAME", "STUDENT_FIRSTNAME") + assert("CREATE_EDIT_PERSON_STUDENT", attached {PERSON} student) + create retiree.make ("RETIREE_SURNAME", "RETIREE_FIRSTNAME") + assert("CREATE_EDIT_PERSON_RETIREE", attached {PERSON} student) end CREATE_EDIT_PERSON_EMPTY_SURNAME local person: PERSON retry_count: INTEGER - doretry: BOOLEAN do if retry_count = 0 then - doretry := True create person.make("", "SOME_FIRSTNAME") - doretry := False assert("CREATE_EDIT_PERSON_EMPTY_SURNAME_1", False) elseif retry_count = 1 then - doretry := False create person.make("SOME_SURNAME", "SOME_FIRSTNAME") - doretry := True person.surname := "" - doretry := False assert("CREATE_EDIT_PERSON_EMPTY_SURNAME_3", False) - else - doretry := False end rescue - if doretry then + if not (create {EXCEPTIONS}).is_developer_exception then retry_count := retry_count + 1 retry end @@ -61,25 +50,17 @@ feature -- Test routines local person: PERSON retry_count: INTEGER - doretry: BOOLEAN do if retry_count = 0 then - doretry := True create person.make("SOME_SURNAME", "") - doretry := False assert("CREATE_EDIT_PERSON_EMPTY_FIRSTNAME_1", False) elseif retry_count = 1 then - doretry := False create person.make("SOME_SURNAME", "SOME_FIRSTNAME") - doretry := True person.firstname := "" - doretry := False assert("CREATE_EDIT_PERSON_EMPTY_FIRSTNAME_3", False) - else - doretry := False end rescue - if doretry then + if not (create {EXCEPTIONS}).is_developer_exception then retry_count := retry_count + 1 retry end -- cgit v1.2.3