From 4fd83a6ad30762a088c549ceec23965306bb991c Mon Sep 17 00:00:00 2001 From: Stian Rusvik Date: Mon, 19 Aug 2024 11:17:46 +0200 Subject: [PATCH 1/7] made first test fail. --- src/main/java/com/booleanuk/core/Account.java | 46 +++++++++++++++++++ .../java/com/booleanuk/core/TodoItem.java | 22 +++++++-- .../java/com/booleanuk/core/AccountTest.java | 19 ++++++++ .../java/com/booleanuk/core/TodoItemTest.java | 42 +++++++++++++++++ 4 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/booleanuk/core/Account.java create mode 100644 src/test/java/com/booleanuk/core/AccountTest.java diff --git a/src/main/java/com/booleanuk/core/Account.java b/src/main/java/com/booleanuk/core/Account.java new file mode 100644 index 0000000..d9a2ddc --- /dev/null +++ b/src/main/java/com/booleanuk/core/Account.java @@ -0,0 +1,46 @@ +package com.booleanuk.core; + +public class Account { + private String email; + private String password; + private Boolean status; + private String error; + + public Account(String email, String password) { + this.email = verifyEmail(email); + this.password = verifyPassword(password); + this.status = false; + } + + private String verifyEmail(String email) { + return email; + } + + private String verifyPassword(String password) { + return password; + } + + public Boolean canLogIn() { + return this.status; + } + + public String getEmail() { + return email; + } + + public String getPassword() { + return password; + } + + public void setStatus(Boolean status) { + this.status = status; + } + + public String getError() { + return error; + } + + public void setError(String error) { + this.error = error; + } +} diff --git a/src/main/java/com/booleanuk/core/TodoItem.java b/src/main/java/com/booleanuk/core/TodoItem.java index 655d825..7e8d2ae 100644 --- a/src/main/java/com/booleanuk/core/TodoItem.java +++ b/src/main/java/com/booleanuk/core/TodoItem.java @@ -1,9 +1,9 @@ package com.booleanuk.core; public class TodoItem { - public String title; - public String detail; - public String status; + private String title; + private String detail; + private String status; public TodoItem(String title, String detail, String status) { this.title = title; @@ -11,6 +11,22 @@ public TodoItem(String title, String detail, String status) { this.status = status; } + public String getDetail() { + return detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + public void setStatus(String status) { this.status = status; } diff --git a/src/test/java/com/booleanuk/core/AccountTest.java b/src/test/java/com/booleanuk/core/AccountTest.java new file mode 100644 index 0000000..947764b --- /dev/null +++ b/src/test/java/com/booleanuk/core/AccountTest.java @@ -0,0 +1,19 @@ +package com.booleanuk.core; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class AccountTest { + + @Test + public void testVerifyEmail() throws Exception { + Account account = new Account("example.com", "12345"); + Assertions.assertEquals("invalid email", account.getError()); + } + + @Test + public void canLogIn() { + } +} \ No newline at end of file diff --git a/src/test/java/com/booleanuk/core/TodoItemTest.java b/src/test/java/com/booleanuk/core/TodoItemTest.java index 095af82..a6c9a3d 100644 --- a/src/test/java/com/booleanuk/core/TodoItemTest.java +++ b/src/test/java/com/booleanuk/core/TodoItemTest.java @@ -1,8 +1,50 @@ package com.booleanuk.core; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class TodoItemTest { + TodoItem todoItem; + @BeforeEach + void createObject() { + String title = "Eat dinner"; + String detail = "Buy all ingredients"; + String status = "Uncompleted"; + this.todoItem = new TodoItem(title, detail, status); + } + + @Test + void getDetail() { + Assertions.assertEquals("Buy all ingredients", this.todoItem.getDetail()); + } + + @Test + void setDetail() { + this.todoItem.setDetail("Follow the recipe"); + Assertions.assertEquals("Follow the recipe", this.todoItem.getDetail()); + } + + @Test + void getTitle() { + Assertions.assertEquals("Eat dinner", this.todoItem.getTitle()); + } + + @Test + void setTitle() { + this.todoItem.setTitle("Relax"); + Assertions.assertEquals("Relax", this.todoItem.getTitle()); + } + + @Test + void setStatus() { + this.todoItem.setStatus("Completed"); + Assertions.assertEquals("Completed", this.todoItem.getStatus()); + } + + @Test + void getStatus() { + Assertions.assertEquals("Uncompleted", this.todoItem.getStatus()); + } } From 683815fff67b69506af4c5f7e5c6e4da908abef8 Mon Sep 17 00:00:00 2001 From: Stian Rusvik Date: Mon, 19 Aug 2024 11:19:59 +0200 Subject: [PATCH 2/7] made first test pass. --- src/main/java/com/booleanuk/core/Account.java | 12 +++--------- src/test/java/com/booleanuk/core/AccountTest.java | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Account.java b/src/main/java/com/booleanuk/core/Account.java index d9a2ddc..5cca8cb 100644 --- a/src/main/java/com/booleanuk/core/Account.java +++ b/src/main/java/com/booleanuk/core/Account.java @@ -4,7 +4,6 @@ public class Account { private String email; private String password; private Boolean status; - private String error; public Account(String email, String password) { this.email = verifyEmail(email); @@ -13,6 +12,9 @@ public Account(String email, String password) { } private String verifyEmail(String email) { + if (!email.contains("@")) { + return "invalid email"; + } return email; } @@ -35,12 +37,4 @@ public String getPassword() { public void setStatus(Boolean status) { this.status = status; } - - public String getError() { - return error; - } - - public void setError(String error) { - this.error = error; - } } diff --git a/src/test/java/com/booleanuk/core/AccountTest.java b/src/test/java/com/booleanuk/core/AccountTest.java index 947764b..dbaf04b 100644 --- a/src/test/java/com/booleanuk/core/AccountTest.java +++ b/src/test/java/com/booleanuk/core/AccountTest.java @@ -10,7 +10,7 @@ class AccountTest { @Test public void testVerifyEmail() throws Exception { Account account = new Account("example.com", "12345"); - Assertions.assertEquals("invalid email", account.getError()); + Assertions.assertEquals("invalid email", account.getEmail()); } @Test From 6cd43ee869f027fae12094cb6b784b3a51007762 Mon Sep 17 00:00:00 2001 From: Stian Rusvik Date: Mon, 19 Aug 2024 11:23:52 +0200 Subject: [PATCH 3/7] made second test fail. --- src/main/java/com/booleanuk/core/Account.java | 8 ++++++++ .../java/com/booleanuk/core/AccountTest.java | 17 +++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Account.java b/src/main/java/com/booleanuk/core/Account.java index 5cca8cb..7e492aa 100644 --- a/src/main/java/com/booleanuk/core/Account.java +++ b/src/main/java/com/booleanuk/core/Account.java @@ -30,10 +30,18 @@ public String getEmail() { return email; } + public void setEmail(String email) { + this.email = email; + } + public String getPassword() { return password; } + public void setPassword(String password) { + this.password = password; + } + public void setStatus(Boolean status) { this.status = status; } diff --git a/src/test/java/com/booleanuk/core/AccountTest.java b/src/test/java/com/booleanuk/core/AccountTest.java index dbaf04b..7966a7f 100644 --- a/src/test/java/com/booleanuk/core/AccountTest.java +++ b/src/test/java/com/booleanuk/core/AccountTest.java @@ -1,16 +1,29 @@ package com.booleanuk.core; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; class AccountTest { + public Account account; + + @BeforeEach + public void setUp() { + this.account = new Account("example.com", "12345"); + } @Test - public void testVerifyEmail() throws Exception { - Account account = new Account("example.com", "12345"); + public void testVerifyEmail() { Assertions.assertEquals("invalid email", account.getEmail()); + account.setEmail("example@.com"); + Assertions.assertEquals("example@.com", account.getEmail()); + } + + @Test + public void testVerifyPassword() { + Assertions.assertEquals("invalid password", account.getPassword()); } @Test From 741863f54dbbd23424549b16266b0df329d7f085 Mon Sep 17 00:00:00 2001 From: Stian Rusvik Date: Mon, 19 Aug 2024 11:25:33 +0200 Subject: [PATCH 4/7] made second test pass. --- src/main/java/com/booleanuk/core/Account.java | 3 +++ src/test/java/com/booleanuk/core/AccountTest.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/booleanuk/core/Account.java b/src/main/java/com/booleanuk/core/Account.java index 7e492aa..0c2033d 100644 --- a/src/main/java/com/booleanuk/core/Account.java +++ b/src/main/java/com/booleanuk/core/Account.java @@ -19,6 +19,9 @@ private String verifyEmail(String email) { } private String verifyPassword(String password) { + if (password.length() < 8) { + return "invalid password"; + } return password; } diff --git a/src/test/java/com/booleanuk/core/AccountTest.java b/src/test/java/com/booleanuk/core/AccountTest.java index 7966a7f..bf6317f 100644 --- a/src/test/java/com/booleanuk/core/AccountTest.java +++ b/src/test/java/com/booleanuk/core/AccountTest.java @@ -24,6 +24,8 @@ public void testVerifyEmail() { @Test public void testVerifyPassword() { Assertions.assertEquals("invalid password", account.getPassword()); + account.setPassword("12345678"); + Assertions.assertEquals("12345678", account.getPassword()); } @Test From 0a6b47eba12c3d32de83f8470e67d2c6177a8616 Mon Sep 17 00:00:00 2001 From: Stian Rusvik Date: Mon, 19 Aug 2024 11:29:45 +0200 Subject: [PATCH 5/7] made third test fail. --- src/test/java/com/booleanuk/core/AccountTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/booleanuk/core/AccountTest.java b/src/test/java/com/booleanuk/core/AccountTest.java index bf6317f..95677f0 100644 --- a/src/test/java/com/booleanuk/core/AccountTest.java +++ b/src/test/java/com/booleanuk/core/AccountTest.java @@ -29,6 +29,7 @@ public void testVerifyPassword() { } @Test - public void canLogIn() { + public void testCanLogIn() { + Assertions.assertTrue(account.canLogIn()); } } \ No newline at end of file From a1bcce72235dabfe45a3cd60a807e7cc4cd1eea9 Mon Sep 17 00:00:00 2001 From: Stian Rusvik Date: Mon, 19 Aug 2024 11:33:55 +0200 Subject: [PATCH 6/7] made third test pass. --- src/main/java/com/booleanuk/core/Account.java | 3 ++- src/test/java/com/booleanuk/core/AccountTest.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/booleanuk/core/Account.java b/src/main/java/com/booleanuk/core/Account.java index 0c2033d..47405f3 100644 --- a/src/main/java/com/booleanuk/core/Account.java +++ b/src/main/java/com/booleanuk/core/Account.java @@ -46,6 +46,7 @@ public void setPassword(String password) { } public void setStatus(Boolean status) { - this.status = status; + if (!this.email.equals("invalid email") && !this.password.equals("invalid password")) + this.status = status; } } diff --git a/src/test/java/com/booleanuk/core/AccountTest.java b/src/test/java/com/booleanuk/core/AccountTest.java index 95677f0..b70c591 100644 --- a/src/test/java/com/booleanuk/core/AccountTest.java +++ b/src/test/java/com/booleanuk/core/AccountTest.java @@ -30,6 +30,9 @@ public void testVerifyPassword() { @Test public void testCanLogIn() { + account.setEmail("example@test.com"); + account.setPassword("12345678"); + account.setStatus(true); Assertions.assertTrue(account.canLogIn()); } } \ No newline at end of file From 1d3ded70ec80625dbe169fb00407134d7642e31b Mon Sep 17 00:00:00 2001 From: Stian Rusvik Date: Mon, 19 Aug 2024 12:09:59 +0200 Subject: [PATCH 7/7] . --- src/main/java/com/booleanuk/core/Account.java | 8 ++++---- src/test/java/com/booleanuk/core/AccountTest.java | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Account.java b/src/main/java/com/booleanuk/core/Account.java index 47405f3..355243d 100644 --- a/src/main/java/com/booleanuk/core/Account.java +++ b/src/main/java/com/booleanuk/core/Account.java @@ -34,7 +34,7 @@ public String getEmail() { } public void setEmail(String email) { - this.email = email; + this.email = verifyEmail(email); } public String getPassword() { @@ -42,11 +42,11 @@ public String getPassword() { } public void setPassword(String password) { - this.password = password; + this.password = verifyPassword(password); } - public void setStatus(Boolean status) { - if (!this.email.equals("invalid email") && !this.password.equals("invalid password")) + public void setStatus(Boolean status) { + if (!email.equals("invalid email") && !password.equals("invalid password")) this.status = status; } } diff --git a/src/test/java/com/booleanuk/core/AccountTest.java b/src/test/java/com/booleanuk/core/AccountTest.java index b70c591..dd095c1 100644 --- a/src/test/java/com/booleanuk/core/AccountTest.java +++ b/src/test/java/com/booleanuk/core/AccountTest.java @@ -30,6 +30,7 @@ public void testVerifyPassword() { @Test public void testCanLogIn() { + Assertions.assertFalse(account.canLogIn()); account.setEmail("example@test.com"); account.setPassword("12345678"); account.setStatus(true);