5 files changed, 119 insertions, 17 deletions

diff --git a/bank-eiffel/account.e b/bank-eiffel/account.e
index 6c240de..8faabdc 100644
--- a/bank-eiffel/account.e
+++ b/bank-eiffel/account.e
@@ -7,8 +7,6 @@ note
 class
         ACCOUNT
 
-inherit
-
 
 feature -- Access
 
diff --git a/bank-eiffel/bank.ecf b/bank-eiffel/bank.ecf
index 8164c31..b3bf92c 100644
--- a/bank-eiffel/bank.ecf
+++ b/bank-eiffel/bank.ecf
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-5-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-5-0 http://www.eiffel.com/developers/xml/configuration-1-5-0.xsd" name="bank" uuid="ABD750A4-A528-4FEE-A7EA-37791A0D0F37">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-7-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-7-0 http://www.eiffel.com/developers/xml/configuration-1-7-0.xsd" name="bank" uuid="ABD750A4-A528-4FEE-A7EA-37791A0D0F37">
         <target name="bank">
-                <root feature="make" class="APPLICATION"/>
-                <option warning="true">
+                <description>FOOP Exercise #3</description>
+                <root class="APPLICATION" feature="make"/>
+                <version major="0" minor="1" release="0" build="0" product="bank"/>
+                <option warning="true" void_safety="none">
                         <assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
                 </option>
-                <precompile name="base_pre" location="$ISE_PRECOMP/base.ecf"/>
-                <library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
+                <setting name="executable_name" value="bank"/>
+                <precompile name="base_pre" location="$ISE_PRECOMP\base.ecf"/>
+                <library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+                <library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
                 <cluster name="bank" location=".\" recursive="true">
                         <file_rule>
                                 <exclude>/EIFGENs$</exclude>
-                                <exclude>/.svn$</exclude>
                                 <exclude>/CVS$</exclude>
+                                <exclude>/.svn$</exclude>
                         </file_rule>
+                        <tests name="tests" location="\home\manuel\uni\foop\bank-eiffel\tests\"/>
                 </cluster>
         </target>
         <target name="bank_dotnet" extends="bank">
diff --git a/bank-eiffel/person.e b/bank-eiffel/person.e
index 5230362..93ce339 100644
--- a/bank-eiffel/person.e
+++ b/bank-eiffel/person.e
@@ -7,11 +7,14 @@ note
 class
         PERSON
 
-feature -- Access
+create
+        make
 
-        surename: STRING_8
+feature {NONE} -- Initialization
+
+        surname: STRING_8
                         -- Nachname
-                attribute Result := ({like surename}).default end --| Remove line when Void Safety is properly set
+                attribute Result := ({like surname}).default end --| Remove line when Void Safety is properly set
 
         firstname: STRING_8 assign set_firstname
                         -- Vorname
@@ -19,14 +22,20 @@ feature -- Access
 
 feature -- Element change
 
-        set_surename (a_surename: like surename)
-                        -- Assign `surename' with `a_surename'.
+        make (a_surname: like surname; a_firstname: like firstname)
+                do
+                        set_surname (a_surname)
+                        set_firstname (a_firstname)
+                end
+
+        set_surname (a_surname: like surname)
+                        -- Assign `surname' with `a_surname'.
                 require
-                        a_surename_not_empty: a_surename /= Void and then not a_surename.is_empty
+                        a_surname_not_empty: a_surname /= Void and then not a_surname.is_empty
                 do
-                        surename := a_surename
+                        surname := a_surname
                 ensure
-                        surename_assigned: surename = a_surename
+                        surname_assigned: surname = a_surname
                 end
 
         set_firstname (a_firstname: like firstname)
@@ -41,5 +50,5 @@ feature -- Element change
 
 invariant
         firstname_not_empty: firstname /= Void and then not firstname.is_empty
-        surename_not_empty: surename /= Void and then not surename.is_empty
+        surname_not_empty: surname /= Void and then not surname.is_empty
 end
diff --git a/bank-eiffel/tests/test_account.e b/bank-eiffel/tests/test_account.e
new file mode 100644
index 0000000..1820c45
--- /dev/null
+++ b/bank-eiffel/tests/test_account.e
@@ -0,0 +1,30 @@
+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
+
+inherit
+        EQA_TEST_SET
+
+feature -- Test routines
+
+        CREATE_ACCOUNT
+                        -- New test routine
+                local
+                        person1: PERSON
+                        account: ACCOUNT
+                do
+                        create person1.make ("VORNAME", "NACHNAME")
+                        --assert ("not_implemented", False)
+                end
+
+end
+
+
diff --git a/bank-eiffel/tests/test_person.e b/bank-eiffel/tests/test_person.e
new file mode 100644
index 0000000..f23df03
--- /dev/null
+++ b/bank-eiffel/tests/test_person.e
@@ -0,0 +1,60 @@
+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
+
+inherit
+        EQA_TEST_SET
+
+feature -- Test routines
+
+        CREATE_PERSON
+                local
+                        person: PERSON
+                do
+                        create person.make("SOME_SURNAME", "SOME_FIRSTNAME")
+                end
+
+        CREATE_PERSON_NO_SURNAME
+                local
+                        person: PERSON
+                        retried: BOOLEAN
+                do
+                        if not retried then
+                                create person.make("", "SOME_FIRSTNAME")
+                                retried := True
+                                assert("CREATE_PERSON_NO_SURNAME", False)
+                        end
+                rescue
+                        if not retried then
+                                retried := True
+                                retry
+                        end
+                end
+
+        CREATE_PERSON_NO_FIRSTNAME
+                local
+                        person: PERSON
+                        retried: BOOLEAN
+                do
+                        if not retried then
+                                create person.make("SOME_SURNAME", "")
+                                retried := True
+                                assert("CREATE_PERSON_NO_FIRSTNAME", False)
+                        end
+                rescue
+                        if not retried then
+                                retried := True
+                                retry
+                        end
+                end
+end
+
+