Flush
This commit is contained in:
parent
de8d1e9756
commit
909e241c5b
@ -69,7 +69,9 @@ public class MainController implements Initializable {
|
|||||||
return hostServices;
|
return hostServices;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Document
|
/**
|
||||||
|
* @return All subcontrollers of this controller
|
||||||
|
*/
|
||||||
public List<Controller> getInnerControllers() {
|
public List<Controller> getInnerControllers() {
|
||||||
return List.of(editorController, filetreeController, modelineController, menubarController);
|
return List.of(editorController, filetreeController, modelineController, menubarController);
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,14 @@
|
|||||||
package app;
|
package app;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A launcher class to point towards as the start point for a packaged JAR
|
||||||
|
*/
|
||||||
public class MainLauncher {
|
public class MainLauncher {
|
||||||
|
/**
|
||||||
|
* The root function of the call stack
|
||||||
|
*
|
||||||
|
* @param args Commandline arguments
|
||||||
|
*/
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
Main.main(args);
|
Main.main(args);
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ package app.controllers;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import org.fxmisc.richtext.CodeArea;
|
import org.fxmisc.richtext.CodeArea;
|
||||||
@ -100,11 +101,15 @@ public class EditorControllerTest extends FxTestTemplate {
|
|||||||
@Test
|
@Test
|
||||||
@DisplayName("Test handling of OpenFileEvent with a file that doesn't exist")
|
@DisplayName("Test handling of OpenFileEvent with a file that doesn't exist")
|
||||||
public void testOpenFileEventWithUnrealFile() throws IOException {
|
public void testOpenFileEventWithUnrealFile() throws IOException {
|
||||||
|
try (MockedStatic<FileOperations> mocked = mockStatic(FileOperations.class)) {
|
||||||
|
mocked.when(() -> FileOperations.readFile(any()))
|
||||||
|
.thenReturn(null);
|
||||||
|
|
||||||
String brokenFilePath = "/doesNotExist.txt";
|
String brokenFilePath = "/doesNotExist.txt";
|
||||||
eventBus.post(new OpenFileEvent(Optional.ofNullable(new File(brokenFilePath).toPath())));
|
eventBus.post(new OpenFileEvent(Optional.ofNullable(Paths.get(brokenFilePath))));
|
||||||
|
|
||||||
verify(editor, never()).clear();
|
verify(editor, never()).clear();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
168
src/test/java/app/service/FileOperationsTest.java
Normal file
168
src/test/java/app/service/FileOperationsTest.java
Normal file
@ -0,0 +1,168 @@
|
|||||||
|
package app.service;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
import static org.junit.jupiter.api.Assertions.fail;
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.mockStatic;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.google.common.io.Files;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.DisplayName;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.io.TempDir;
|
||||||
|
import org.mockito.MockedStatic;
|
||||||
|
|
||||||
|
import app.model.Model;
|
||||||
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
|
public class FileOperationsTest {
|
||||||
|
|
||||||
|
@TempDir
|
||||||
|
File tmp;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("Test openFileWithDialog")
|
||||||
|
public void testOpenFileWithDialog() {
|
||||||
|
try (MockedStatic<DialogBoxes> mocked = mockStatic(DialogBoxes.class)) {
|
||||||
|
Stage stage = mock(Stage.class);
|
||||||
|
|
||||||
|
mocked.when(() -> DialogBoxes.showopenFileWithDialog(any()))
|
||||||
|
.thenReturn(null);
|
||||||
|
assertThrows(FileNotFoundException.class, () -> FileOperations.openFileWithDialog(stage));
|
||||||
|
|
||||||
|
File file = mock(File.class);
|
||||||
|
mocked.when(() -> DialogBoxes.showopenFileWithDialog(any()))
|
||||||
|
.thenReturn(file);
|
||||||
|
try {
|
||||||
|
assertEquals(file, FileOperations.openFileWithDialog(stage));
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
fail("Chosen file was null when it was expected to be mock file");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("Test openFolderWithDialog")
|
||||||
|
public void testOpenFolderWithDialog() {
|
||||||
|
try (MockedStatic<DialogBoxes> mocked = mockStatic(DialogBoxes.class)) {
|
||||||
|
Stage stage = mock(Stage.class);
|
||||||
|
|
||||||
|
mocked.when(() -> DialogBoxes.showOpenFolderWithDialog(any()))
|
||||||
|
.thenReturn(null);
|
||||||
|
assertThrows(FileNotFoundException.class, () -> FileOperations.openFolderWithDialog(stage));
|
||||||
|
|
||||||
|
File file = mock(File.class);
|
||||||
|
mocked.when(() -> DialogBoxes.showOpenFolderWithDialog(any()))
|
||||||
|
.thenReturn(file);
|
||||||
|
try {
|
||||||
|
assertEquals(file, FileOperations.openFolderWithDialog(stage));
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
fail("Chosen file was null when it was expected to be mock file");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private File createTemporaryFile() throws IOException {
|
||||||
|
File f = new File(tmp, "test.txt");
|
||||||
|
f.createNewFile();
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("Test saveFile")
|
||||||
|
public void testSaveFile() {
|
||||||
|
String content = "test\ncontent\nfor\nyou";
|
||||||
|
File f;
|
||||||
|
|
||||||
|
try (MockedStatic<DialogBoxes> mocked = mockStatic(DialogBoxes.class)) {
|
||||||
|
// mocked.when(() -> DialogBoxes.showErrorMessage(anyString()));
|
||||||
|
|
||||||
|
f = createTemporaryFile();
|
||||||
|
assertTrue(FileOperations.saveFile(f.toPath(), content));
|
||||||
|
|
||||||
|
List<String> read = Files.readLines(f, StandardCharsets.UTF_8);
|
||||||
|
String value = String.join("\n", read);
|
||||||
|
assertEquals(content, value);
|
||||||
|
|
||||||
|
Path wrongPath = Paths.get("wrongPath.txt");
|
||||||
|
assertFalse(FileOperations.saveFile(wrongPath, content));
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
fail("Unexpected temporary file failure");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("Test saveFileWithDialog")
|
||||||
|
public void testSaveFileWithDialog() {
|
||||||
|
String content = "test\ncontent\nfor\nyou";
|
||||||
|
File f;
|
||||||
|
|
||||||
|
try (MockedStatic<DialogBoxes> mocked = mockStatic(DialogBoxes.class)) {
|
||||||
|
Stage stage = mock(Stage.class);
|
||||||
|
|
||||||
|
mocked.when(() -> DialogBoxes.showSaveFileWithDialog(any()))
|
||||||
|
.thenReturn(false);
|
||||||
|
assertFalse(FileOperations.saveFileWithDialog(stage, content));
|
||||||
|
|
||||||
|
mocked.when(() -> DialogBoxes.showSaveFileWithDialog(any()))
|
||||||
|
.thenReturn(null);
|
||||||
|
assertFalse(FileOperations.saveFileWithDialog(stage, content));
|
||||||
|
|
||||||
|
f = createTemporaryFile();
|
||||||
|
mocked.when(() -> DialogBoxes.showSaveFileWithDialog(any()))
|
||||||
|
.thenReturn(f);
|
||||||
|
assertTrue(FileOperations.saveFileWithDialog(stage, content));
|
||||||
|
assertEquals(Model.getActiveFilePath(), f.toPath());
|
||||||
|
|
||||||
|
File wrongFile = new File("Does not exist");
|
||||||
|
mocked.when(() -> DialogBoxes.showSaveFileWithDialog(any()))
|
||||||
|
.thenReturn(wrongFile);
|
||||||
|
assertFalse(FileOperations.saveFileWithDialog(stage, content));
|
||||||
|
} catch (IOException e) {
|
||||||
|
fail("Unexpected IOexception when creating temporary file");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("Test readFile")
|
||||||
|
public void testReadFile() {
|
||||||
|
File f;
|
||||||
|
|
||||||
|
try (MockedStatic<DialogBoxes> mocked = mockStatic(DialogBoxes.class)) {
|
||||||
|
// mocked.when(() -> DialogBoxes.showErrorMessage(anyString()));
|
||||||
|
|
||||||
|
assertEquals("", FileOperations.readFile(null));
|
||||||
|
|
||||||
|
String content = "test\ncontent\nfor\nyou";
|
||||||
|
f = createTemporaryFile();
|
||||||
|
|
||||||
|
Files.write(content.getBytes(), f);
|
||||||
|
|
||||||
|
assertEquals(content, FileOperations.readFile(f.toPath()));
|
||||||
|
|
||||||
|
Path wrongPath = Paths.get("wrongPath.txt");
|
||||||
|
assertThrows(FileNotFoundException.class, () -> FileOperations.readFile(wrongPath));
|
||||||
|
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
fail("Unexpected temporary file failure");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -5,10 +5,26 @@ import org.junit.jupiter.api.Test;
|
|||||||
|
|
||||||
public class SettingsProviderTest {
|
public class SettingsProviderTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private static final String SETTINGS_PATH =
|
||||||
|
(System.getProperty("os.name").startsWith("Windows"))
|
||||||
|
? System.getProperty("user.home") + "\\AppData\\Roaming\\/BNNsettings.dat"
|
||||||
|
: System.getProperty("user.home") + System.getProperty("file.separator") + ".BNNsettings.dat";
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private static List<String> legalSettings =
|
||||||
|
Arrays.asList("Java", "Markdown", "Monokai", "Solarized Light");
|
||||||
|
|
||||||
|
private static EventBus eventBus;
|
||||||
|
|
||||||
|
|
||||||
|
@InjectMocks
|
||||||
|
private SettingsProvider sp;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@DisplayName("Test load settings")
|
@DisplayName("Test load settings")
|
||||||
public void testLoadSettings() {
|
public void testLoadSettings() {
|
||||||
|
sp.when()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user