From 8ee050401a569dd3df96904bec4d4889bc03ab32 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Tue, 25 Jan 2022 19:37:44 +0100 Subject: [PATCH 01/29] add credential interface --- src/main/java/CredentialInterface.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/java/CredentialInterface.java diff --git a/src/main/java/CredentialInterface.java b/src/main/java/CredentialInterface.java new file mode 100644 index 0000000..f6e0ead --- /dev/null +++ b/src/main/java/CredentialInterface.java @@ -0,0 +1,11 @@ +public interface CredentialInterface { + + public void show(); + public void edit(); + public void delete(); + public void getCredentials(); + public void setCredentials(); + public void getAsJSON(); + public void loadCredentialsFromJSON(); + +} From 2f4de9012171743b81ada83ab910d5282e5189d0 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Tue, 25 Jan 2022 19:40:08 +0100 Subject: [PATCH 02/29] add credential entry class --- src/main/java/Credentials.java | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/main/java/Credentials.java diff --git a/src/main/java/Credentials.java b/src/main/java/Credentials.java new file mode 100644 index 0000000..f9f52d3 --- /dev/null +++ b/src/main/java/Credentials.java @@ -0,0 +1,2 @@ +public class Credentials { +} From f6ad637c4f836f8eb0ca9ab195a26a90ba6ac786 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Tue, 25 Jan 2022 19:47:13 +0100 Subject: [PATCH 03/29] added skeleton of credentials class --- src/main/java/Credentials.java | 38 +++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/main/java/Credentials.java b/src/main/java/Credentials.java index f9f52d3..028f58b 100644 --- a/src/main/java/Credentials.java +++ b/src/main/java/Credentials.java @@ -1,2 +1,38 @@ -public class Credentials { +public class Credentials implements CredentialInterface{ + @Override + public void show() { + + } + + @Override + public void edit() { + + } + + @Override + public void delete() { + + } + + @Override + public void getCredentials() { + + } + + @Override + public void setCredentials() { + + } + + @Override + public void getAsJSON() { + + } + + @Override + public void loadCredentialsFromJSON() { + + } } + + From 4e91f37a405ab55a3fa3e6c5e67962661e55fd62 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 16:45:24 +0100 Subject: [PATCH 04/29] Implements an Interface with basic functions Defines New Credential function signature --- src/main/java/CredentialInterface.java | 11 ----------- src/main/java/CredentialRepositoryInterface.java | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 src/main/java/CredentialInterface.java create mode 100644 src/main/java/CredentialRepositoryInterface.java diff --git a/src/main/java/CredentialInterface.java b/src/main/java/CredentialInterface.java deleted file mode 100644 index f6e0ead..0000000 --- a/src/main/java/CredentialInterface.java +++ /dev/null @@ -1,11 +0,0 @@ -public interface CredentialInterface { - - public void show(); - public void edit(); - public void delete(); - public void getCredentials(); - public void setCredentials(); - public void getAsJSON(); - public void loadCredentialsFromJSON(); - -} diff --git a/src/main/java/CredentialRepositoryInterface.java b/src/main/java/CredentialRepositoryInterface.java new file mode 100644 index 0000000..055b59e --- /dev/null +++ b/src/main/java/CredentialRepositoryInterface.java @@ -0,0 +1,11 @@ +public interface CredentialRepositoryInterface { + + void createNewCredential(String name, String password); + void edit(); + void delete(); + void getCredentials(); + void setCredentials(); + void getAsJSON(); + void loadCredentialsFromJSON(); + +} From cd340772ab73439d7977e3c625c7ab76e63667ca Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 16:47:55 +0100 Subject: [PATCH 05/29] Implements Skeleton for CredentialRepository Defines Constructor - Credentials are Held in ArrayList for ease of use Defines public function to add new credential with incrementing indizes --- src/main/java/CredentialRepository.java | 55 +++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/main/java/CredentialRepository.java diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java new file mode 100644 index 0000000..3964dd6 --- /dev/null +++ b/src/main/java/CredentialRepository.java @@ -0,0 +1,55 @@ +import java.util.ArrayList; + +public class CredentialRepository implements CredentialRepositoryInterface{ + + private int idCounter = 0; + private ArrayList credentials; + + public CredentialRepository() + { + this.credentials = new ArrayList(); + } + + public void createNewCredential(String name, String password) + { + try { + this.credentials.add(new Credential(name, password, this.idCounter++)); + } + catch(Exception fail) + { + System.err.println(fail.getMessage()); + } + } + + @Override + public void edit() { + + } + + @Override + public void delete() { + + } + + @Override + public void getCredentials() { + + } + + @Override + public void setCredentials() { + + } + + @Override + public void getAsJSON() { + + } + + @Override + public void loadCredentialsFromJSON() { + + } +} + + From 978c79d3ae900ab8dfb6ca7c3cf7fa9f3422b51e Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 16:48:46 +0100 Subject: [PATCH 06/29] Implements a Value Object to hold user information --- src/main/java/Credential.java | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/main/java/Credential.java diff --git a/src/main/java/Credential.java b/src/main/java/Credential.java new file mode 100644 index 0000000..702a60b --- /dev/null +++ b/src/main/java/Credential.java @@ -0,0 +1,30 @@ +public class Credential { + + /** + * Value Object für das Tupel aus name + pw + */ + + private String name, password; + private int id; + + + public Credential(String name, String password, int id) throws Exception { + if(name == null || password == null) + throw new Exception("kein leeres Objekt erstellen bliat"); + + this.name = name; + this.password = password; + } + + public String getName() + { + return this.name; + } + public String getPassword() { return this.password; } + public int getId() { return this.id; } + + public void upDatePassword(String newPassword) + { + this.password = newPassword; + } +} From 93d7dc776cd137ec49f54ab197bf7a52c65db3ff Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 16:52:32 +0100 Subject: [PATCH 07/29] Creates Testclass for CredentialRepository Adds basic layout and @beforeAll setup function --- src/test/java/CredentialRepositoryTest.java | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/test/java/CredentialRepositoryTest.java diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java new file mode 100644 index 0000000..bf29066 --- /dev/null +++ b/src/test/java/CredentialRepositoryTest.java @@ -0,0 +1,22 @@ +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class CredentialRepositoryTest { + + + private CredentialRepository credentialRepository; + + @BeforeEach + public void setUp() + { + credentialRepository = new CredentialRepository(); + } + + @Test + void createNewCredentialAndAddToList() { + + + + } + +} From b0fca310de2c8d9d62e08fa4b9a9675c02830d18 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:09:09 +0100 Subject: [PATCH 08/29] Implements testable function signature and first unit test --- src/main/java/Credential.java | 2 +- src/main/java/CredentialRepository.java | 10 +++++++++- src/main/java/CredentialRepositoryInterface.java | 2 +- src/test/java/CredentialRepositoryTest.java | 14 ++++++++++++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/java/Credential.java b/src/main/java/Credential.java index 702a60b..b7b4fbd 100644 --- a/src/main/java/Credential.java +++ b/src/main/java/Credential.java @@ -10,7 +10,7 @@ public class Credential { public Credential(String name, String password, int id) throws Exception { if(name == null || password == null) - throw new Exception("kein leeres Objekt erstellen bliat"); + throw new Exception("kein leeres Objekt erstellen"); this.name = name; this.password = password; diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 3964dd6..1a5a6b5 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -10,7 +10,7 @@ public class CredentialRepository implements CredentialRepositoryInterface{ this.credentials = new ArrayList(); } - public void createNewCredential(String name, String password) + public int createNewCredential(String name, String password) { try { this.credentials.add(new Credential(name, password, this.idCounter++)); @@ -19,6 +19,8 @@ public class CredentialRepository implements CredentialRepositoryInterface{ { System.err.println(fail.getMessage()); } + + return this.getListSize(); } @Override @@ -50,6 +52,12 @@ public class CredentialRepository implements CredentialRepositoryInterface{ public void loadCredentialsFromJSON() { } + + private int getListSize() + { + return this.credentials.size(); + } + } diff --git a/src/main/java/CredentialRepositoryInterface.java b/src/main/java/CredentialRepositoryInterface.java index 055b59e..7730f2d 100644 --- a/src/main/java/CredentialRepositoryInterface.java +++ b/src/main/java/CredentialRepositoryInterface.java @@ -1,6 +1,6 @@ public interface CredentialRepositoryInterface { - void createNewCredential(String name, String password); + int createNewCredential(String name, String password); void edit(); void delete(); void getCredentials(); diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index bf29066..d3a6f67 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -1,5 +1,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; class CredentialRepositoryTest { @@ -15,8 +16,17 @@ class CredentialRepositoryTest { @Test void createNewCredentialAndAddToList() { - - + Assertions.assertEquals(1, this.credentialRepository.createNewCredential("mock", "mock")); + Assertions.assertEquals(2, this.credentialRepository.createNewCredential("kek", "mate")); } } + + + /* + Exception failed = Assertions.assertThrows(Exception.class, () -> { + this.credentialRepository.createNewCredential(null,null); + }); + + Assertions.assertEquals("kein leeres Objekt erstellen", failed.getMessage()); + */ \ No newline at end of file From aff9a8f70eeb028044a95640c05378cdd3494728 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:16:40 +0100 Subject: [PATCH 09/29] Implements test for search function over repository --- src/main/java/CredentialRepository.java | 13 ++++++++++++- src/main/java/CredentialRepositoryInterface.java | 3 ++- src/test/java/CredentialRepositoryTest.java | 11 +++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 1a5a6b5..f8f66f3 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -33,8 +33,19 @@ public class CredentialRepository implements CredentialRepositoryInterface{ } + public Credential getCredentialsViaName(String needle) { + + for(int c = 0; c < this.getListSize(); c++) + { + + } + + return null; + } + + @Override - public void getCredentials() { + public void getCredentialsViaId() { } diff --git a/src/main/java/CredentialRepositoryInterface.java b/src/main/java/CredentialRepositoryInterface.java index 7730f2d..de543eb 100644 --- a/src/main/java/CredentialRepositoryInterface.java +++ b/src/main/java/CredentialRepositoryInterface.java @@ -3,7 +3,8 @@ public interface CredentialRepositoryInterface { int createNewCredential(String name, String password); void edit(); void delete(); - void getCredentials(); + void getCredentialsViaName(); + void getCredentialsViaId(); void setCredentials(); void getAsJSON(); void loadCredentialsFromJSON(); diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index d3a6f67..36fe139 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -20,6 +20,17 @@ class CredentialRepositoryTest { Assertions.assertEquals(2, this.credentialRepository.createNewCredential("kek", "mate")); } + @Test + void searchForUserInRepository() { + + this.credentialRepository.createNewCredential("mock", "mock"); + this.credentialRepository.createNewCredential("kek", "mate"); + + Credential c = this.credentialRepository.getCredentialsViaName("kek"); + Assertions.assertEquals("mate", c.getPassword()); + } + + } From a914453294bee8dc7fc8b338510c4150e0384aab Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:21:41 +0100 Subject: [PATCH 10/29] Implements search function and test for search --- src/main/java/CredentialRepository.java | 7 ++++++- src/main/java/CredentialRepositoryInterface.java | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index f8f66f3..2c49131 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -33,11 +33,15 @@ public class CredentialRepository implements CredentialRepositoryInterface{ } + @Override public Credential getCredentialsViaName(String needle) { for(int c = 0; c < this.getListSize(); c++) { + Credential credential = this.credentials.get(c); + if(credential.getName().equals(needle)) + return credential; } return null; @@ -45,8 +49,9 @@ public class CredentialRepository implements CredentialRepositoryInterface{ @Override - public void getCredentialsViaId() { + public Credential getCredentialsViaId() { + return null; } @Override diff --git a/src/main/java/CredentialRepositoryInterface.java b/src/main/java/CredentialRepositoryInterface.java index de543eb..85db2ed 100644 --- a/src/main/java/CredentialRepositoryInterface.java +++ b/src/main/java/CredentialRepositoryInterface.java @@ -3,8 +3,8 @@ public interface CredentialRepositoryInterface { int createNewCredential(String name, String password); void edit(); void delete(); - void getCredentialsViaName(); - void getCredentialsViaId(); + Credential getCredentialsViaName(String needle); + Credential getCredentialsViaId(); void setCredentials(); void getAsJSON(); void loadCredentialsFromJSON(); From c131eac34aef4000ebfed66d96b5f3d3b9837bad Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:29:22 +0100 Subject: [PATCH 11/29] Implements search function and test for search via index --- src/main/java/CredentialRepository.java | 14 +++++++++++--- .../java/CredentialRepositoryInterface.java | 2 +- src/test/java/CredentialRepositoryTest.java | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 2c49131..acc0c08 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -2,7 +2,7 @@ import java.util.ArrayList; public class CredentialRepository implements CredentialRepositoryInterface{ - private int idCounter = 0; + private int idCounter = 1; private ArrayList credentials; public CredentialRepository() @@ -49,9 +49,17 @@ public class CredentialRepository implements CredentialRepositoryInterface{ @Override - public Credential getCredentialsViaId() { + public Credential getCredentialsViaId(int id) { + + try{ + return this.credentials.get(id); + } + catch (IndexOutOfBoundsException outOfBoundsException) + { + return null; + } + - return null; } @Override diff --git a/src/main/java/CredentialRepositoryInterface.java b/src/main/java/CredentialRepositoryInterface.java index 85db2ed..19750c6 100644 --- a/src/main/java/CredentialRepositoryInterface.java +++ b/src/main/java/CredentialRepositoryInterface.java @@ -4,7 +4,7 @@ public interface CredentialRepositoryInterface { void edit(); void delete(); Credential getCredentialsViaName(String needle); - Credential getCredentialsViaId(); + Credential getCredentialsViaId(int id); void setCredentials(); void getAsJSON(); void loadCredentialsFromJSON(); diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index 36fe139..bb10bc6 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -30,6 +30,24 @@ class CredentialRepositoryTest { Assertions.assertEquals("mate", c.getPassword()); } + @Test + void searchForIdInRepository() { + + this.credentialRepository.createNewCredential("mock", "mock"); + this.credentialRepository.createNewCredential("kek", "mate"); + + Credential c = this.credentialRepository.getCredentialsViaId(2); + Assertions.assertEquals("mate", c.getPassword()); + } + + @Test + void testSearchWithInvalidIndex() { + + this.credentialRepository.createNewCredential("mock", "mock"); + + Assertions.assertEquals(null, this.credentialRepository.getCredentialsViaId(2)); + + } } From cf2ec72c26361e2b884abf1e65d754b94972c5fc Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:34:15 +0100 Subject: [PATCH 12/29] Fix counter error in arrayList --- src/main/java/CredentialRepository.java | 2 +- src/test/java/CredentialRepositoryTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index acc0c08..4dd28dd 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -2,7 +2,7 @@ import java.util.ArrayList; public class CredentialRepository implements CredentialRepositoryInterface{ - private int idCounter = 1; + private int idCounter = 0; private ArrayList credentials; public CredentialRepository() diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index bb10bc6..9159b87 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -36,7 +36,7 @@ class CredentialRepositoryTest { this.credentialRepository.createNewCredential("mock", "mock"); this.credentialRepository.createNewCredential("kek", "mate"); - Credential c = this.credentialRepository.getCredentialsViaId(2); + Credential c = this.credentialRepository.getCredentialsViaId(1); Assertions.assertEquals("mate", c.getPassword()); } From 028267642f3b1a9a19d2f72c47bfb41cbf1224aa Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:36:15 +0100 Subject: [PATCH 13/29] Removes unused functions --- src/main/java/CredentialRepository.java | 15 --------------- src/main/java/CredentialRepositoryInterface.java | 3 --- 2 files changed, 18 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 4dd28dd..9863c6f 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -60,21 +60,6 @@ public class CredentialRepository implements CredentialRepositoryInterface{ } - } - - @Override - public void setCredentials() { - - } - - @Override - public void getAsJSON() { - - } - - @Override - public void loadCredentialsFromJSON() { - } private int getListSize() diff --git a/src/main/java/CredentialRepositoryInterface.java b/src/main/java/CredentialRepositoryInterface.java index 19750c6..ff04aac 100644 --- a/src/main/java/CredentialRepositoryInterface.java +++ b/src/main/java/CredentialRepositoryInterface.java @@ -5,8 +5,5 @@ public interface CredentialRepositoryInterface { void delete(); Credential getCredentialsViaName(String needle); Credential getCredentialsViaId(int id); - void setCredentials(); - void getAsJSON(); - void loadCredentialsFromJSON(); } From 729f80d09d7cf405638aebe01be0ea638e2f38d7 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:39:11 +0100 Subject: [PATCH 14/29] Restructures repository class and interface --- src/main/java/CredentialRepository.java | 32 +++++++++++++------ .../java/CredentialRepositoryInterface.java | 5 +-- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 9863c6f..3fe9f97 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -23,16 +23,6 @@ public class CredentialRepository implements CredentialRepositoryInterface{ return this.getListSize(); } - @Override - public void edit() { - - } - - @Override - public void delete() { - - } - @Override public Credential getCredentialsViaName(String needle) { @@ -62,6 +52,28 @@ public class CredentialRepository implements CredentialRepositoryInterface{ } + /* + The next 3 functions assume you already have successfully + pulled a credential from the repository and now want to edit it. + Thus, these functions require you to pass the desired credential's index + */ + + + @Override + public void updatePassword(int index) { + + } + + public void updateUsername(int index){ + + } + + @Override + public void delete(int index) { + + } + + private int getListSize() { return this.credentials.size(); diff --git a/src/main/java/CredentialRepositoryInterface.java b/src/main/java/CredentialRepositoryInterface.java index ff04aac..da4696c 100644 --- a/src/main/java/CredentialRepositoryInterface.java +++ b/src/main/java/CredentialRepositoryInterface.java @@ -1,9 +1,10 @@ public interface CredentialRepositoryInterface { int createNewCredential(String name, String password); - void edit(); - void delete(); Credential getCredentialsViaName(String needle); Credential getCredentialsViaId(int id); + void updatePassword(int index); + void updateUsername(int index); + void delete(int index); } From b6e33cd52057111223a42cff5e89dcf44ad2b407 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:47:37 +0100 Subject: [PATCH 15/29] Rewrite ValueObject to DTO since we don't want to destroy the old object each time it gets updated --- src/main/java/Credential.java | 9 +++++---- src/main/java/CredentialRepository.java | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/Credential.java b/src/main/java/Credential.java index b7b4fbd..506fdb7 100644 --- a/src/main/java/Credential.java +++ b/src/main/java/Credential.java @@ -1,9 +1,5 @@ public class Credential { - /** - * Value Object für das Tupel aus name + pw - */ - private String name, password; private int id; @@ -27,4 +23,9 @@ public class Credential { { this.password = newPassword; } + + public void updateUsername(String newUsername) + { + this.name = newUsername; + } } diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 3fe9f97..7b5dab2 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -62,6 +62,8 @@ public class CredentialRepository implements CredentialRepositoryInterface{ @Override public void updatePassword(int index) { + + } public void updateUsername(int index){ From d485b046785552b11bd5e400f8947e1bc4b21eaf Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:49:48 +0100 Subject: [PATCH 16/29] Updates Interface and function signatures --- src/main/java/CredentialRepository.java | 10 ++++++++-- src/main/java/CredentialRepositoryInterface.java | 4 ++-- src/test/java/CredentialRepositoryTest.java | 13 ++++++------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 7b5dab2..a1837f2 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -60,13 +60,19 @@ public class CredentialRepository implements CredentialRepositoryInterface{ @Override - public void updatePassword(int index) { + public void updatePassword(int index, String newPassword) { + try{ + + } + catch (IndexOutOfBoundsException outOfBoundsException) + { + } } - public void updateUsername(int index){ + public void updateUsername(int index, String newUsername){ } diff --git a/src/main/java/CredentialRepositoryInterface.java b/src/main/java/CredentialRepositoryInterface.java index da4696c..afff4b0 100644 --- a/src/main/java/CredentialRepositoryInterface.java +++ b/src/main/java/CredentialRepositoryInterface.java @@ -3,8 +3,8 @@ public interface CredentialRepositoryInterface { int createNewCredential(String name, String password); Credential getCredentialsViaName(String needle); Credential getCredentialsViaId(int id); - void updatePassword(int index); - void updateUsername(int index); + void updatePassword(int index, String newPassword); + void updateUsername(int indexl, String newUsername); void delete(int index); } diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index 9159b87..7ce26d3 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -49,13 +49,12 @@ class CredentialRepositoryTest { } -} + @Test + void testUpdatePassword(){ + // this.credentialRepository.createNewCredential("mock", "mock"); + // this.credentialRepository.updatePassword(0); - /* - Exception failed = Assertions.assertThrows(Exception.class, () -> { - this.credentialRepository.createNewCredential(null,null); - }); + } - Assertions.assertEquals("kein leeres Objekt erstellen", failed.getMessage()); - */ \ No newline at end of file +} From b95899aa56130c121050ff6aad2225439fac6b1b Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:51:19 +0100 Subject: [PATCH 17/29] Implements Unittest for Password Update --- src/test/java/CredentialRepositoryTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index 7ce26d3..c7298fb 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -52,8 +52,12 @@ class CredentialRepositoryTest { @Test void testUpdatePassword(){ - // this.credentialRepository.createNewCredential("mock", "mock"); - // this.credentialRepository.updatePassword(0); + this.credentialRepository.createNewCredential("mock", "mock"); + this.credentialRepository.updatePassword(0, "newPassword"); + + Credential c = this.credentialRepository.getCredentialsViaId(0); + + Assertions.assertEquals("newPassword", c.getPassword()); } From 90cb65377c848fee26afe031e9bb911a091a5bf7 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:52:04 +0100 Subject: [PATCH 18/29] Implements function for Password Update --- src/main/java/CredentialRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index a1837f2..58122d5 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -63,7 +63,7 @@ public class CredentialRepository implements CredentialRepositoryInterface{ public void updatePassword(int index, String newPassword) { try{ - + this.credentials.get(index).upDatePassword(newPassword); } catch (IndexOutOfBoundsException outOfBoundsException) { From 2d2d1bd527b4f7f99d780e960c6eefea25a7dbc8 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:52:52 +0100 Subject: [PATCH 19/29] Implements Unittest for Username Update --- src/test/java/CredentialRepositoryTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index c7298fb..dcd87a5 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -61,4 +61,16 @@ class CredentialRepositoryTest { } + @Test + void testUpdateUsername(){ + + this.credentialRepository.createNewCredential("mock", "mock"); + this.credentialRepository.updateUsername(0, "newUsername"); + + Credential c = this.credentialRepository.getCredentialsViaId(0); + + Assertions.assertEquals("newPassword", c.getName()); + + } + } From 2ad4ea87c4e68874d61049adb20963c8cf85a1e2 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:53:56 +0100 Subject: [PATCH 20/29] Implements function for Username Update --- src/main/java/CredentialRepository.java | 7 +++++++ src/test/java/CredentialRepositoryTest.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 58122d5..1a331c7 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -74,6 +74,13 @@ public class CredentialRepository implements CredentialRepositoryInterface{ public void updateUsername(int index, String newUsername){ + try{ + this.credentials.get(index).updateUsername(newUsername); + } + catch (IndexOutOfBoundsException outOfBoundsException) + { + + } } @Override diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index dcd87a5..b7b0674 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -69,7 +69,7 @@ class CredentialRepositoryTest { Credential c = this.credentialRepository.getCredentialsViaId(0); - Assertions.assertEquals("newPassword", c.getName()); + Assertions.assertEquals("newUsername", c.getName()); } From b0730d1003c3b382c8b8a849ab15444bb74d9d59 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 17:54:51 +0100 Subject: [PATCH 21/29] Adds error printing for indexoutofbound case --- src/main/java/CredentialRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 1a331c7..c47d507 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -67,7 +67,7 @@ public class CredentialRepository implements CredentialRepositoryInterface{ } catch (IndexOutOfBoundsException outOfBoundsException) { - + System.err.println("No Credential with Index" + index + " found"); } } @@ -79,7 +79,7 @@ public class CredentialRepository implements CredentialRepositoryInterface{ } catch (IndexOutOfBoundsException outOfBoundsException) { - + System.err.println("No Credential with Index" + index + " found"); } } From 57ae190c6358f71bc8a511719aab448d0b272d84 Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 18:02:06 +0100 Subject: [PATCH 22/29] Implements Unittest and function to delete credential from arraylist --- src/main/java/CredentialRepository.java | 2 ++ src/test/java/CredentialRepositoryTest.java | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index c47d507..8e1adc9 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -86,6 +86,8 @@ public class CredentialRepository implements CredentialRepositoryInterface{ @Override public void delete(int index) { + this.credentials.remove(index); + } diff --git a/src/test/java/CredentialRepositoryTest.java b/src/test/java/CredentialRepositoryTest.java index b7b0674..3806d09 100644 --- a/src/test/java/CredentialRepositoryTest.java +++ b/src/test/java/CredentialRepositoryTest.java @@ -70,6 +70,19 @@ class CredentialRepositoryTest { Credential c = this.credentialRepository.getCredentialsViaId(0); Assertions.assertEquals("newUsername", c.getName()); + } + + @Test + void testDeleteEntry(){ + + this.credentialRepository.createNewCredential("mock", "mock"); + this.credentialRepository.delete(0); + + Assertions.assertEquals(null, this.credentialRepository.getCredentialsViaId(0)); + } + + @Test + void testIndexShiftAfterDeletion(){ } From ffdbc80dfee959bff4f7b8c584710c2d45059e4b Mon Sep 17 00:00:00 2001 From: fdai5728 Date: Wed, 16 Feb 2022 18:20:47 +0100 Subject: [PATCH 23/29] Reverts some mistakes Implements and tests function to delete entries @TODO: catch index left-shift after deleting an item --- src/main/java/CredentialRepository.java | 17 ++++++++++++++++- src/test/java/CredentialRepositoryTest.java | 5 ----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 8e1adc9..6a048cc 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -49,7 +49,6 @@ public class CredentialRepository implements CredentialRepositoryInterface{ return null; } - } /* @@ -90,7 +89,23 @@ public class CredentialRepository implements CredentialRepositoryInterface{ } +/* + this function will be required in the future for catching the left-shift in the arrayList + after one entry was deleted. welp, maybe it won't. can't tell and i've no time atm to + finish this + + private int mapIndexToListCounter(int needle) { + for(int c = 0; c Date: Wed, 16 Feb 2022 18:47:04 +0100 Subject: [PATCH 24/29] =?UTF-8?q?erneuter=20commit,=20l=C3=B6scht=20hoffen?= =?UTF-8?q?tlich=20datei?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Credentials.java | 38 ---------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 src/main/java/Credentials.java diff --git a/src/main/java/Credentials.java b/src/main/java/Credentials.java deleted file mode 100644 index 028f58b..0000000 --- a/src/main/java/Credentials.java +++ /dev/null @@ -1,38 +0,0 @@ -public class Credentials implements CredentialInterface{ - @Override - public void show() { - - } - - @Override - public void edit() { - - } - - @Override - public void delete() { - - } - - @Override - public void getCredentials() { - - } - - @Override - public void setCredentials() { - - } - - @Override - public void getAsJSON() { - - } - - @Override - public void loadCredentialsFromJSON() { - - } -} - - From f014afbf831507670ae5d6c18761ded1866a9f80 Mon Sep 17 00:00:00 2001 From: fdai6352 Date: Thu, 17 Feb 2022 18:48:46 +0100 Subject: [PATCH 25/29] refactored add credential Method and Test --- src/main/java/CredentialRepository.java | 2 +- src/main/java/Vault.java | 33 +++++++++++++++---------- src/main/java/VaultInterface.java | 2 +- src/test/java/VaultTest.java | 12 ++++++--- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/main/java/CredentialRepository.java b/src/main/java/CredentialRepository.java index 6a048cc..923f2f4 100644 --- a/src/main/java/CredentialRepository.java +++ b/src/main/java/CredentialRepository.java @@ -106,7 +106,7 @@ public class CredentialRepository implements CredentialRepositoryInterface{ return -1; } */ - private int getListSize() + public int getListSize() { return this.credentials.size(); } diff --git a/src/main/java/Vault.java b/src/main/java/Vault.java index 2f07ec7..3a7a76a 100644 --- a/src/main/java/Vault.java +++ b/src/main/java/Vault.java @@ -17,6 +17,13 @@ public class Vault implements VaultInterface { public boolean isInt = false; InputStream inputS = System.in; OutputStream outputS = System.out; + private CredentialRepository credentialRepository = new CredentialRepository(); + + public static void main (String args[]) { + Vault vault = new Vault(); + vault.credentialMenu(); + } + private void println(String output) { try { @@ -74,15 +81,8 @@ public class Vault implements VaultInterface { } - public void addCredential(){ - Scanner scan = new Scanner(inputS); - println("Type in username"); - userName = scan.nextLine(); - - println("Type in password"); - password = scan.nextLine(); - //createNewCredential(userName, password); - + public void addCredential(String userName, String password){ + credentialRepository.createNewCredential(userName, password); } public void showCredential(){ @@ -93,10 +93,10 @@ public class Vault implements VaultInterface { if(str.matches("[0-9]+")) { isInt = true; - //getCredentialsViaId(Integer.parseInt(str)); + credentialRepository.getCredentialsViaId(Integer.parseInt(str)); } else { isInt = false; - //getCredentialsViaName(str); + credentialRepository.getCredentialsViaName(str); } } @@ -158,12 +158,19 @@ public class Vault implements VaultInterface { String input = scan.nextLine(); + if (input.equals("e")) { credentialM = false; } else if (input.equals("a")) { - println("Type username:"); + println("Type in username"); + userName = scan.nextLine(); + + println("Type in password"); + password = scan.nextLine(); + addCredential(userName, password); } else if (input.equals("c")) { - println("Type username or ID to show credential:"); + //println("Type username or ID to show credential:"); + showCredential(); } else if (input.equals("l")) { println("Type username or ID to select credential:"); } diff --git a/src/main/java/VaultInterface.java b/src/main/java/VaultInterface.java index 9f1fc26..448eaa3 100644 --- a/src/main/java/VaultInterface.java +++ b/src/main/java/VaultInterface.java @@ -3,7 +3,7 @@ public interface VaultInterface { void configure(); - void addCredential(); + void addCredential(String userName, String password); void showCredential(); void getAsJson(); void loadFromJson(); diff --git a/src/test/java/VaultTest.java b/src/test/java/VaultTest.java index 787c6ba..447008f 100644 --- a/src/test/java/VaultTest.java +++ b/src/test/java/VaultTest.java @@ -47,13 +47,17 @@ public class VaultTest { @Test void openAddCredentialMenuItem() { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - vlt.inputS = new ByteArrayInputStream("a".getBytes(StandardCharsets.UTF_8)); + vlt.inputS = new ByteArrayInputStream("a\npeter\npassword".getBytes(StandardCharsets.UTF_8)); vlt.outputS = outputStream; vlt.credentialMenu(); - assertTrue(outputStream.toString().contains("Type")); + + assertTrue(outputStream.toString().contains("username")); + assertEquals("peter", vlt.userName); + assertTrue(outputStream.toString().contains("password")); + assertEquals("password",vlt.password); } - @Test + /*@Test void openShowCredentialMenuItem() { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); vlt.inputS = new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)); @@ -82,7 +86,7 @@ public class VaultTest { assertEquals("peter", vlt.userName); assertTrue(outputStream.toString().contains("password")); assertEquals("password",vlt.password); - } + }*/ @Test void showCredentialTest() { From c511951af04466b707e0082b1ddf747dd27dae07 Mon Sep 17 00:00:00 2001 From: fdai6352 Date: Thu, 17 Feb 2022 19:00:18 +0100 Subject: [PATCH 26/29] refactored show credential method and test --- src/main/java/Vault.java | 23 ++++++++++++----------- src/main/java/VaultInterface.java | 2 +- src/test/java/VaultTest.java | 10 +++++----- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/Vault.java b/src/main/java/Vault.java index 3a7a76a..7ff3112 100644 --- a/src/main/java/Vault.java +++ b/src/main/java/Vault.java @@ -85,20 +85,14 @@ public class Vault implements VaultInterface { credentialRepository.createNewCredential(userName, password); } - public void showCredential(){ - Scanner scan = new Scanner(inputS); - println("Type in ID or username"); - - String str = scan.nextLine(); + public void showCredential(String str){ if(str.matches("[0-9]+")) { isInt = true; credentialRepository.getCredentialsViaId(Integer.parseInt(str)); } else { - isInt = false; credentialRepository.getCredentialsViaName(str); } - } public void getAsJson(){ @@ -161,16 +155,23 @@ public class Vault implements VaultInterface { if (input.equals("e")) { credentialM = false; - } else if (input.equals("a")) { + } + + if (input.equals("a")) { println("Type in username"); userName = scan.nextLine(); println("Type in password"); password = scan.nextLine(); addCredential(userName, password); - } else if (input.equals("c")) { - //println("Type username or ID to show credential:"); - showCredential(); + } + + if (input.equals("c")) { + println("Type in ID or username"); + + String str = scan.nextLine(); + showCredential(str); + } else if (input.equals("l")) { println("Type username or ID to select credential:"); } diff --git a/src/main/java/VaultInterface.java b/src/main/java/VaultInterface.java index 448eaa3..cb23755 100644 --- a/src/main/java/VaultInterface.java +++ b/src/main/java/VaultInterface.java @@ -4,7 +4,7 @@ public interface VaultInterface { void configure(); void addCredential(String userName, String password); - void showCredential(); + void showCredential(String str); void getAsJson(); void loadFromJson(); } diff --git a/src/test/java/VaultTest.java b/src/test/java/VaultTest.java index 447008f..f789a42 100644 --- a/src/test/java/VaultTest.java +++ b/src/test/java/VaultTest.java @@ -57,10 +57,10 @@ public class VaultTest { assertEquals("password",vlt.password); } - /*@Test + @Test void openShowCredentialMenuItem() { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - vlt.inputS = new ByteArrayInputStream("c".getBytes(StandardCharsets.UTF_8)); + vlt.inputS = new ByteArrayInputStream("c\n1".getBytes(StandardCharsets.UTF_8)); vlt.outputS = outputStream; vlt.credentialMenu(); assertTrue(outputStream.toString().contains("Type")); @@ -75,7 +75,7 @@ public class VaultTest { assertTrue(outputStream.toString().contains("Type")); } - @Test + /*@Test void addCredentialTest() { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); vlt.outputS = outputStream; @@ -86,7 +86,7 @@ public class VaultTest { assertEquals("peter", vlt.userName); assertTrue(outputStream.toString().contains("password")); assertEquals("password",vlt.password); - }*/ + } @Test void showCredentialTest() { @@ -104,7 +104,7 @@ public class VaultTest { assertTrue(outputStream.toString().contains("Type")); assertFalse(vlt.isInt); - } + }*/ @Test void getAsJson() {vlt.getAsJson();} From b7a44828cf77792bb8c2cbc729e3e61695d45623 Mon Sep 17 00:00:00 2001 From: fdai6352 Date: Thu, 17 Feb 2022 19:23:37 +0100 Subject: [PATCH 27/29] refactored show credential method and test --- src/main/java/Vault.java | 5 +++-- src/test/java/VaultTest.java | 18 +++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/Vault.java b/src/main/java/Vault.java index 7ff3112..c0a7a43 100644 --- a/src/main/java/Vault.java +++ b/src/main/java/Vault.java @@ -14,7 +14,6 @@ public class Vault implements VaultInterface { public boolean credentialM; public String userName; public String password; - public boolean isInt = false; InputStream inputS = System.in; OutputStream outputS = System.out; private CredentialRepository credentialRepository = new CredentialRepository(); @@ -88,9 +87,11 @@ public class Vault implements VaultInterface { public void showCredential(String str){ if(str.matches("[0-9]+")) { - isInt = true; + println("Getting credential via ID"); credentialRepository.getCredentialsViaId(Integer.parseInt(str)); } else { + + println("Getting credential via name"); credentialRepository.getCredentialsViaName(str); } } diff --git a/src/test/java/VaultTest.java b/src/test/java/VaultTest.java index f789a42..793a9d3 100644 --- a/src/test/java/VaultTest.java +++ b/src/test/java/VaultTest.java @@ -86,26 +86,22 @@ public class VaultTest { assertEquals("peter", vlt.userName); assertTrue(outputStream.toString().contains("password")); assertEquals("password",vlt.password); - } + }*/ - @Test + /*@Test void showCredentialTest() { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - vlt.outputS = outputStream; - vlt.inputS = new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)); - vlt.showCredential(); + vlt.inputS = new ByteArrayInputStream("l\n1".getBytes(StandardCharsets.UTF_8)); + vlt.credentialMenu(); - assertTrue(outputStream.toString().contains("Type")); assertTrue(vlt.isInt); - vlt.outputS = outputStream; - vlt.inputS = new ByteArrayInputStream("peter".getBytes(StandardCharsets.UTF_8)); - vlt.showCredential(); + vlt.inputS = new ByteArrayInputStream("l\npeter".getBytes(StandardCharsets.UTF_8)); + vlt.credentialMenu(); - assertTrue(outputStream.toString().contains("Type")); assertFalse(vlt.isInt); }*/ + @Test void getAsJson() {vlt.getAsJson();} From 92d763d8368edb682fda3dad7fabf6ee835b4abc Mon Sep 17 00:00:00 2001 From: fdai6352 Date: Thu, 17 Feb 2022 19:54:09 +0100 Subject: [PATCH 28/29] refactored edit credential menu and test --- src/main/java/Vault.java | 22 +++++++++++++++++++--- src/test/java/VaultTest.java | 10 +++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/Vault.java b/src/main/java/Vault.java index c0a7a43..9b5b8a5 100644 --- a/src/main/java/Vault.java +++ b/src/main/java/Vault.java @@ -14,6 +14,9 @@ public class Vault implements VaultInterface { public boolean credentialM; public String userName; public String password; + public int newID; + public String newString; + public boolean decision; InputStream inputS = System.in; OutputStream outputS = System.out; private CredentialRepository credentialRepository = new CredentialRepository(); @@ -69,7 +72,7 @@ public class Vault implements VaultInterface { } } - public void setPWLength(String pwLength){ + public void setPWLength(String pwLength) { try { PWLength = Integer.parseInt(pwLength); } catch (NumberFormatException e) { @@ -84,7 +87,7 @@ public class Vault implements VaultInterface { credentialRepository.createNewCredential(userName, password); } - public void showCredential(String str){ + public void showCredential(String str) { if(str.matches("[0-9]+")) { println("Getting credential via ID"); @@ -96,6 +99,7 @@ public class Vault implements VaultInterface { } } + public void getAsJson(){ } @@ -174,7 +178,19 @@ public class Vault implements VaultInterface { showCredential(str); } else if (input.equals("l")) { - println("Type username or ID to select credential:"); + println("Type ID to select credential:"); + newID = Integer.parseInt(scan.nextLine()); + println("-change username: u\n-change password: p"); + input = scan.nextLine(); + + if (input.equals("u")) { + decision = true; + }else{ + decision = false; + } + println("Type new:"); + newString = scan.nextLine(); + //editCredential(newID, newString, decision); } } } diff --git a/src/test/java/VaultTest.java b/src/test/java/VaultTest.java index 793a9d3..73b20ab 100644 --- a/src/test/java/VaultTest.java +++ b/src/test/java/VaultTest.java @@ -69,12 +69,20 @@ public class VaultTest { @Test void openEditCredentialMenuItem() { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - vlt.inputS = new ByteArrayInputStream("l".getBytes(StandardCharsets.UTF_8)); + vlt.inputS = new ByteArrayInputStream("l\n1\nu\npeter".getBytes(StandardCharsets.UTF_8)); vlt.outputS = outputStream; vlt.credentialMenu(); assertTrue(outputStream.toString().contains("Type")); + assertEquals(1,vlt.newID); + assertEquals(true,vlt.decision); + assertEquals("peter",vlt.newString); } + /*@Test + void editCredentialTest() { + + }*/ + /*@Test void addCredentialTest() { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); From 9d255f29f5d909a33e84c0edaade6c4bb7ff852a Mon Sep 17 00:00:00 2001 From: fdai6352 Date: Fri, 18 Feb 2022 01:28:01 +0100 Subject: [PATCH 29/29] debug testcommit --- src/test/java/VaultTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/VaultTest.java b/src/test/java/VaultTest.java index 73b20ab..9dbc3dd 100644 --- a/src/test/java/VaultTest.java +++ b/src/test/java/VaultTest.java @@ -24,7 +24,7 @@ public class VaultTest { @BeforeEach void reset() { vlt.outputS = System.out; - vlt.inputS = System.in; + vlt.inputS = getEmptyStringInputStream(); } @Test @@ -94,9 +94,9 @@ public class VaultTest { assertEquals("peter", vlt.userName); assertTrue(outputStream.toString().contains("password")); assertEquals("password",vlt.password); - }*/ + } - /*@Test + @Test void showCredentialTest() { vlt.inputS = new ByteArrayInputStream("l\n1".getBytes(StandardCharsets.UTF_8)); vlt.credentialMenu();