From 5be306424aa9b65e2cc8c5c4eb35f841bf52e39b Mon Sep 17 00:00:00 2001 From: esheteda67206 Date: Thu, 20 Dec 2018 16:51:58 +0100 Subject: [PATCH] added TestAccount --- .idea/ChareSWE.iml | 12 ---------- .idea/misc.xml | 4 ++-- .idea/modules.xml | 2 +- src/Account.java | 8 +++++-- src/CredentialsTest.java | 2 +- src/Person.java | 1 + src/Spender.java | 3 +++ src/TestAccount.java | 52 ++++++++++++++++++++++++++++++++++++++++ src/TestKorndoerfer.java | 1 + 9 files changed, 67 insertions(+), 18 deletions(-) delete mode 100644 .idea/ChareSWE.iml create mode 100644 src/TestAccount.java diff --git a/.idea/ChareSWE.iml b/.idea/ChareSWE.iml deleted file mode 100644 index 83913e2..0000000 --- a/.idea/ChareSWE.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0e8a68a..0ae562a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - - + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index ac88304..e57fdee 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/Account.java b/src/Account.java index 71acc74..1a459ee 100644 --- a/src/Account.java +++ b/src/Account.java @@ -2,10 +2,14 @@ public class Account { public Person owner; public String email; - + Account(Person owner, String email){ + this.owner = owner; + this.email = email; + } public void accountErstellen(Person p, String e_email){ - + this.owner = p; + this.email = e_email; } diff --git a/src/CredentialsTest.java b/src/CredentialsTest.java index 1c96d81..422b9bd 100644 --- a/src/CredentialsTest.java +++ b/src/CredentialsTest.java @@ -16,7 +16,7 @@ public class CredentialsTest{ public void testTwo(){ Credentials c = new Credentials("hofmannol", "GERONIMO"); - assertTrue(c.valid()); + assertEquals("hofmannol", c.login); } @Test diff --git a/src/Person.java b/src/Person.java index 032b92a..e88b0fa 100644 --- a/src/Person.java +++ b/src/Person.java @@ -6,6 +6,7 @@ public class Person { public int age; Person(String name, String vname, int age){ + this.name = name; this.vname = vname; this.age = age; diff --git a/src/Spender.java b/src/Spender.java index 71dbf5f..9a131da 100644 --- a/src/Spender.java +++ b/src/Spender.java @@ -3,17 +3,20 @@ public class Spender extends Person{ private int amount; public Spender (String fname, String lname, int age, int summe){ + super(fname, lname, age); this.amount = summe; } public void betragSetzen(int summe){ + if(summe > 0){ amount = summe; } } public int getAmount(){ + return amount; } diff --git a/src/TestAccount.java b/src/TestAccount.java new file mode 100644 index 0000000..b83ce01 --- /dev/null +++ b/src/TestAccount.java @@ -0,0 +1,52 @@ +import org.junit.Test; +import static org.junit.Assert.*; + + +public class TestAccount { + + + @Test + public void test1(){ + + // Arrange + Person p = new Person("Hans","Georg", 12); + + + // Act + Account a = new Account(p, "fdfdf"); + + // Assert + assertEquals("Georg", a.owner.vname); + + + } + + @Test + public void testM2(){ + // Arrange + Person p = new Person("Hans","Georg", 12); + + + // Act + Account a = new Account(p, "fdfdf"); + + // Assert + assertEquals("Georg", a.owner.vname); + + + } + + @Test + public void test3(){ + // Arrange + Person p = new Person("Hans","Georg", 12); + + + // Act + Account a = new Account(p, "fdfdf"); + + // Assert + assertEquals(12, a.owner.age); + + } +} diff --git a/src/TestKorndoerfer.java b/src/TestKorndoerfer.java index f66de55..ee9c7e8 100644 --- a/src/TestKorndoerfer.java +++ b/src/TestKorndoerfer.java @@ -12,4 +12,5 @@ public class TestKorndoerfer { } + }