diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AddWordControllerTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AddWordControllerTest.java deleted file mode 100644 index 6bc0d03..0000000 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AddWordControllerTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package uk.ac.aber.cs221.group20.test; - -import javafx.event.ActionEvent; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import uk.ac.aber.cs221.group20.javafx.AddWordController; -import uk.ac.aber.cs221.group20.javafx.AddWordController; - -import static org.junit.jupiter.api.Assertions.*; - -class AddWordControllerTest { - AddWordController testController = new AddWordController(); - - @BeforeEach - void setUp() { - - - } - - @AfterEach - void tearDown() { - } - - @Test - void addButtonClick() { - testController.getEnglish(); -// assertEquals();* - } - - - @Test - void testSpecialCharacters(ActionEvent actionEvent) { - testController.addCharch(actionEvent); - testController.addChardd(actionEvent); - testController.addCharff(actionEvent); - testController.addCharng(actionEvent); - testController.addCharll(actionEvent); - testController.addCharph(actionEvent); - testController.addCharrh(actionEvent); - testController.addCharth(actionEvent); - - String allChars = "chddffngllphrhth"; - - assertEquals(allChars,testController.getWelsh().getText()); - - - } - - -} \ No newline at end of file diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JavaFXTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JavaFXTest.java deleted file mode 100644 index d6df46d..0000000 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JavaFXTest.java +++ /dev/null @@ -1,54 +0,0 @@ -package uk.ac.aber.cs221.group20.test; - -/** - * Class that contains methods to test that the application class is correctly storing the full - * list of dictionary definitions. - * Furthermore, this class will also test that the elements such as the sliding menu and score counter are - * working as intended, along with testing that scenes are ending and transitioning correctly when - * applicable. - * @Author - * @Version - * @See - */ -public class JavaFXTest { - - /** - * Tests to confirm that the dictionary definitions loaded match to an - * identical base set. - */ - @test public void testDefinition(){ - - } - - /** - * Test to confirm that the user score counter correctly increases - * by increments on one. - */ - @test public void testScoreCounter(){ - - } - - /** - * A preset search test to confirm that words are being searched for - * correctly. - */ - @test public void testFindWord(){ - - } - - /** - * A test to check that a new word is correctly added and saved to - * the JSON file. - */ - @test public void testAddWord(){ - - } - - /** - *A test to check that the JSON file is correctly updated when a - * word is removed. - */ - @test public void testRemoveWord(){ - - } -} diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/SelfAssesmentTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/SelfAssesmentTest.java deleted file mode 100644 index 136f34b..0000000 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/SelfAssesmentTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package uk.ac.aber.cs221.group20.test; - -/** - * This class will test that the lists pulled in the self-assessment package are indeed - * random, while also pulling the matching data from the dictionary. - * @Author - * @Version - * @See - */ -public class SelfAssesmentTest { - - /** - * Test to confirm that the random number return is working - * correctly. - */ - @test - public void testRandomReturn(){ - - } - - /** - * Test to check and confirm that the game types are - * either made available or are locked off depending on the number of practice list questions. - */ - @test - public void testAvailableSelfAssessment(){ - - } - - /** - * Test that will check that an input by a user is correctly checked - * to the correct answer. - */ - @test - public void testUserAnswer(){} -} diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml index e46256e..42b076d 100644 --- a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml +++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml @@ -1,19 +1,25 @@ + + + + + + - + @@ -162,9 +168,81 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +