2 files changed, 105 insertions, 21 deletions

diff --git a/bank-eiffel/person.e b/bank-eiffel/person.e
index 93ce339..5f7d0bc 100644
--- a/bank-eiffel/person.e
+++ b/bank-eiffel/person.e
@@ -10,9 +10,9 @@ class
 create
         make
 
-feature {NONE} -- Initialization
+feature -- Initialization
 
-        surname: STRING_8
+        surname: STRING_8 assign set_surname
                         -- Nachname
                 attribute Result := ({like surname}).default end --| Remove line when Void Safety is properly set
 
@@ -20,7 +20,7 @@ feature {NONE} -- Initialization
                         -- Vorname
                 attribute Result := ({like firstname}).default end --| Remove line when Void Safety is properly set
 
-feature -- Element change
+feature -- Initialization
 
         make (a_surname: like surname; a_firstname: like firstname)
                 do
@@ -28,6 +28,8 @@ feature -- Element change
                         set_firstname (a_firstname)
                 end
 
+feature -- Element change
+
         set_surname (a_surname: like surname)
                         -- Assign `surname' with `a_surname'.
                 require
diff --git a/bank-eiffel/tests/test_person.e b/bank-eiffel/tests/test_person.e
index f23df03..cd66ccb 100644
--- a/bank-eiffel/tests/test_person.e
+++ b/bank-eiffel/tests/test_person.e
@@ -15,46 +15,128 @@ inherit
 
 feature -- Test routines
 
-        CREATE_PERSON
+        CREATE_EDIT_PERSON
                 local
                         person: PERSON
                 do
-                        create person.make("SOME_SURNAME", "SOME_FIRSTNAME")
+                        create person.make("SOME_SURNAME_1", "SOME_FIRSTNAME_1")
+                        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")
+                        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"))
                 end
 
-        CREATE_PERSON_NO_SURNAME
+        CREATE_EDIT_PERSON_EMPTY_SURNAME
                 local
                         person: PERSON
-                        retried: BOOLEAN
+                        retry_count: INTEGER
+                        doretry: BOOLEAN
                 do
-                        if not retried then
+                        if retry_count = 0 then
+                                doretry := True
                                 create person.make("", "SOME_FIRSTNAME")
-                                retried := True
-                                assert("CREATE_PERSON_NO_SURNAME", False)
+                                doretry := False
+                                assert("CREATE_EDIT_PERSON_EMPTY_SURNAME_1", False)
+                        elseif retry_count = 1 then
+                                create person.make(void, "SOME_FIRSTNAME")
+                                doretry := False
+                                assert("CREATE_EDIT_PERSON_EMPTY_SURNAME_2", False)
+                        elseif retry_count = 2 then
+                                doretry := False
+                                create person.make("SOME_SURNAME", "SOME_FIRSTNAME")
+                                doretry := True
+                                person.surname := ""
+                                doretry := False
+                                assert("CREATE_EDIT_PERSON_EMPTY_SURNAME_3", False)
+                        elseif retry_count = 3 then
+                                doretry := False
+                                create person.make("SOME_SURNAME", "SOME_FIRSTNAME")
+                                doretry := True
+                                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
                 rescue
-                        if not retried then
-                                retried := True
+                        if doretry then
+                                retry_count := retry_count + 1
                                 retry
                         end
                 end
 
-        CREATE_PERSON_NO_FIRSTNAME
+        CREATE_EDIT_PERSON_EMPTY_FIRSTNAME
                 local
                         person: PERSON
-                        retried: BOOLEAN
+                        retry_count: INTEGER
+                        doretry: BOOLEAN
                 do
-                        if not retried then
+                        if retry_count = 0 then
+                                doretry := True
                                 create person.make("SOME_SURNAME", "")
-                                retried := True
-                                assert("CREATE_PERSON_NO_FIRSTNAME", False)
+                                doretry := False
+                                assert("CREATE_EDIT_PERSON_EMPTY_FIRSTNAME_1", False)
+                        elseif retry_count = 1 then
+                                create person.make("SOME_SURNAME", void)
+                                doretry := False
+                                assert("CREATE_EDIT_PERSON_EMPTY_FIRSTNAME_2", False)
+                        elseif retry_count = 2 then
+                                doretry := False
+                                create person.make("SOME_SURNAME", "SOME_FIRSTNAME")
+                                doretry := True
+                                person.firstname := ""
+                                doretry := False
+                                assert("CREATE_EDIT_PERSON_EMPTY_FIRSTNAME_3", False)
+                        elseif retry_count = 3 then
+                                doretry := False
+                                create person.make("SOME_SURNAME", "SOME_FIRSTNAME")
+                                doretry := True
+                                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
                 rescue
-                        if not retried then
-                                retried := True
+                        if doretry then
+                                retry_count := retry_count + 1
                                 retry
                         end
                 end
 end
-
-