diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java
index cc01c4c..f356f3e 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java
+++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java
@@ -1,9 +1,14 @@
+/**
+ * @(#) DictionaryEntryTest.java 0,1 2020/05/01
+ *
+ * Copyright (c) 2020 Aberystwyth University.
+ * All rights reserved.
+ */
package uk.ac.aber.cs221.group20.test;
import org.junit.jupiter.api.Test;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
-import uk.ac.aber.cs221.group20.json.JsonProcessing;
import java.util.*;
@@ -11,59 +16,59 @@ import static org.junit.jupiter.api.Assertions.*;
/**
* A test class for various tests regarding DictionaryEntry.
- * @Author Kab74
+ * @author Kain Bryan-Jones [kab74]
*/
class DictionaryEntryTest {
- LinkedList testList;
+ LinkedList testList;
- /**
- * Tests whether the default constructor sets isPracticeWord to false upon declaration of a new DictionaryEntry.
- */
- @Test
- void testPracticeWordFalse(){
- DictionaryEntry testDefaultConstructor = new DictionaryEntry();
- assertFalse(testDefaultConstructor.isPracticeWord());
- }
+ /**
+ * Tests whether the default constructor sets isPracticeWord to false upon declaration of a new DictionaryEntry.
+ */
+ @Test
+ void testPracticeWordFalse(){
+ DictionaryEntry testDefaultConstructor = new DictionaryEntry();
+ assertFalse(testDefaultConstructor.isPracticeWord());
+ }
- /**
- * Tests whether the setters and getters of the DictionaryEntry class work as intended.
- */
- @Test
- void testAllSettersAndGetters() {
- String english = "abbey";
- String welsh = "abaty";
- wordTypeEnum wordType = wordTypeEnum.nm;
+ /**
+ * Tests whether the setters and getters of the DictionaryEntry class work as intended.
+ */
+ @Test
+ void testAllSettersAndGetters() {
+ String english = "abbey";
+ String welsh = "abaty";
+ DictionaryEntry.wordTypeEnum wordType = DictionaryEntry.wordTypeEnum.nm;
- DictionaryEntry testSettersAndGetters = new DictionaryEntry();
- testSettersAndGetters.setEnglish(english);
- testSettersAndGetters.setWelsh(welsh);
- testSettersAndGetters.setWordType(wordType);
- assertTrue(testSettersAndGetters.getEnglish().equals(english) &&
- testSettersAndGetters.getWelsh().equals(welsh) &&
- testSettersAndGetters.getWordType().equals(wordType));
-}
+ DictionaryEntry testSettersAndGetters = new DictionaryEntry();
+ testSettersAndGetters.setEnglish(english);
+ testSettersAndGetters.setWelsh(welsh);
+ testSettersAndGetters.setWordType(wordType);
+ assertTrue(testSettersAndGetters.getEnglish().equals(english) &&
+ testSettersAndGetters.getWelsh().equals(welsh) &&
+ testSettersAndGetters.getWordType().equals(wordType));
+ }
- /**
- * A true-positive test for the equals method in DictionaryEntry.
- */
- @Test
- public void testEqualsTruePossitive() {
- String english = "abbey";
- String welsh = "abaty";
- wordTypeEnum wordType = wordTypeEnum.nm;
- testList = new LinkedList<>(Arrays.asList(new DictionaryEntry(english,welsh,wordType),new DictionaryEntry(english,welsh,wordType)));
- assertTrue(testList.get(0).equals(testList.get(1)));
- }
+ /**
+ * A true-positive test for the equals method in DictionaryEntry.
+ */
+ @Test
+ public void testEqualsTruePossitive() {
+ String english = "abbey";
+ String welsh = "abaty";
+ DictionaryEntry.wordTypeEnum wordType = DictionaryEntry.wordTypeEnum.nm;
+ testList = new LinkedList<>(Arrays.asList(new DictionaryEntry(english,welsh,wordType),new DictionaryEntry(english,welsh,wordType)));
+ assertTrue(testList.get(0).equals(testList.get(1)));
+ }
- /**
- * A true-negative test for the equals method in DictionaryEntry.
- */
- @Test
- public void testEqualsTrueNegative(){
- testList = new LinkedList<>(Arrays.asList(new DictionaryEntry("abbey","abaty", wordTypeEnum.nm),new DictionaryEntry("above","dramor",wordTypeEnum.other)));
- assertFalse(testList.get(0).equals(testList.get(1)));
- }
+ /**
+ * A true-negative test for the equals method in DictionaryEntry.
+ */
+ @Test
+ public void testEqualsTrueNegative(){
+ testList = new LinkedList<>(Arrays.asList(new DictionaryEntry("abbey","abaty", DictionaryEntry.wordTypeEnum.nm),new DictionaryEntry("above","dramor", DictionaryEntry.wordTypeEnum.other)));
+ assertFalse(testList.get(0).equals(testList.get(1)));
+ }