Java FX #14 View&Controller tests

seregamazur · May 16, 2018 · 0b6c6fd · 0b6c6fd
1 parent c67a1e3
commit 0b6c6fd
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 7 deletions.
diff --git a/src/java/view/Settings.java b/src/java/view/Settings.java
@@ -52,7 +52,7 @@ public void initSettings() {
 
             primaryStage.show();
         } catch (IOException e) {
-            java.util.logging.Logger.getLogger(Settings.class.getName()).log(java.util.logging.Level.SEVERE, null, e);
+            java.util.logging.Logger.getLogger(Settings.class.getName()).log(java.util.logging.Level.SEVERE, "IOException", e);
         }
 
     }

diff --git a/src/test/controller/AgainstCompTest.java b/src/test/controller/AgainstCompTest.java
@@ -3,16 +3,19 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.input.KeyCode;
 import javafx.stage.Stage;
 import org.junit.After;
 import org.junit.Test;
 import org.testfx.api.FxToolkit;
 import org.testfx.framework.junit.ApplicationTest;
+import utils.GeneratorNumber;
 
 import java.io.File;
 import java.net.URL;
 
 public class AgainstCompTest extends ApplicationTest {
+    private GeneratorNumber gen = new GeneratorNumber();
     @Override
     public void start(Stage stage) throws Exception {
         URL url = new File("src/resources/fxml/AgainstComp.fxml").toURI().toURL();
@@ -38,6 +41,7 @@ public void testNewGameClick () {
     @Test
     public void testCapitulateClick ()  {
         clickOn("#capitulatebutton");
+        press(KeyCode.SPACE);
 
 
     }
@@ -48,19 +52,22 @@ public void testBackClick () {
     @Test
     public void testEmptyFieldInput () {
         clickOn("#inputbutton");
+        press(KeyCode.SPACE);
 
     }
     @Test
     public void testLargeNumberFieldInput ()  {
         clickOn("#textfield");
             write("123456789");
        clickOn("#inputbutton");
+        press(KeyCode.SPACE);
     }
     @Test
     public void testStringFieldInput () {
         clickOn("#textfield");
             write("Hello");
         clickOn("#inputbutton");
+        press(KeyCode.SPACE);
 
 
     }
@@ -69,10 +76,32 @@ public void testSameNumbFieldInput () {
         clickOn("#textfield");
             write("1234");
             clickOn("#inputbutton");
+        clickOn("#textfield");
             write("1234");
           clickOn("#inputbutton");
+        press(KeyCode.SPACE);
 
     }
+    @Test
+    public void testNumbDupesFieldInput () {
+        clickOn("#textfield");
+        write("1233");
+        clickOn("#inputbutton");
+        press(KeyCode.SPACE);
+
+    }
+    @Test
+    public void testGameComplete(){
+        gen.setDigits(4);
+        gen.getNumber();
+        clickOn("#textfield");
+        write("1234");
+        clickOn("#inputbutton");
+        clickOn("#textfield");
+        write((Integer.toString(gen.getGeneratedNumber())));
+        clickOn("#inputbutton");
+        press(KeyCode.SPACE);
+    }
 
 
 }
diff --git a/src/test/controller/MainMenuTest.java b/src/test/controller/MainMenuTest.java
@@ -8,11 +8,13 @@
 import org.junit.Test;
 import org.testfx.api.FxToolkit;
 import org.testfx.framework.junit.ApplicationTest;
+import view.MainMenu;
 
 import java.io.File;
 import java.net.URL;
 
 public class MainMenuTest extends ApplicationTest {
+    String[] args;
     @Override
     public void start(Stage stage) throws Exception {
         URL url = new File("src/resources/fxml/MainMenu.fxml").toURI().toURL();
@@ -39,7 +41,5 @@ public void testSettingsClick () {
     }
 
 
-
-
 }
 
diff --git a/src/test/controller/WithCompTest.java b/src/test/controller/WithCompTest.java
@@ -36,17 +36,20 @@ public void testTextFieldInput () {
             clickOn("#textfield");
             write("1234");
         clickOn("#startbutton");
+        press(KeyCode.SPACE);
 
     }
     @Test
     public void testLargeNumberFieldInput () {
        clickOn("#textfield");
             write("123456789");
         clickOn("#startbutton");
+        press(KeyCode.SPACE);
     }
     @Test
     public void testEmptyFieldInput () {
         clickOn("#startbutton");
+        press(KeyCode.SPACE);
         }
     @Test
     public void testNewGameClick () {
@@ -58,6 +61,7 @@ public void testStringFieldInput () {
         clickOn("#textfield");
             write("Hello");
     clickOn("#startbutton");
+        press(KeyCode.SPACE);
     }
 
 

diff --git a/src/test/model/ComputerGeneratorTest.java b/src/test/model/ComputerGeneratorTest.java
@@ -4,7 +4,6 @@
 import utils.GeneratorNumber;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 
 
 public class ComputerGeneratorTest {
@@ -23,5 +22,17 @@ public void testGenerateAndCheck() {
 
         assertEquals(12345, generator.getMoves().getLast().getDigit());
     }
+    @Test
+    public void testInterruptedGenerateAndCheck(){
+        InputGetter.setInputNumber(96547);
+        gen.setDigits(5);
+        generator.setGenerateStatus(ComputerGenerator.GenerateStatus.GENERATING);
+        while (generator.getGenerateStatus() != ComputerGenerator.GenerateStatus.FINISHED) {
+            generator.generateAndCheck(gen);
+        }
+        generator.generateAndCheck(gen);
+        generator.getNumbers();
+        assertEquals(96547, generator.getMoves().getLast().getDigit());
+    }
 
 }
diff --git a/src/test/utils/GeneratorNumberTest.java b/src/test/utils/GeneratorNumberTest.java
@@ -2,9 +2,6 @@
 
 import org.junit.Test;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 public class GeneratorNumberTest {
     private GeneratorNumber gen = new GeneratorNumber();
 
@@ -15,6 +12,10 @@ public void testGenerate() {
         gen.setDigits(i);
         gen.getNumber();}
     }
+    @Test
+    public void testRead(){
+        gen.read();
+    }
 
 
 }