From 0edc8e98e274aadadc09f58f26beac2557eb3659 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 22 May 2011 17:21:36 +0200 Subject: some changes --- bank-eiffel/tests/test_account.e | 6 +++--- bank-eiffel/tests/test_person.e | 39 +++------------------------------------ 2 files changed, 6 insertions(+), 39 deletions(-) (limited to 'bank-eiffel/tests') diff --git a/bank-eiffel/tests/test_account.e b/bank-eiffel/tests/test_account.e index 1820c45..7f16cc7 100644 --- a/bank-eiffel/tests/test_account.e +++ b/bank-eiffel/tests/test_account.e @@ -15,13 +15,13 @@ inherit feature -- Test routines - CREATE_ACCOUNT - -- New test routine + CREATE_EDIT_ACCOUNT local person1: PERSON account: ACCOUNT do - create person1.make ("VORNAME", "NACHNAME") + create person1.make ("SOME_SURNAME", "SOME_FIRSTNAME") + create account.make (person1) --assert ("not_implemented", False) end diff --git a/bank-eiffel/tests/test_person.e b/bank-eiffel/tests/test_person.e index cd66ccb..a501deb 100644 --- a/bank-eiffel/tests/test_person.e +++ b/bank-eiffel/tests/test_person.e @@ -23,15 +23,10 @@ feature -- Test routines assert("CREATE_EDIT_PERSON_FIRSTNAME_1", person.firstname.is_equal("SOME_FIRSTNAME_1")) assert("CREATE_EDIT_PERSON_SURNAME_1", person.surname.is_equal("SOME_SURNAME_1")) - person.set_firstname("SOME_FIRSTNAME_2") + person.firstname := "SOME_FIRSTNAME_2" assert("CREATE_EDIT_PERSON_FIRSTNAME_2", person.firstname.is_equal("SOME_FIRSTNAME_2")) - person.set_surname("SOME_SURENAME_2") - assert("CREATE_EDIT_PERSON_SURNAME_2", person.surname.is_equal("SOME_SURENAME_2")) - - person.firstname := "SOME_FIRSTNAME_3" - assert("CREATE_EDIT_PERSON_FIRSTNAME_3", person.firstname.is_equal("SOME_FIRSTNAME_3")) - person.surname := "SOME_SURNAME_3" - assert("CREATE_EDIT_PERSON_SURNAME_3", person.surname.is_equal("SOME_SURNAME_3")) + person.surname := "SOME_SURNAME_2" + assert("CREATE_EDIT_PERSON_SURNAME_2", person.surname.is_equal("SOME_SURNAME_2")) end CREATE_EDIT_PERSON_EMPTY_SURNAME @@ -63,20 +58,6 @@ feature -- Test routines person.surname := void doretry := False assert("CREATE_EDIT_PERSON_EMPTY_SURNAME_4", False) - elseif retry_count = 4 then - doretry := False - create person.make("SOME_SURNAME", "SOME_FIRSTNAME") - doretry := True - person.set_surname("") - doretry := False - assert("CREATE_EDIT_PERSON_EMPTY_SURNAME_5", False) - elseif retry_count = 5 then - doretry := False - create person.make("SOME_SURNAME", "SOME_FIRSTNAME") - doretry := True - person.set_surname(void) - doretry := False - assert("CREATE_EDIT_PERSON_EMPTY_SURNAME_6", False) else doretry := False end @@ -116,20 +97,6 @@ feature -- Test routines person.firstname := void doretry := False assert("CREATE_EDIT_PERSON_EMPTY_FIRSTNAME_4", False) - elseif retry_count = 4 then - doretry := False - create person.make("SOME_SURNAME", "SOME_FIRSTNAME") - doretry := True - person.set_firstname("") - doretry := False - assert("CREATE_EDIT_PERSON_EMPTY_FIRSTNAME_5", False) - elseif retry_count = 5 then - doretry := False - create person.make("SOME_SURNAME", "SOME_FIRSTNAME") - doretry := True - person.set_firstname(void) - doretry := False - assert("CREATE_EDIT_PERSON_EMPTY_FIRSTNAME_6", False) else doretry := False end -- cgit v1.2.3