1 files changed, 9 insertions, 28 deletions

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