Skip to content

Vegard Bruas Vognstolen #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VegardVog wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Vegard Bruas Vognstolen #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
69c5d94
Add test for setters and getters
Jan 18, 2024
48546da
Make tests pass
Jan 18, 2024
6ede377
Add init test for Account, User, Admin
Jan 18, 2024
cb3058c
Add test for account setters and getters
Jan 18, 2024
3b7da71
Make account pass tests
Jan 18, 2024
24c3091
Add tests for user and admin
Jan 18, 2024
c130999
Make tests pass User and Admin
Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions src/main/java/com/booleanuk/core/Account.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package com.booleanuk.core;

public class Account {

private String email;


private String password;

private boolean enabled;

public Account(String email, String password) {
this.setEmail(email);
this.setPassword(password);
this.enabled = false;

}

public String getEmail() {
return this.email;
}

public String setEmail(String email) {
if(email.contains("@")) {
this.email = email;
return "valid email";
}
return "invalid email";
}

public String getPassword() {
return this.password;
}

public String setPassword(String password) {
if(password.length() >= 8) {
this.password = password;
return "valid password";
}
return "invalid password";
}

public boolean isEnabled() {
return this.enabled;
}

public void setEnabled(boolean enabled) {
this.enabled = enabled;
}


public String ableToLogin() {
if(this.isEnabled()) {
return "valid login";
}
return "invalid login";

}
}
7 changes: 7 additions & 0 deletions src/main/java/com/booleanuk/core/Admin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.booleanuk.core;

public class Admin extends Account{
public Admin(String email, String password) {
super(email, password);
}
}
Binary file added src/main/java/com/booleanuk/core/ClassDiagram.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 22 additions & 3 deletions src/main/java/com/booleanuk/core/TodoItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
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;
Expand All @@ -18,4 +20,21 @@ public void setStatus(String status) {
public String getStatus() {
return this.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;
}
}
7 changes: 7 additions & 0 deletions src/main/java/com/booleanuk/core/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.booleanuk.core;

public class User extends Account{
public User(String email, String password) {
super(email, password);
}
}
23 changes: 23 additions & 0 deletions src/test/java/com/booleanuk/core/AccountTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.booleanuk.core;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class AccountTest {

@Test
public void testAccount() {
Account account = new Account("email@email.email", "bestPassword");

Assertions.assertEquals("invalid password", account.setPassword("1"));
Assertions.assertEquals("invalid email", account.setEmail("1"));
Assertions.assertFalse(account.isEnabled());
Assertions.assertEquals("invalid login", account.ableToLogin());
account.setEnabled(true);
Assertions.assertTrue(account.isEnabled());
Assertions.assertEquals("valid login", account.ableToLogin());



}
}
23 changes: 23 additions & 0 deletions src/test/java/com/booleanuk/core/AdminTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.booleanuk.core;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class AdminTest {

@Test
public void testAdmin() {
Admin admin = new Admin("email@email.email", "bestPassword");


Assertions.assertEquals("invalid password", admin.setPassword("1"));
Assertions.assertEquals("invalid email", admin.setEmail("1"));
Assertions.assertFalse(admin.isEnabled());
Assertions.assertEquals("invalid login", admin.ableToLogin());
admin.setEnabled(true);
Assertions.assertTrue(admin.isEnabled());
Assertions.assertEquals("valid login", admin.ableToLogin());


}
}
17 changes: 17 additions & 0 deletions src/test/java/com/booleanuk/core/TodoItemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,21 @@

class TodoItemTest {

@Test
public void testAccessPrivateValues() {
TodoItem todoItem = new TodoItem("Title", "Detail", "Status");

Assertions.assertEquals("Status", todoItem.getStatus());
Assertions.assertEquals("Detail", todoItem.getDetail());
Assertions.assertEquals("Title", todoItem.getTitle());

todoItem.setStatus("Status2");
todoItem.setDetail("Detail2");
todoItem.setTitle("Title2");

Assertions.assertEquals("Status2", todoItem.getStatus());
Assertions.assertEquals("Detail2", todoItem.getDetail());
Assertions.assertEquals("Title2", todoItem.getTitle());
}

}
23 changes: 23 additions & 0 deletions src/test/java/com/booleanuk/core/UserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.booleanuk.core;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class UserTest {
@Test
public void testUser() {
User user = new User("email@email.email", "bestPassword");


Assertions.assertEquals("invalid password", user.setPassword("1"));
Assertions.assertEquals("invalid email", user.setEmail("1"));
Assertions.assertFalse(user.isEnabled());
Assertions.assertEquals("invalid login", user.ableToLogin());
user.setEnabled(true);
Assertions.assertTrue(user.isEnabled());
Assertions.assertEquals("valid login", user.ableToLogin());


}

}